chore(helm): Add secret-operator specific adjustments

Author: Techassi

deploy/helm/secret-operator/templates/_local_helpers.tpl

@@ -0,0 +1,13 @@
+{{/*
+Expand the image name for csi-provisioner
+*/}}
+{{- define "csi-provisioner.image" -}}
+{{- printf "%s/csi-provisioner:%s" (.Values.csiNodeDriver.externalProvisioner.image.repository | default (printf "%s/sig-storage" .Values.image.repository)) .Values.csiNodeDriver.externalProvisioner.image.tag }}
+{{- end }}
+
+{{/*
+Expand the image name for csi-node-driver-registrar
+*/}}
+{{- define "csi-node-driver-registrar.image" -}}
+{{- printf "%s/csi-node-driver-registrar:%s" (.Values.csiNodeDriver.nodeDriverRegistrar.image.repository | default (printf "%s/sig-storage" .Values.image.repository)) .Values.csiNodeDriver.nodeDriverRegistrar.image.tag }}
+{{- end }}

deploy/helm/secret-operator/templates/csi-node-driver-daemonset.yaml

@@ -12,7 +12,7 @@ spec:
   template:
     metadata:
       annotations:
-        internal.stackable.tech/image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        internal.stackable.tech/image: "{{ include "operator.image" . }}"
         {{- with .Values.csiNodeDriver.podAnnotations }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -31,7 +31,7 @@ spec:
         - name: csi-node-service
           securityContext:
             {{- toYaml .Values.csiNodeDriver.nodeService.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ include "operator.image" . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
             {{ .Values.csiNodeDriver.nodeService.resources | toYaml | nindent 12 }}
@@ -72,6 +72,10 @@ spec:
             - name: OPERATOR_SERVICE_NAME
               value: {{ include "operator.fullname" . }}
 
+            # The image repository, like "oci.stackable.tech/sdp"
+            - name: IMAGE_REPOSITORY
+              value: {{ .Values.image.repository }}
+
             # Operators need to know the node name they are running on, to e.g. discover the
             # Kubernetes domain name from the kubelet API.
             - name: KUBERNETES_NODE_NAME
@@ -104,7 +108,7 @@ spec:
               mountPath: /tmp
 
         - name: external-provisioner
-          image: "{{ .Values.csiNodeDriver.externalProvisioner.image.repository }}:{{ .Values.csiNodeDriver.externalProvisioner.image.tag }}"
+          image: "{{ include "csi-provisioner.image" . }}"
           imagePullPolicy: {{ .Values.csiNodeDriver.externalProvisioner.image.pullPolicy }}
           resources:
             {{ .Values.csiNodeDriver.externalProvisioner.resources | toYaml | nindent 12 }}
@@ -117,7 +121,7 @@ spec:
               mountPath: /csi
 
         - name: node-driver-registrar
-          image: "{{ .Values.csiNodeDriver.nodeDriverRegistrar.image.repository }}:{{ .Values.csiNodeDriver.nodeDriverRegistrar.image.tag }}"
+          image: "{{ include "csi-node-driver-registrar.image" . }}"
           imagePullPolicy: {{ .Values.csiNodeDriver.nodeDriverRegistrar.image.pullPolicy }}
           resources:
             {{ .Values.csiNodeDriver.nodeDriverRegistrar.resources | toYaml | nindent 12 }}

deploy/helm/secret-operator/values.yaml

@@ -2,7 +2,8 @@
 ---
 # Used by both the Controller Service and Node Service containers
 image:
-  repository: oci.stackable.tech/sdp/secret-operator
+  # By default, the correct registry is automatically selected based on the Helm Chart installation source
+  # repository: oci.stackable.tech/sdp
   # tag: 0.0.0-dev
   pullPolicy: IfNotPresent
   pullSecrets: []
@@ -70,7 +71,8 @@ csiNodeDriver:
 
   externalProvisioner:
     image:
-      repository: oci.stackable.tech/sdp/sig-storage/csi-provisioner
+      # By default, the correct registry is automatically selected based on the Helm Chart installation source
+      # repository: oci.stackable.tech/sdp/sig-storage
       tag: v5.3.0
       pullPolicy: IfNotPresent
       # NOTE (@Techassi): Support setting pullSecrets
@@ -84,7 +86,8 @@ csiNodeDriver:
 
   nodeDriverRegistrar:
     image:
-      repository: oci.stackable.tech/sdp/sig-storage/csi-node-driver-registrar
+      # By default, the correct registry is automatically selected based on the Helm Chart installation source
+      # repository: oci.stackable.tech/sdp/sig-storage
       tag: v2.15.0
       pullPolicy: IfNotPresent
       # NOTE (@Techassi): Support setting pullSecrets