chore(helm): refactor utility image config

Author: nicktrn

hosting/k8s/helm/templates/_helpers.tpl

@@ -95,6 +95,34 @@ Get the full image name for supervisor
 {{- end }}
 {{- end }}
 
+{{/*
+Get the full image name for webapp volumePermissions init container
+*/}}
+{{- define "trigger-v4.webapp.volumePermissions.image" -}}
+{{- $registry := .Values.global.imageRegistry | default .Values.webapp.volumePermissions.image.registry -}}
+{{- $repository := .Values.webapp.volumePermissions.image.repository -}}
+{{- $tag := .Values.webapp.volumePermissions.image.tag -}}
+{{- if $registry }}
+{{- printf "%s/%s:%s" $registry $repository $tag }}
+{{- else }}
+{{- printf "%s:%s" $repository $tag }}
+{{- end }}
+{{- end }}
+
+{{/*
+Get the full image name for webapp tokenSyncer sidecar
+*/}}
+{{- define "trigger-v4.webapp.tokenSyncer.image" -}}
+{{- $registry := .Values.global.imageRegistry | default .Values.webapp.tokenSyncer.image.registry -}}
+{{- $repository := .Values.webapp.tokenSyncer.image.repository -}}
+{{- $tag := .Values.webapp.tokenSyncer.image.tag -}}
+{{- if $registry }}
+{{- printf "%s/%s:%s" $registry $repository $tag }}
+{{- else }}
+{{- printf "%s:%s" $repository $tag }}
+{{- end }}
+{{- end }}
+
 {{/*
 PostgreSQL hostname (deprecated - used only for legacy DATABASE_HOST env var)
 */}}

hosting/k8s/helm/templates/webapp.yaml

@@ -67,9 +67,9 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
       initContainers:
-        - name: init-shared
-          image: "{{ .Values.webapp.initImage.registry }}/{{ .Values.webapp.initImage.repository }}:{{ .Values.webapp.initImage.tag }}"
-          imagePullPolicy: {{ .Values.webapp.initImage.pullPolicy }}
+        - name: volume-permissions
+          image: {{ include "trigger-v4.webapp.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.webapp.volumePermissions.image.pullPolicy }}
           command: ['sh', '-c', 'mkdir -p /home/node/shared']
           securityContext:
             runAsUser: 1000
@@ -78,8 +78,8 @@ spec:
               mountPath: /home/node/shared
       containers:
         - name: token-syncer
-          image: "{{ .Values.webapp.tokenSyncerImage.registry }}/{{ .Values.webapp.tokenSyncerImage.repository }}:{{ .Values.webapp.tokenSyncerImage.tag }}"
-          imagePullPolicy: {{ .Values.webapp.tokenSyncerImage.pullPolicy }}
+          image: {{ include "trigger-v4.webapp.tokenSyncer.image" . }}
+          imagePullPolicy: {{ .Values.webapp.tokenSyncer.image.pullPolicy }}
           securityContext:
             runAsUser: 1000
             runAsNonRoot: true

hosting/k8s/helm/values.yaml

@@ -48,19 +48,21 @@ webapp:
     tag: "" # Defaults to Chart.appVersion when empty
     pullPolicy: IfNotPresent
 
-  # Init container image configuration
-  initImage:
-    registry: docker.io
-    repository: busybox
-    tag: "1.35"
-    pullPolicy: IfNotPresent
-
-  # Token syncer image configuration
-  tokenSyncerImage:
-    registry: docker.io
-    repository: bitnamilegacy/kubectl
-    tag: "1.28"
-    pullPolicy: IfNotPresent
+  # Init container for shared directory setup
+  volumePermissions:
+    image:
+      registry: docker.io
+      repository: busybox
+      tag: "1.35"
+      pullPolicy: IfNotPresent
+
+  # Sidecar for token syncing
+  tokenSyncer:
+    image:
+      registry: docker.io
+      repository: bitnamilegacy/kubectl
+      tag: "1.28"
+      pullPolicy: IfNotPresent
 
   # Origin configuration
   appOrigin: "http://localhost:3040"