restore changes

Author: MichaelSp

charts/docker-mailserver/templates/deployment.yaml

@@ -57,10 +57,10 @@ spec:
       {{- end }}
 
         # Secrets
-      {{- range $name, $secret := .Values.secrets }}
-        - name: {{ regexReplaceAll "[.]" $name "-" }}
+      {{- range .Values.secrets }}
+        - name: {{ regexReplaceAll "[.]" .name "-" }}
           secret:
-            secretName: {{ regexReplaceAll "[.]" $name "-" }}
+            secretName: {{ regexReplaceAll "[.]" .name "-" }}
       {{- end }}
 
         # Certificate
@@ -83,18 +83,6 @@ 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 }}
@@ -144,13 +132,13 @@ spec:
         {{- end }}
 
             # Config via Secrets
-        {{- range $name, $secret := .Values.secrets }}
-            - name: {{ regexReplaceAll "[.]" $name "-" }}
-              subPath: {{ $secret.key | default $name }}
-            {{- if isAbs $secret.path }}
-              mountPath: {{ $secret.path }}
+        {{- range .Values.secrets }}
+            - name: {{ regexReplaceAll "[.]" .name "-" }}
+              subPath: {{ .key | default .name }}
+            {{- if isAbs .path }}
+              mountPath: {{ $.path }}
             {{- else }}
-              mountPath: /tmp/docker-mailserver/{{ $secret.path }}
+              mountPath: /tmp/docker-mailserver/{{ .path }}
             {{- end }}
         {{- end }}
 
@@ -162,11 +150,6 @@ spec:
           {{- end }}
         {{- end }}
 
-            # Mount Extra Volumes
-          {{- with $.Values.deployment.extraVolumeMounts }}
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-
           livenessProbe:
             exec:
                command:
@@ -194,8 +177,6 @@ spec:
             - name: submission
               containerPort: 587
           {{- if .Values.proxyProtocol.enabled }}
-            - name: smtp-proxy
-              containerPort: 12525
             - name: subs-proxy
               containerPort: 10465
             - name: sub-proxy
@@ -263,7 +244,7 @@ spec:
           {{- if $persistence.enabled }}
             - name: {{ $name }}
               mountPath: {{ $persistence.mountPath }}
-              readonly: true
+              readOnly: true
           {{- end }}
         {{- end }}
-{{- end }}
+{{- end }}

charts/docker-mailserver/tests/__snapshot__/deployment_test.yaml.snap

@@ -152,8 +152,6 @@ manifest should match snapshot:
                   name: submissions
                 - containerPort: 587
                   name: submission
-                - containerPort: 12525
-                  name: smtp-proxy
                 - containerPort: 10465
                   name: subs-proxy
                 - containerPort: 10587

charts/docker-mailserver/tests/__snapshot__/secret_test.yaml.snap

@@ -152,8 +152,6 @@ manifest should match snapshot:
                   name: submissions
                 - containerPort: 587
                   name: submission
-                - containerPort: 12525
-                  name: smtp-proxy
                 - containerPort: 10465
                   name: subs-proxy
                 - containerPort: 10587