Skip to content

Commit 74a019d

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]> (cherry picked from commit 6119aaf)
1 parent 639227b commit 74a019d

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
@@ -35,11 +35,6 @@ spec:
3535
valuesKey: values
3636
{{- end }}
3737

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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ spec:
4141
values:
4242
{{- toYaml (deepCopy .Values.addons.certManager.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCertManagerValues" .))) | nindent 4 }}
4343
dependsOn:
44-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
45-
- name: {{ .Release.Name }}
46-
namespace: {{ .Release.Namespace }}
47-
{{- end }}
4844
- name: {{ .Release.Name }}-cilium
4945
namespace: {{ .Release.Namespace }}
5046
- 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
@@ -46,12 +46,8 @@ spec:
4646
retries: -1
4747
values:
4848
{{- toYaml (deepCopy .Values.addons.cilium.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCiliumValues" .))) | nindent 4 }}
49-
dependsOn:
50-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
51-
- name: {{ .Release.Name }}
52-
namespace: {{ .Release.Namespace }}
53-
{{- end }}
5449
{{- if $.Values.addons.gatewayAPI.enabled }}
50+
dependsOn:
5551
- name: {{ .Release.Name }}-gateway-api-crds
5652
namespace: {{ .Release.Namespace }}
5753
{{- end }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ spec:
3636
values:
3737
{{- toYaml (deepCopy .Values.addons.coredns.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCoreDNSValues" .))) | nindent 4 }}
3838
dependsOn:
39-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
40-
- name: {{ .Release.Name }}
41-
namespace: {{ .Release.Namespace }}
42-
{{- end }}
4339
- name: {{ .Release.Name }}-cilium
4440
namespace: {{ .Release.Namespace }}
4541
{{- 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
@@ -34,10 +34,6 @@ spec:
3434
tolerations: []
3535
hostNetwork: false
3636
dependsOn:
37-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
38-
- name: {{ .Release.Name }}
39-
namespace: {{ .Release.Namespace }}
40-
{{- end }}
4137
- name: {{ .Release.Name }}-cilium
4238
namespace: {{ .Release.Namespace }}
4339
---
@@ -73,10 +69,6 @@ spec:
7369
{{- toYaml . | nindent 4 }}
7470
{{- end }}
7571
dependsOn:
76-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
77-
- name: {{ .Release.Name }}
78-
namespace: {{ .Release.Namespace }}
79-
{{- end }}
8072
- name: {{ .Release.Name }}-cilium
8173
namespace: {{ .Release.Namespace }}
8274
- 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
@@ -27,9 +27,4 @@ spec:
2727
upgrade:
2828
remediation:
2929
retries: -1
30-
dependsOn:
31-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
32-
- name: {{ .Release.Name }}
33-
namespace: {{ .Release.Namespace }}
34-
{{- end }}
3530
{{- end }}

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

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

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

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

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

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
- 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
@@ -53,10 +53,6 @@ spec:
5353
values:
5454
{{- toYaml (deepCopy .Values.addons.ingressNginx.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultIngressValues" .))) | nindent 4 }}
5555
dependsOn:
56-
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
57-
- name: {{ .Release.Name }}
58-
namespace: {{ .Release.Namespace }}
59-
{{- end }}
6056
- name: {{ .Release.Name }}-cilium
6157
namespace: {{ .Release.Namespace }}
6258
{{- end }}

0 commit comments

Comments
 (0)