Update deploymentOverride in templates

kubernetes-sigs · Jun 4, 2024 · 6d62fed · 6d62fed
1 parent 1df9146
commit 6d62fed
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/hack/charts/cluster-api-operator/templates/addon.yaml b/hack/charts/cluster-api-operator/templates/addon.yaml
@@ -51,7 +51,7 @@ spec:
   secretNamespace: {{ $.Values.secretNamespace }}
 {{- end }}
 {{- end }}
-{{- end }}
 {{- if hasKey $.Values.deploymentOverride "addon" }}
-  {{ $.Values.deploymentOverride.addon | toYaml | nindent 2 }}
-{{- end }}
+  {{ .Values.deploymentOverride.addon | toYaml | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/hack/charts/cluster-api-operator/templates/bootstrap.yaml b/hack/charts/cluster-api-operator/templates/bootstrap.yaml
@@ -52,7 +52,7 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
 {{- if hasKey $.Values.deploymentOverride "bootstrap" }}
-  {{ $.Values.deploymentOverride.bootstrap | toYaml | nindent 2 }}
+  {{ .Values.deploymentOverride.bootstrap | toYaml | nindent 2 }}
+{{- end }}
 {{- end }}
diff --git a/hack/charts/cluster-api-operator/templates/control-plane.yaml b/hack/charts/cluster-api-operator/templates/control-plane.yaml
@@ -52,7 +52,8 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
+{{- if hasKey $.Values.deploymentOverride "controlPlane" }}
+  {{ .Values.deploymentOverride.controlPlane | toYaml | nindent 2 }}
 {{- end }}
-{{- if hasKey $.Values.deploymentOverride "control-plane" }}
-  {{ $.Values.deploymentOverride.control-plane | toYaml | nindent 2 }}
 {{- end }}
+
diff --git a/hack/charts/cluster-api-operator/templates/core-conditions.yaml b/hack/charts/cluster-api-operator/templates/core-conditions.yaml
@@ -27,8 +27,7 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
+{{- if hasKey $.Values.deploymentOverride "coreCondition" }}
+  {{ .Values.deploymentOverride.coreCondition| toYaml | nindent 2 }}
 {{- end }}
-{{- if hasKey $.Values.deploymentOverride "core-condition" }}
-  {{ $.Values.deploymentOverride.core-condition | toYaml | nindent 2 }}
-{{- end }}
-
+{{- end }}
diff --git a/hack/charts/cluster-api-operator/templates/core.yaml b/hack/charts/cluster-api-operator/templates/core.yaml
@@ -59,7 +59,7 @@ spec:
     namespace: {{ $.Values.configSecret.namespace }}
     {{- end }}
 {{- end }}
-{{- end }}
 {{- if hasKey $.Values.deploymentOverride "core" }}
-  {{ $.Values.deploymentOverride.core | toYaml | nindent 2 }}
-{{- end }}
+  {{ .Values.deploymentOverride.core | toYaml | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/hack/charts/cluster-api-operator/templates/infra-conditions.yaml b/hack/charts/cluster-api-operator/templates/infra-conditions.yaml
@@ -56,7 +56,8 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
+{{- if hasKey $.Values.deploymentOverride "infraCondition" }}
+  {{ .Values.deploymentOverride.infraCondition | toYaml | nindent 2 }}
 {{- end }}
-{{- if hasKey $.Values.deploymentOverride "infra-condition" }}
-  {{ $.Values.deploymentOverride.infra-condition | toYaml | nindent 2 }}
-{{- end }}
+{{- end }}
+
diff --git a/hack/charts/cluster-api-operator/templates/infra.yaml b/hack/charts/cluster-api-operator/templates/infra.yaml
@@ -65,7 +65,7 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
 {{- if hasKey $.Values.deploymentOverride "infrastructure" }}
-  {{ $.Values.deploymentOverride.infrastructure | toYaml | nindent 2 }}
-{{- end }}
+  {{ .Values.deploymentOverride.infrastructure | toYaml | nindent 2 }}
+{{- end }}
+{{- end }}