chore: mount extraVolumes in initContainers too

Author: fernandezcuesta

helm/defectdojo/templates/initializer-job.yaml

@@ -44,7 +44,7 @@ spec:
       - name: {{ . }}
       {{- end }}
       volumes:
-      {{- if  .Values.localsettingspy }}
+      {{- if .Values.localsettingspy }}
       - name: localsettingspy
         configMap:
           name: {{ $fullName }}-localsettingspy
@@ -62,7 +62,7 @@ spec:
           {{- end }}
       {{- end }}
       initContainers:
-      {{- if .Values.cloudsql.enabled  }}
+      {{- if .Values.cloudsql.enabled }}
       - name: cloudsql-proxy
         image: {{ .Values.cloudsql.image.repository }}:{{ .Values.cloudsql.image.tag }}
         imagePullPolicy: {{ .Values.cloudsql.image.pullPolicy }}
@@ -79,6 +79,13 @@ spec:
         {{- if .Values.cloudsql.use_private_ip }}
         - "-ip_address_types=PRIVATE"
         {{- end }}
+        volumeMounts:
+        {{- range .Values.initializer.extraVolumes }}
+        - name: userconfig-{{ .name }}
+          readOnly: true
+          mountPath: {{ .path }}
+          subPath: {{ .subPath }}
+        {{- end }}
       {{- end }}
       - name: wait-for-db
         command:
@@ -103,6 +110,13 @@ spec:
         {{- end }}
         resources:
           {{- toYaml .Values.initializer.resources | nindent 10 }}
+        volumeMounts:
+        {{- range .Values.initializer.extraVolumes }}
+        - name: userconfig-{{ .name }}
+          readOnly: true
+          mountPath: {{ .path }}
+          subPath: {{ .subPath }}
+        {{- end }}
       containers:
       - name: initializer
         image: "{{ template "initializer.repository" . }}:{{ .Values.tag }}"
@@ -112,7 +126,7 @@ spec:
           {{- toYaml .Values.securityContext.djangoSecurityContext | nindent 10 }}
         {{- end }}
         volumeMounts:
-        {{- if  .Values.localsettingspy }}
+        {{- if .Values.localsettingspy }}
         - name: localsettingspy
           readOnly: true
           mountPath: /app/dojo/settings/local_settings.py

helm/defectdojo/values.yaml

@@ -383,9 +383,9 @@ initializer:
       memory: 512Mi
   # Additional environment variables injected to the initializer job pods.
   extraEnv: []
-  # Array of additional volume mount points for the initializer job pods.
+  # Array of additional volume mount points for the initializer job (init)containers.
   extraVolumeMounts: []
-  # A list of extra volumes to mount.
+  # A list of extra volumes to attach to the initializer job pods.
   extraVolumes: []
 
   # staticName defines whether name of the job will be the same (e.g., "defectdojo-initializer")