[cc-gardener] metal extension image values configurable

sapcc · Dec 24, 2024 · c8b4b09 · c8b4b09
1 parent 0367da3
commit c8b4b09
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/global/cc-gardener/Chart.yaml b/global/cc-gardener/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: cc-gardener
 description: Converged Cloud Gardener setup based on gardener-operator
 type: application
-version: 0.6.0
+version: 0.6.1
 appVersion: "v1.110.1"
 home: https://github.com/gardener/gardener
 dependencies:

diff --git a/global/cc-gardener/managedresources/extension-metal.yaml b/global/cc-gardener/managedresources/extension-metal.yaml
@@ -7,17 +7,11 @@ helm:
   rawChart: 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
   values:
     image:
-      tag: sha-681e007
-    imageVectorOverwrite: |
-      images:
-        - name: cloud-controller-manager
-          sourceRepository: github.com/ironcore-dev/cloud-provider-metal
-          repository: ghcr.io/ironcore-dev/metal-cloud-controller-manager
-          tag: sha-62079d8
-        - name: machine-controller-manager-provider-metal
-          sourceRepository: github.com/ironcore-dev/machine-controller-manager-provider-metal
-          repository: ghcr.io/ironcore-dev/machine-controller-manager-provider-metal
-          tag: sha-1591c41
+      repository: "{{required ".Values.extensions.metal.image.repository is missing" .Values.extensions.metal.imege.repository }}"
+      tag: "{{required ".Values.extensions.metal.image.tag is missing" .Values.extensions.metal.image.tag }}"
+    {{- if .Values.extensions.metal.imageVectorOverwrites }}
+    imageVectorOverwrite: "{{ .Values.extensions.metal.imageVectorOverwrites }}"
+    {{ end -}}
 ---
 apiVersion: core.gardener.cloud/v1beta1
 kind: ControllerRegistration

diff --git a/global/cc-gardener/values.yaml b/global/cc-gardener/values.yaml
@@ -54,6 +54,19 @@ extensions:
     zones: []
   metal:
     enabled: false
+    image:
+      repository: ghcr.io/ironcore-dev/gardener-extension-provider-metal
+      tag: sha-681e007
+    imageVectorOverwrites: |
+      images:
+        - name: cloud-controller-manager
+          sourceRepository: github.com/ironcore-dev/cloud-provider-metal
+          repository: ghcr.io/ironcore-dev/metal-cloud-controller-manager
+          tag: sha-62079d8
+        - name: machine-controller-manager-provider-metal
+          sourceRepository: github.com/ironcore-dev/machine-controller-manager-provider-metal
+          repository: ghcr.io/ironcore-dev/machine-controller-manager-provider-metal
+          tag: sha-1591c41
 gardenlet:
   enabled: false
 owner-info: