Merge branch 'master' into bug/media-common

charts/media-common/templates/_helpers.tpl

@@ -51,6 +51,15 @@ app.kubernetes.io/name: {{ include "media-common.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+Init Containers
+*/}}
+{{- define "media-common.initContainers" -}}
+{{- if .Values.initContainers }}
+{{- toYaml .Values.initContainers }}
+{{- end }}
+{{- end -}}
+
 {{/*
 Additional Containers
 */}}

charts/media-common/templates/deployment.yaml

@@ -27,6 +27,10 @@ spec:
       securityContext:
       {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.initContainers }}
+      initContainers:
+        {{- include "media-common.initContainers" . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ template "media-common.fullname" . }}
           {{- with .Values.securityContext }}

charts/media-common/templates/statefulset.yaml

@@ -28,6 +28,10 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.initContainers }}
+      initContainers:
+        {{- include "media-common.initContainers" . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ template "media-common.fullname" . }}
           {{- with .Values.securityContext }}

charts/media-common/values.yaml

@@ -117,6 +117,8 @@ persistence:
     ## Do not delete the pvc upon helm uninstall
     skipuninstall: false
 
+initContainers: []
+
 additionalContainers: []
 
 additionalVolumes: []