Add deployment overrides to templates files

Signed-off-by: Omer Aplatony <[email protected]>
kubernetes-sigs · Jul 30, 2024 · a51d44e · a51d44e
1 parent 2e244f4
commit a51d44e
Show file tree

Hide file tree

Showing 9 changed files with 1,613 additions and 2 deletions.
diff --git a/hack/charts/cluster-api-operator/templates/addon.yaml b/hack/charts/cluster-api-operator/templates/addon.yaml
@@ -51,4 +51,7 @@ spec:
   secretNamespace: {{ $.Values.secretNamespace }}
 {{- end }}
 {{- end }}
+{{- if hasKey $.Values.deploymentOverride "addon" }}
+  {{ .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,4 +52,7 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
+{{- if hasKey $.Values.deploymentOverride "bootstrap" }}
+  {{ .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,4 +52,8 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
+{{- if hasKey $.Values.deploymentOverride "controlPlane" }}
+  {{ .Values.deploymentOverride.controlPlane | toYaml | nindent 2 }}
 {{- end }}
+{{- end }}
+
diff --git a/hack/charts/cluster-api-operator/templates/core-conditions.yaml b/hack/charts/cluster-api-operator/templates/core-conditions.yaml
@@ -27,5 +27,7 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
+{{- if hasKey $.Values.deploymentOverride "coreCondition" }}
+  {{ .Values.deploymentOverride.coreCondition| 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,4 +59,7 @@ spec:
     namespace: {{ $.Values.configSecret.namespace }}
     {{- end }}
 {{- end }}
+{{- if hasKey $.Values.deploymentOverride "core" }}
+  {{ .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,5 +56,8 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
-
+{{- if hasKey $.Values.deploymentOverride "infraCondition" }}
+  {{ .Values.deploymentOverride.infraCondition | 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,4 +65,7 @@ spec:
     {{- end }}
 {{- end }}
 {{- end }}
+{{- if hasKey $.Values.deploymentOverride "infrastructure" }}
+  {{ .Values.deploymentOverride.infrastructure | toYaml | nindent 2 }}
+{{- end }}
 {{- end }}
diff --git a/test/e2e/helm_test.go b/test/e2e/helm_test.go
@@ -229,4 +229,33 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
 		Expect(err).ToNot(HaveOccurred())
 		Expect(manifests).To(Equal(string(expectedManifests)))
 	})
+
+	It("should include deplpoymentoverrides when specified - all", func() {
+		manifest, err := helmChart.Run(map[string]string{
+			"core":           "override-test-core",
+			"bootstrap":      "override-test-core",
+			"controlPlane":   "override-test-core",
+			"infrastructure": "override-test-core",
+			"addon":          "override-test-core",
+			"deploymentOverride.addon.containers[0].name":                         "manager",
+			"deploymentOverride.addon.containers[0].imageUrl":                     "test.org/cluster-api-provider-aws/cluster-api-provider-aws-controller:v0.6.0",
+			"deploymentOverride.core.containers[0].name":                          "manager",
+			"deploymentOverride.core.containers[0].imageUrl":                      "test.org/cluster-api/cluster-api-controller:v1.7.1",
+			"deploymentOverride.infrastructure.deployment.containers[0].name":     "manager",
+			"deploymentOverride.infrastructure.deployment.containers[0].imageUrl": "test.org/cluster-api-vsphere/cluster-api-vsphere-controller:v1.10.0",
+			"deploymentOverride.bootstrap.deployment.containers[0].name":          "manager",
+			"deploymentOverride.bootstrap.deployment.containers[0].imageUrl":      "test.org/cluster-api-bootstrap-provider-kubeadm/cluster-api-kubeadm-controller:v0.4.0",
+			"deploymentOverride.controlPlane.deployment.containers[0].name":       "manager",
+			"deploymentOverride.controlPlane.deployment.containers[0].imageUrl":   "test.org/cluster-api-control-plane/cluster-api-control-plane-controller:v0.4.0",
+			"deploymentOverride.coreConditions.containers[0].name":                "manager",
+			"deploymentOverride.coreConditions.containers[0].imageUrl":            "test.org/cluster-api/cluster-api-controller:v1.7.1",
+			"deploymentOverride.infraConditions.containers[0].name":               "manager",
+			"deploymentOverride.infraConditions.containers[0].imageUrl":           "test.org/cluster-api/cluster-api-controller:v1.7.1",
+		})
+		Except(err).ToNot(HaveOccurred())
+		Except(manifest).ToNot(BeEmpty())
+		expectedManifests, err := os.ReadFile(filepath.Join(customManifestsFolder, "deployment-overrides-all.yaml"))
+		Except(err).ToNot(HaveOccurred())
+		Except(manifest).To(Equal(string(expectedManifests)))
+	})
 })