change-values-to-use-registry-from-config-repo (#223)

* change-values-to-use-registry-from-config-repo * clean
giantswarm · Mar 5, 2024 · 7d1e0fb · 7d1e0fb
1 parent 7943936
commit 7d1e0fb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Change container image registry values name to use values from `config` repo.
+
 ## [2.15.0] - 2024-02-20
 
 ### Changed

diff --git a/config/helm/kustomization.yaml b/config/helm/kustomization.yaml
@@ -11,7 +11,7 @@ resources:
 
 images:
   - name: registry.k8s.io/cluster-api-aws/cluster-api-aws-controller
-    newName: "{{.Values.infrastructure.image.domain}}/{{.Values.infrastructure.image.name}}"
+    newName: "{{.Values.registry.domain}}/{{.Values.image.name}}"
     newTag: "{{.Values.tag}}"
 
 transformers:

diff --git a/helm/cluster-api-provider-aws/templates/apps_v1_deployment_capa-controller-manager.yaml b/helm/cluster-api-provider-aws/templates/apps_v1_deployment_capa-controller-manager.yaml
@@ -59,7 +59,7 @@ spec:
         env:
         - name: AWS_SHARED_CREDENTIALS_FILE
           value: /home/.aws/credentials
-        image: '{{.Values.infrastructure.image.domain}}/{{.Values.infrastructure.image.name}}:{{.Values.tag}}'
+        image: '{{.Values.registry.domain}}/{{.Values.image.name}}:{{.Values.tag}}'
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3

diff --git a/helm/cluster-api-provider-aws/templates/crd-install/crd-job.yaml b/helm/cluster-api-provider-aws/templates/crd-install/crd-job.yaml
@@ -31,7 +31,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: kubectl
-        image: "{{ .Values.crdInstall.kubectl.image }}:{{ .Values.crdInstall.kubectl.tag }}"
+        image: "{{ .Values.registry.domain }}/{{ .Values.crdInstall.kubectl.image }}:{{ .Values.crdInstall.kubectl.tag }}"
         command:
         - sh
         - -c

diff --git a/helm/cluster-api-provider-aws/values.yaml b/helm/cluster-api-provider-aws/values.yaml
@@ -13,10 +13,11 @@ name: cluster-api-provider-aws
 #   * do not place EKS nodes in the CNI subnets (https://github.com/giantswarm/cluster-api-provider-aws/pull/587)
 tag: v2.3.0-gs-e9c5ab62c
 
-infrastructure:
-  image:
-    domain: gsoci.azurecr.io
-    name: giantswarm/cluster-api-aws-controller
+registry:
+  domain: gsoci.azurecr.io
+
+image:
+  name: giantswarm/cluster-api-aws-controller
 
 ciliumNetworkPolicy:
   enabled: false
@@ -59,9 +60,6 @@ provider:
     accessKeyID: defaultID
     secretAccessKey: defaultKey
 
-registry:
-  domain: gsoci.azurecr.io
-
 verticalPodAutoscaler:
   enabled: true