Skip to content

Commit 6119aaf

Browse files
fix(kubernetes): drop lookup-guarded parent-HR dependsOn on tenant addon child HRs
Each of the 19 child HR templates in packages/apps/kubernetes/templates/ helmreleases/ added the parent kubernetes-application HR as a dependsOn entry, guarded by a `lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease"` on the parent so it only stamped after the parent already existed. Under Flux 2.7 (helm-controller v1.4.x), the parent HR's Ready=True flips after helm install returns, regardless of any child HRs it just applied, so the guard was a no-op for first install and a soft ordering hint for subsequent reconciles. Under Flux 2.8 (helm-controller v1.5.0), the default waitStrategy is `poller` -- the parent HR now waits via kstatus for every applied resource, including the 19 child HRs, to be Ready=True before flipping its own Ready. The child HRs in turn cannot become Ready until they have a working `super-admin.svc` kubeConfig and the lookup-stamped dependsOn back-edge resolves -- which only happens after the parent HR is Ready. Deadlock: parent waits on child, child waits on parent. Removing the parent dependsOn from each child breaks the cycle. The children start reconciling immediately; helm-controller's existing retry loop covers the brief window before the parent's helm install lands the admin-kubeconfig secret. The cross-child ordering (cilium -> cert-manager, prometheus-operator-crds -> metrics-server, etc.) stays intact via the unconditional sibling entries. Five files (the *-crds and vsnap-crd HRs) had only the parent reference under dependsOn; remove \`dependsOn:\` entirely in those. Cilium had one conditional gateway-api-crds entry under it; pull the \`dependsOn:\` key inside that conditional so it disappears when gateway-API is off rather than rendering as a null array. This is option B from issue #2642 task 1. Verified: - \`helm template\` clean with default values-ci.yaml and with every addon enabled (cert-manager, ingress-nginx, monitoring-agents, velero, fluxcd, gateway-api, gpu-operator, hami, ouroboros). - No remaining \`- name: {{ .Release.Name }}\` dependsOn entries in packages/apps/kubernetes/templates/helmreleases/. - \`helm unittest\` passes (123/123). Refs: #2642 Assisted-By: Claude <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent 08433dc commit 6119aaf

19 files changed

Lines changed: 1 addition & 87 deletions

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ spec:
3636
valuesKey: values
3737
{{- end }}
3838

39-
dependsOn:
40-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
41-
- name: {{ .Release.Name }}
42-
namespace: {{ .Release.Namespace }}
43-
{{- end }}
4439
{{- if .Values.addons.certManager.valuesOverride }}
4540
---
4641
apiVersion: v1

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ spec:
4242
values:
4343
{{- toYaml (deepCopy .Values.addons.certManager.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCertManagerValues" .))) | nindent 4 }}
4444
dependsOn:
45-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
46-
- name: {{ .Release.Name }}
47-
namespace: {{ .Release.Namespace }}
48-
{{- end }}
4945
- name: {{ .Release.Name }}-cilium
5046
namespace: {{ .Release.Namespace }}
5147
- name: {{ .Release.Name }}-cert-manager-crds

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,8 @@ spec:
4747
retries: -1
4848
values:
4949
{{- toYaml (deepCopy .Values.addons.cilium.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCiliumValues" .))) | nindent 4 }}
50-
dependsOn:
51-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
52-
- name: {{ .Release.Name }}
53-
namespace: {{ .Release.Namespace }}
54-
{{- end }}
5550
{{- if $.Values.addons.gatewayAPI.enabled }}
51+
dependsOn:
5652
- name: {{ .Release.Name }}-gateway-api-crds
5753
namespace: {{ .Release.Namespace }}
5854
{{- end }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ spec:
3737
values:
3838
{{- toYaml (deepCopy .Values.addons.coredns.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCoreDNSValues" .))) | nindent 4 }}
3939
dependsOn:
40-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
41-
- name: {{ .Release.Name }}
42-
namespace: {{ .Release.Namespace }}
43-
{{- end }}
4440
- name: {{ .Release.Name }}-cilium
4541
namespace: {{ .Release.Namespace }}
4642
{{- end }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,4 @@ spec:
3636
namespace: {{ .Release.Namespace }}
3737
- name: {{ .Release.Name }}-cilium
3838
namespace: {{ .Release.Namespace }}
39-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
40-
- name: {{ .Release.Name }}
41-
namespace: {{ .Release.Namespace }}
42-
{{- end }}
4339
{{- end }}

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ spec:
3535
tolerations: []
3636
hostNetwork: false
3737
dependsOn:
38-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
39-
- name: {{ .Release.Name }}
40-
namespace: {{ .Release.Namespace }}
41-
{{- end }}
4238
- name: {{ .Release.Name }}-cilium
4339
namespace: {{ .Release.Namespace }}
4440
---
@@ -74,10 +70,6 @@ spec:
7470
{{- toYaml . | nindent 4 }}
7571
{{- end }}
7672
dependsOn:
77-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
78-
- name: {{ .Release.Name }}
79-
namespace: {{ .Release.Namespace }}
80-
{{- end }}
8173
- name: {{ .Release.Name }}-cilium
8274
namespace: {{ .Release.Namespace }}
8375
- name: {{ .Release.Name }}-fluxcd-operator

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,4 @@ spec:
2828
force: true
2929
remediation:
3030
retries: -1
31-
dependsOn:
32-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
33-
- name: {{ .Release.Name }}
34-
namespace: {{ .Release.Namespace }}
35-
{{- end }}
3631
{{- end }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ spec:
4646
{{- end }}
4747

4848
dependsOn:
49-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
50-
- name: {{ .Release.Name }}
51-
namespace: {{ .Release.Namespace }}
52-
{{- end }}
5349
- name: {{ .Release.Name }}-cilium
5450
namespace: {{ .Release.Namespace }}
5551
{{- end }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ spec:
3838
{{- end }}
3939

4040
dependsOn:
41-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
42-
- name: {{ .Release.Name }}
43-
namespace: {{ .Release.Namespace }}
44-
{{- end }}
4541
- name: {{ .Release.Name }}-cilium
4642
namespace: {{ .Release.Namespace }}
4743
- name: {{ .Release.Name }}-gpu-operator

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ spec:
5454
values:
5555
{{- toYaml (deepCopy .Values.addons.ingressNginx.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultIngressValues" .))) | nindent 4 }}
5656
dependsOn:
57-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
58-
- name: {{ .Release.Name }}
59-
namespace: {{ .Release.Namespace }}
60-
{{- end }}
6157
- name: {{ .Release.Name }}-cilium
6258
namespace: {{ .Release.Namespace }}
6359
{{- end }}

0 commit comments

Comments
 (0)