Skip to content

Commit 2ab9a38

Browse files
authored
Fine-tuning Flux configuration (#196)
Fix #195 Don't set the `interval` so short on HelmReleases, with this many HelmReleases that really hamstrings the control plane. Also, copy the install/upgrade remediation config from system packages to the Kubernetes templates for addon packages (cilium, flux, ingress) - in my testing the ingress-nginx chart fails every time the first time. Maybe that should be filed as a separate issue, I haven't looked into detail, it is some issue related to a secret not being created, I think it said something related to an admission controller. Looks as though it's a conflict with being installed at the same time as the cert-manager addon. Signed-off-by: Kingdon Barrett <[email protected]>
1 parent 7072ed9 commit 2ab9a38

6 files changed

Lines changed: 37 additions & 7 deletions

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
cozystack.io/repository: system
88
coztstack.io/target-cluster-name: {{ .Release.Name }}
99
spec:
10-
interval: 1m
10+
interval: 5m
1111
releaseName: cert-manager
1212
chart:
1313
spec:
@@ -24,6 +24,11 @@ spec:
2424
storageNamespace: cozy-cert-manager
2525
install:
2626
createNamespace: true
27+
remediation:
28+
retries: -1
29+
upgrade:
30+
remediation:
31+
retries: -1
2732
dependsOn:
2833
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
2934
- name: {{ .Release.Name }}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
cozystack.io/repository: system
77
coztstack.io/target-cluster-name: {{ .Release.Name }}
88
spec:
9-
interval: 1m
9+
interval: 5m
1010
releaseName: cilium
1111
chart:
1212
spec:
@@ -23,6 +23,11 @@ spec:
2323
storageNamespace: cozy-cilium
2424
install:
2525
createNamespace: true
26+
remediation:
27+
retries: -1
28+
upgrade:
29+
remediation:
30+
retries: -1
2631
values:
2732
cilium:
2833
tunnel: disabled

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
cozystack.io/repository: system
77
coztstack.io/target-cluster-name: {{ .Release.Name }}
88
spec:
9-
interval: 1m
9+
interval: 5m
1010
releaseName: csi
1111
chart:
1212
spec:
@@ -23,6 +23,11 @@ spec:
2323
storageNamespace: cozy-csi
2424
install:
2525
createNamespace: true
26+
remediation:
27+
retries: -1
28+
upgrade:
29+
remediation:
30+
retries: -1
2631
dependsOn:
2732
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
2833
- name: {{ .Release.Name }}

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
cozystack.io/repository: system
88
coztstack.io/target-cluster-name: {{ .Release.Name }}
99
spec:
10-
interval: 1m
10+
interval: 5m
1111
releaseName: fluxcd-operator
1212
chart:
1313
spec:
@@ -24,6 +24,11 @@ spec:
2424
storageNamespace: cozy-fluxcd
2525
install:
2626
createNamespace: true
27+
remediation:
28+
retries: -1
29+
upgrade:
30+
remediation:
31+
retries: -1
2732
values:
2833
flux-operator:
2934
fullnameOverride: flux-operator
@@ -45,7 +50,7 @@ metadata:
4550
cozystack.io/repository: system
4651
coztstack.io/target-cluster-name: {{ .Release.Name }}
4752
spec:
48-
interval: 1m
53+
interval: 5m
4954
releaseName: fluxcd
5055
chart:
5156
spec:
@@ -62,6 +67,11 @@ spec:
6267
storageNamespace: cozy-fluxcd
6368
install:
6469
createNamespace: true
70+
remediation:
71+
retries: -1
72+
upgrade:
73+
remediation:
74+
retries: -1
6575
dependsOn:
6676
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
6777
- name: {{ .Release.Name }}

‎packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
cozystack.io/repository: system
88
coztstack.io/target-cluster-name: {{ .Release.Name }}
99
spec:
10-
interval: 1m
10+
interval: 5m
1111
releaseName: ingress-nginx
1212
chart:
1313
spec:
@@ -24,6 +24,11 @@ spec:
2424
storageNamespace: cozy-ingress-nginx
2525
install:
2626
createNamespace: true
27+
remediation:
28+
retries: -1
29+
upgrade:
30+
remediation:
31+
retries: -1
2732
values:
2833
ingress-nginx:
2934
fullnameOverride: ingress-nginx

‎packages/core/platform/templates/helmreleases.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ metadata:
2020
labels:
2121
cozystack.io/repository: system
2222
spec:
23-
interval: 1m
23+
interval: 5m
2424
releaseName: {{ $x.releaseName | default $x.name }}
2525
install:
2626
crds: CreateReplace

0 commit comments

Comments
 (0)