Chart: Add global.image.registry.

kubernetes-sigs · Dec 8, 2024 · 2a4c823 · 2a4c823
1 parent 0b1bca6
commit 2a4c823
Show file tree

Hide file tree

Showing 14 changed files with 106 additions and 66 deletions.
diff --git a/charts/secrets-store-csi-driver/README.md b/charts/secrets-store-csi-driver/README.md
diff --git a/charts/secrets-store-csi-driver/templates/_helpers.tpl b/charts/secrets-store-csi-driver/templates/_helpers.tpl
@@ -53,3 +53,13 @@ Return the appropriate apiVersion for CSIDriver.
 {{- print "storage.k8s.io/v1beta1" -}}
 {{- end -}}
 {{- end -}}
+
+{{- define "sscd.imageRepository" -}}
+{{- $globalImageRegistry := index . 0 -}}
+{{- $repository := index . 1 -}}
+{{- if hasPrefix "/" $repository -}}
+{{ $globalImageRegistry }}{{ $repository }}
+{{- else -}}
+{{ $repository }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/secrets-store-csi-driver/templates/crds-upgrade-hook.yaml b/charts/secrets-store-csi-driver/templates/crds-upgrade-hook.yaml
@@ -109,7 +109,7 @@ spec:
       restartPolicy: Never
       containers:
       - name: crds-upgrade
-        image: "{{ .Values.linux.crds.image.repository }}:{{ .Values.linux.crds.image.tag }}"
+        image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.linux.crds.image.repository) }}:{{ .Values.linux.crds.image.tag }}"
         args:
         - apply
         - -f

diff --git a/charts/secrets-store-csi-driver/templates/keep-crds-upgrade-hook.yaml b/charts/secrets-store-csi-driver/templates/keep-crds-upgrade-hook.yaml
@@ -109,7 +109,7 @@ spec:
       restartPolicy: Never
       containers:
       - name: crds-keep
-        image: "{{ .Values.linux.crds.image.repository }}:{{ .Values.linux.crds.image.tag }}"
+        image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.linux.crds.image.repository) }}:{{ .Values.linux.crds.image.tag }}"
         args:
         - patch
         - crd

diff --git a/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml b/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml
@@ -39,9 +39,9 @@ spec:
       containers:
         - name: node-driver-registrar
           {{- if .Values.windows.registrarImage.digest }}
-          image: "{{ .Values.windows.registrarImage.repository }}@{{ .Values.windows.registrarImage.digest }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.windows.registrarImage.repository) }}@{{ .Values.windows.registrarImage.digest }}"
           {{- else }}
-          image: "{{ .Values.windows.registrarImage.repository }}:{{ .Values.windows.registrarImage.tag }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.windows.registrarImage.repository) }}:{{ .Values.windows.registrarImage.tag }}"
           {{- end }}
           args:
             - --v={{ .Values.windows.registrar.logVerbosity }}
@@ -59,9 +59,9 @@ spec:
 {{- end }}
         - name: secrets-store
           {{- if .Values.windows.image.digest }}
-          image: "{{ .Values.windows.image.repository }}@{{ .Values.windows.image.digest }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.windows.image.repository) }}@{{ .Values.windows.image.digest }}"
           {{- else }}
-          image: "{{ .Values.windows.image.repository }}:{{ .Values.windows.image.tag }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.windows.image.repository) }}:{{ .Values.windows.image.tag }}"
           {{- end }}
           args:
             {{- if .Values.logVerbosity }}
@@ -140,9 +140,9 @@ spec:
 {{- end }}
         - name: liveness-probe
           {{- if .Values.windows.livenessProbeImage.digest }}
-          image: "{{ .Values.windows.livenessProbeImage.repository }}@{{ .Values.windows.livenessProbeImage.digest }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.windows.livenessProbeImage.repository) }}@{{ .Values.windows.livenessProbeImage.digest }}"
           {{- else }}
-          image: "{{ .Values.windows.livenessProbeImage.repository }}:{{ .Values.windows.livenessProbeImage.tag }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.windows.livenessProbeImage.repository) }}:{{ .Values.windows.livenessProbeImage.tag }}"
           {{- end }}
           imagePullPolicy: {{ .Values.windows.livenessProbeImage.pullPolicy }}
           args:

diff --git a/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml b/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml
@@ -39,9 +39,9 @@ spec:
       containers:
         - name: node-driver-registrar
           {{- if .Values.linux.registrarImage.digest }}
