diff --git a/global/cc-gardener/Chart.yaml b/global/cc-gardener/Chart.yaml index 792a4e1e51..6f18572b23 100644 --- 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.1 +version: 0.6.2 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 index cc8b5e4e8b..df94715780 100644 --- a/global/cc-gardener/managedresources/extension-metal.yaml +++ b/global/cc-gardener/managedresources/extension-metal.yaml @@ -9,9 +9,16 @@ helm: image: repository: "{{required ".Values.extensions.metal.image.repository is missing" .Values.extensions.metal.image.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 -}} + imageVectorOverwrite: | + images: + - name: cloud-controller-manager + sourceRepository: github.com/ironcore-dev/cloud-provider-metal + repository: "{{required ".Values.extensions.metal.imageVectorOverwrite.ccm.repository is missing" .Values.extensions.metal.imageVectorOverwrite.ccm.repository }}" + tag: "{{required ".Values.extensions.metal.imageVectorOverwrite.ccm.tag is missing" .Values.extensions.metal.imageVectorOverwrite.ccm.tag }}" + - name: machine-controller-manager-provider-metal + sourceRepository: github.com/ironcore-dev/machine-controller-manager-provider-metal + repository: "{{required ".Values.extensions.metal.imageVectorOverwrite.mcm.repository is missing" .Values.extensions.metal.imageVectorOverwrite.mcm.repository }}" + tag: "{{required ".Values.extensions.metal.imageVectorOverwrite.mcm.tag is missing" .Values.extensions.metal.imageVectorOverwrite.mcm.tag }}" --- apiVersion: core.gardener.cloud/v1beta1 kind: ControllerRegistration diff --git a/global/cc-gardener/values.yaml b/global/cc-gardener/values.yaml index 48263dce01..a17a6a0b19 100644 --- a/global/cc-gardener/values.yaml +++ b/global/cc-gardener/values.yaml @@ -57,16 +57,13 @@ extensions: 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 + imageVectorOverwrites: + ccm: + repository: ghcr.io/ironcore-dev/metal-cloud-controller-manager + tag: sha-62079d8 + mcm: + repository: ghcr.io/ironcore-dev/machine-controller-manager-provider-metal + tag: sha-1591c41 gardenlet: enabled: false owner-info: