merge with master

Author: MichaelSp

charts/docker-mailserver/templates/deployment.yaml

@@ -83,6 +83,18 @@ spec:
       {{- end }}
     {{- end }}
 
+        # Extra volumes
+      {{- with .Values.deployment.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+
+      {{- if .Values.deployment.initContainers }}
+      initContainers:
+        {{- with .Values.deployment.initContainers }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- end }}
+
       containers:
         - name: docker-mailserver
           image: {{ .Values.image.name }}:{{ default .Chart.AppVersion .Values.image.tag }}
@@ -150,6 +162,11 @@ spec:
           {{- end }}
         {{- end }}
 
+            # Mount Extra Volumes
+          {{- with $.Values.deployment.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+
           livenessProbe:
             exec:
                command:
@@ -177,6 +194,8 @@ spec:
             - name: submission
               containerPort: 587
           {{- if .Values.proxyProtocol.enabled }}
+            - name: smtp-proxy
+              containerPort: 12525
             - name: subs-proxy
               containerPort: 10465
             - name: sub-proxy
@@ -247,4 +266,4 @@ spec:
               readOnly: true
           {{- end }}
         {{- end }}
-{{- end }}
+{{- end }}