Merge pull request #533 from willie-yao/fix-upstream-chart

🐛 Fix helm chart syntax errors
kubernetes-sigs · May 31, 2024 · 7e8c9cd · 7e8c9cd
2 parents fab98f2 + 92f0294
commit 7e8c9cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hack/charts/cluster-api-operator/templates/core.yaml b/hack/charts/cluster-api-operator/templates/core.yaml
@@ -45,7 +45,7 @@ spec:
 {{- end }}
 {{- if $.Values.manager }}
  manager:
-{{- if $.Values.manager.featureGates.core }}
+{{- if and $.Values.manager.featureGates $.Values.manager.featureGates.core }}
  featureGates:
  {{- range $key, $value := $.Values.manager.featureGates.core }}
  {{ $key }}: {{ $value }}

diff --git a/hack/charts/cluster-api-operator/templates/infra.yaml b/hack/charts/cluster-api-operator/templates/infra.yaml
@@ -38,15 +38,15 @@ metadata:
  annotations:
  "helm.sh/hook": "post-install"
  "helm.sh/hook-weight": "2"
-{{- if or $infrastructureVersion $.Values.configSecret.name }}
+{{- if or $infrastructureVersion $.Values.configSecret.name $.Values.manager }}
 spec:
 {{- end }}
 {{- if $infrastructureVersion }}
  version: {{ $infrastructureVersion }}
 {{- end }}
 {{- if $.Values.manager }}
  manager:
-{{- if hasKey $.Values.manager.featureGates $infrastructureName }}
+{{- if and (kindIs "map" $.Values.manager.featureGates) (hasKey $.Values.manager.featureGates $infrastructureName) }}
 {{- range $key, $value := $.Values.manager.featureGates }}
  {{- if eq $key $infrastructureName }}
  featureGates: