From 6d62fedf0292e3562b8c1ef9a31c9303b5c350f1 Mon Sep 17 00:00:00 2001
From: Omer Aplatony <omerap12@gmail.com>
Date: Tue, 4 Jun 2024 23:00:26 +0300
Subject: [PATCH] Update deploymentOverride in templates

---
 hack/charts/cluster-api-operator/templates/addon.yaml      | 6 +++---
 hack/charts/cluster-api-operator/templates/bootstrap.yaml  | 4 ++--
 .../cluster-api-operator/templates/control-plane.yaml      | 5 +++--
 .../cluster-api-operator/templates/core-conditions.yaml    | 7 +++----
 hack/charts/cluster-api-operator/templates/core.yaml       | 6 +++---
 .../cluster-api-operator/templates/infra-conditions.yaml   | 7 ++++---
 hack/charts/cluster-api-operator/templates/infra.yaml      | 6 +++---
 7 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/hack/charts/cluster-api-operator/templates/addon.yaml b/hack/charts/cluster-api-operator/templates/addon.yaml
index db6bb4871..bd0bf1ac4 100644
--- 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 }}
\ No newline at end of file
+  {{ .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
index e49a5ed17..ddc675a6e 100644
--- 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 }}
\ No newline at end of file
diff --git a/hack/charts/cluster-api-operator/templates/control-plane.yaml b/hack/charts/cluster-api-operator/templates/control-plane.yaml
index ea03a8411..010b2f4be 100644
--- 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
index ad1376bc4..2f48a826d 100644
--- 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 }}
\ No newline at end of file
diff --git a/hack/charts/cluster-api-operator/templates/core.yaml b/hack/charts/cluster-api-operator/templates/core.yaml
index ded2f8e10..517db85a1 100644
--- 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 }}
\ No newline at end of file
+  {{ .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
index 06d84d2eb..d8633fce3 100644
--- 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 }}
\ No newline at end of file
+{{- end }}
+
diff --git a/hack/charts/cluster-api-operator/templates/infra.yaml b/hack/charts/cluster-api-operator/templates/infra.yaml
index 5d7ef679b..bf3e03244 100644
--- 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 }}
\ No newline at end of file
+  {{ .Values.deploymentOverride.infrastructure | toYaml | nindent 2 }}
+{{- end }}
+{{- end }}