77
88{{/* collect dependency namespaces from releases */}}
99{{- range $x := $bundle.releases }}
10- {{- $_ := set $dependencyNamespaces $x.name $x.namespace }}
10+ {{- $_ := set $dependencyNamespaces $x.name $x.namespace }}
1111{{- end }}
1212
1313{{- range $x := $bundle.releases }}
1414
1515{{- $shouldInstall := true }}
1616{{- $shouldDelete := false }}
1717{{- if or (has $x.name $disabledComponents) (and ($x.optional) (not (has $x.name $enabledComponents))) }}
18- {{- $shouldInstall = false }}
19- {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" $x.namespace $x.name }}
20- {{- $shouldDelete = true }}
21- {{- end }}
18+ {{- $shouldInstall = false }}
19+ {{- if $.Capabilities.APIVersions.Has "helm.toolkit.fluxcd.io/v2" }}
20+ {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" $x.namespace $x.name }}
21+ {{- $shouldDelete = true }}
22+ {{- end }}
23+ {{- end }}
2224{{- end }}
2325
2426{{- if or $shouldInstall $shouldDelete }}
@@ -59,10 +61,10 @@ spec:
5961 {{- end }}
6062 {{- $values := dict }}
6163 {{- with $x.values }}
62- {{- $values = merge . $values }}
64+ {{- $values = merge . $values }}
6365 {{- end }}
6466 {{- with index $cozyConfig.data (printf "values-%s" $x.name) }}
65- {{- $values = merge (fromYaml .) $values }}
67+ {{- $values = merge (fromYaml .) $values }}
6668 {{- end }}
6769 {{- with $values }}
6870 values :
@@ -82,12 +84,12 @@ spec:
8284
8385 {{- with $x.dependsOn }}
8486 dependsOn :
85- {{- range $dep := . }}
86- {{- if not (has $dep $disabledComponents) }}
87+ {{- range $dep := . }}
88+ {{- if not (has $dep $disabledComponents) }}
8789 - name : {{ $dep }}
8890 namespace : {{ index $dependencyNamespaces $dep }}
89- {{- end }}
90- {{- end }}
91+ {{- end }}
92+ {{- end }}
9193 {{- end }}
9294{{- end }}
9395{{- end }}
0 commit comments