-          image: "{{ .Values.linux.registrarImage.repository }}@{{ .Values.linux.registrarImage.digest }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.linux.registrarImage.repository) }}@{{ .Values.linux.registrarImage.digest }}"
           {{- else }}
-          image: "{{ .Values.linux.registrarImage.repository }}:{{ .Values.linux.registrarImage.tag }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.linux.registrarImage.repository) }}:{{ .Values.linux.registrarImage.tag }}"
           {{- end }}
           args:
             - --v={{ .Values.linux.registrar.logVerbosity }}
@@ -59,9 +59,9 @@ spec:
 {{- end }}
         - name: secrets-store
           {{- if .Values.linux.image.digest }}
-          image: "{{ .Values.linux.image.repository }}@{{ .Values.linux.image.digest }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.linux.image.repository) }}@{{ .Values.linux.image.digest }}"
           {{- else }}
-          image: "{{ .Values.linux.image.repository }}:{{ .Values.linux.image.tag }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.linux.image.repository) }}:{{ .Values.linux.image.tag }}"
           {{- end }}
           args:
             {{- if .Values.logVerbosity }}
@@ -143,9 +143,9 @@ spec:
 {{- end }}
         - name: liveness-probe
           {{- if .Values.linux.livenessProbeImage.digest }}
-          image: "{{ .Values.linux.livenessProbeImage.repository }}@{{ .Values.linux.livenessProbeImage.digest }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.linux.livenessProbeImage.repository) }}@{{ .Values.linux.livenessProbeImage.digest }}"
           {{- else }}
-          image: "{{ .Values.linux.livenessProbeImage.repository }}:{{ .Values.linux.livenessProbeImage.tag }}"
+          image: "{{ include "sscd.imageRepository" (list .Values.global.image.registry .Values.linux.livenessProbeImage.repository) }}:{{ .Values.linux.livenessProbeImage.tag }}"
           {{- end }}
           imagePullPolicy: {{ .Values.linux.livenessProbeImage.pullPolicy }}
           args:

diff --git a/charts/secrets-store-csi-driver/values.yaml b/charts/secrets-store-csi-driver/values.yaml
@@ -1,15 +1,19 @@
+global:
+  image:
+    registry: registry.k8s.io
+
 linux:
   enabled: true
   image:
-    repository: registry.k8s.io/csi-secrets-store/driver
+    repository: /csi-secrets-store/driver
     tag: v1.4.7
     #digest: sha256:
     pullPolicy: IfNotPresent
 
   crds:
     enabled: true
     image:
-      repository: registry.k8s.io/csi-secrets-store/driver-crds
+      repository: /csi-secrets-store/driver-crds
       tag: v1.4.7
       pullPolicy: IfNotPresent
     ## Optionally override resource limits for crd hooks(jobs)
@@ -44,7 +48,7 @@ linux:
         memory: 100Mi
 
   registrarImage:
-    repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
+    repository: /sig-storage/csi-node-driver-registrar
     tag: v2.11.1
     #digest: sha256:
     pullPolicy: IfNotPresent
@@ -60,7 +64,7 @@ linux:
     logVerbosity: 5
 
   livenessProbeImage:
-    repository: registry.k8s.io/sig-storage/livenessprobe
+    repository: /sig-storage/livenessprobe
     tag: v2.13.1
     #digest: sha256:
     pullPolicy: IfNotPresent
@@ -109,8 +113,13 @@ linux:
 windows:
   enabled: false
   image:
+<<<<<<< Upstream, based on kubernetes-sigs/main
     repository: registry.k8s.io/csi-secrets-store/driver
     tag: v1.4.7
+=======
+    repository: /csi-secrets-store/driver
+    tag: v1.4.6
+>>>>>>> d50e17b Chart: Add global.image.registry.
     #digest: sha256:
     pullPolicy: IfNotPresent
 
@@ -135,7 +144,7 @@ windows:
         memory: 100Mi
 
   registrarImage:
-    repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
+    repository: /sig-storage/csi-node-driver-registrar
     tag: v2.11.1
     #digest: sha256:
     pullPolicy: IfNotPresent
@@ -151,7 +160,7 @@ windows:
     logVerbosity: 5
 
   livenessProbeImage:
-    repository: registry.k8s.io/sig-storage/livenessprobe
+    repository: /sig-storage/livenessprobe
     tag: v2.13.1
     #digest: sha256:
     pullPolicy: IfNotPresent