Merge pull request #525 from alexander-demicev/fiximageshelm

Add helm chart value to override CAPI images
rancher · May 2, 2024 · 449f771 · 449f771
2 parents 79f15fa + aee71a2
commit 449f771
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/charts/rancher-turtles/templates/core-provider.yaml b/charts/rancher-turtles/templates/core-provider.yaml
@@ -41,6 +41,12 @@ spec:
     selector: {{ index .Values "cluster-api-operator" "cluster-api" "core" "fetchConfig" "selector" }}
     {{- end }}
 {{- end }}
+{{- if index .Values "cluster-api-operator" "cluster-api" "core" "image" }}
+  deployment:
+    containers:
+      - name: manager
+        image: {{ index .Values "cluster-api-operator" "cluster-api" "core" "image" }}
+{{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/charts/rancher-turtles/templates/rke2-bootstrap.yaml b/charts/rancher-turtles/templates/rke2-bootstrap.yaml
@@ -40,4 +40,10 @@ spec:
     selector: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "bootstrap" "fetchConfig" "selector" }}
     {{- end }}
 {{- end }}
+{{- if index .Values "cluster-api-operator" "cluster-api" "rke2" "bootstrap" "image" }}
+  deployment:
+    containers:
+      - name: manager
+        image: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "bootstrap" "image" }}
+{{- end }}
 {{- end }}
diff --git a/charts/rancher-turtles/templates/rke2-controlplane.yaml b/charts/rancher-turtles/templates/rke2-controlplane.yaml
@@ -40,4 +40,10 @@ spec:
     selector: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "controlPlane" "fetchConfig" "selector" }}
     {{- end }}
 {{- end }}
+{{- if index .Values "cluster-api-operator" "cluster-api" "rke2" "controlPlane" "image" }}
+  deployment:
+    containers:
+      - name: manager
+        image: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "controlPlane" "image" }}
+{{- end }}
 {{- end }}
diff --git a/charts/rancher-turtles/values.yaml b/charts/rancher-turtles/values.yaml
@@ -49,6 +49,7 @@ cluster-api-operator:
       defaultName: capi-env-variables
     core:
       namespace: capi-system
+      image: ""
       fetchConfig:
         url: ""
         selector: ""
@@ -57,11 +58,13 @@ cluster-api-operator:
       version: ""
       bootstrap:
         namespace: rke2-bootstrap-system
+        image: ""
         fetchConfig:
           url: ""
           selector: ""
       controlPlane:
         namespace: rke2-control-plane-system
+        image: ""
         fetchConfig:
           url: ""
           selector: ""