Skip to content

Commit 9f9d8f8

Browse files
committed
Allign timeouts for HelmReleases
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent f871fbd commit 9f9d8f8

26 files changed

Lines changed: 105 additions & 43 deletions

‎.pre-commit-config.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
repos:
22
- repo: local
33
hooks:
4-
- id: gen-versions-map
5-
name: Generate versions map and check for changes
6-
entry: sh -c 'make -C packages/apps check-version-map && make -C packages/extra check-version-map'
7-
language: system
8-
types: [file]
9-
pass_filenames: false
10-
description: Run the script and fail if it generates changes
114
- id: run-make-generate
125
name: Run 'make generate' in all app directories
136
entry: |

‎packages/apps/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OUT=../_out/repos/apps
1+
OUT=../../_out/repos/apps
22
CHARTS := $(shell find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}')
33

44
include ../../scripts/common-envs.mk

‎packages/apps/bucket/templates/helmrelease.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ spec:
1212
name: cozystack-system
1313
namespace: cozy-system
1414
version: '>= 0.0.0-0'
15-
interval: 1m0s
16-
timeout: 5m0s
15+
interval: 5m
16+
timeout: 10m
17+
install:
18+
remediation:
19+
retries: -1
20+
upgrade:
21+
force: true
22+
remediation:
23+
retries: -1
1724
values:
1825
bucketName: {{ .Release.Name }}

‎packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ metadata:
77
cozystack.io/repository: system
88
cozystack.io/target-cluster-name: {{ .Release.Name }}
99
spec:
10-
interval: 5m
1110
releaseName: cert-manager-crds
1211
chart:
1312
spec:
@@ -24,11 +23,14 @@ spec:
2423
key: super-admin.svc
2524
targetNamespace: cozy-cert-manager-crds
2625
storageNamespace: cozy-cert-manager-crds
26+
interval: 5m
27+
timeout: 10m
2728
install:
2829
createNamespace: true
2930
remediation:
3031
retries: -1
3132
upgrade:
33+
force: true
3234
remediation:
3335
retries: -1
3436
{{- if .Values.addons.certManager.valuesOverride }}

‎packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ metadata:
77
cozystack.io/repository: system
88
cozystack.io/target-cluster-name: {{ .Release.Name }}
99
spec:
10-
interval: 5m
1110
releaseName: cert-manager
1211
chart:
1312
spec:
@@ -24,11 +23,14 @@ spec:
2423
key: super-admin.svc
2524
targetNamespace: cozy-cert-manager
2625
storageNamespace: cozy-cert-manager
26+
interval: 5m
27+
timeout: 10m
2728
install:
2829
createNamespace: true
2930
remediation:
3031
retries: -1
3132
upgrade:
33+
force: true
3234
remediation:
3335
retries: -1
3436
{{- with .Values.addons.certManager.valuesOverride }}

‎packages/apps/kubernetes/templates/helmreleases/cilium.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ metadata:
2121
cozystack.io/repository: system
2222
cozystack.io/target-cluster-name: {{ .Release.Name }}
2323
spec:
24-
interval: 5m
2524
releaseName: cilium
2625
chart:
2726
spec:
@@ -38,11 +37,14 @@ spec:
3837
key: super-admin.svc
3938
targetNamespace: cozy-cilium
4039
storageNamespace: cozy-cilium
40+
interval: 5m
41+
timeout: 10m
4142
install:
4243
createNamespace: true
4344
remediation:
4445
retries: -1
4546
upgrade:
47+
force: true
4648
remediation:
4749
retries: -1
4850
values:

‎packages/apps/kubernetes/templates/helmreleases/coredns.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ metadata:
1212
cozystack.io/repository: system
1313
cozystack.io/target-cluster-name: {{ .Release.Name }}
1414
spec:
15-
interval: 5m
1615
releaseName: coredns
1716
chart:
1817
spec:
@@ -29,11 +28,13 @@ spec:
2928
key: super-admin.svc
3029
targetNamespace: kube-system
3130
storageNamespace: kube-system
31+
interval: 5m
32+
timeout: 10m
3233
install:
33-
createNamespace: true
3434
remediation:
3535
retries: -1
3636
upgrade:
37+
force: true
3738
remediation:
3839
retries: -1
3940
values:

‎packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ metadata:
77
cozystack.io/repository: system
88
cozystack.io/target-cluster-name: {{ .Release.Name }}
99
spec:
10-
interval: 5m
1110
releaseName: fluxcd-operator
1211
chart:
1312
spec:
@@ -24,11 +23,14 @@ spec:
2423
key: super-admin.svc
2524
targetNamespace: cozy-fluxcd
2625
storageNamespace: cozy-fluxcd
26+
interval: 5m
27+
timeout: 10m
2728
install:
2829
createNamespace: true
2930
remediation:
3031
retries: -1
3132
upgrade:
33+
force: true
3234
remediation:
3335
retries: -1
3436
values:

‎packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ metadata:
77
cozystack.io/repository: system
88
cozystack.io/target-cluster-name: {{ .Release.Name }}
99
spec:
10-
interval: 5m
1110
releaseName: gateway-api-crds
1211
chart:
1312
spec:
@@ -24,11 +23,13 @@ spec:
2423
key: super-admin.svc
2524
targetNamespace: kube-system
2625
storageNamespace: kube-system
26+
interval: 5m
27+
timeout: 10m
2728
install:
28-
createNamespace: false
2929
remediation:
3030
retries: -1
3131
upgrade:
32+
force: true
3233
remediation:
3334
retries: -1
3435
dependsOn:

‎packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ metadata:
77
cozystack.io/repository: system
88
cozystack.io/target-cluster-name: {{ .Release.Name }}
99
spec:
10-
interval: 5m
1110
releaseName: gpu-operator
1211
chart:
1312
spec:
@@ -24,11 +23,14 @@ spec:
2423
key: super-admin.svc
2524
targetNamespace: cozy-gpu-operator
2625
storageNamespace: cozy-gpu-operator
26+
interval: 5m
27+
timeout: 10m
2728
install:
2829
createNamespace: true
2930
remediation:
3031
retries: -1
3132
upgrade:
33+
force: true
3234
remediation:
3335
retries: -1
3436
{{- with .Values.addons.gpuOperator.valuesOverride }}

0 commit comments

Comments
 (0)