update secrets

Author: MichaelSp

charts/docker-mailserver/templates/deployment.yaml

@@ -57,10 +57,10 @@ spec:
       {{- end }}
 
         # Secrets
-      {{- range .Values.secrets }}
-        - name: {{ regexReplaceAll "[.]" .name "-" }}
+      {{- range $name, $secret := .Values.secrets }}
+        - name: {{ regexReplaceAll "[.]" $name "-" }}
           secret:
-            secretName: {{ regexReplaceAll "[.]" .name "-" }}
+            secretName: {{ regexReplaceAll "[.]" $name "-" }}
       {{- end }}
 
         # Certificate
@@ -144,13 +144,13 @@ spec:
         {{- end }}
 
             # Config via Secrets
-        {{- range .Values.secrets }}
-            - name: {{ regexReplaceAll "[.]" .name "-" }}
-              subPath: {{ .key | default .name }}
-            {{- if isAbs .path }}
-              mountPath: {{ $.path }}
+        {{- range $name, $secret := .Values.secrets }}
+            - name: {{ regexReplaceAll "[.]" $name "-" }}
+              subPath: {{ $secret.key | default $name }}
+            {{- if isAbs $secret.path }}
+              mountPath: {{ $secret.path }}
             {{- else }}
-              mountPath: /tmp/docker-mailserver/{{ .path }}
+              mountPath: /tmp/docker-mailserver/{{ $secret.path }}
             {{- end }}
         {{- end }}
 

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

@@ -152,6 +152,8 @@ 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,6 +152,8 @@ manifest should match snapshot:
                   name: submissions
                 - containerPort: 587
                   name: submission
+                - containerPort: 12525
+                  name: smtp-proxy
                 - containerPort: 10465
                   name: subs-proxy
                 - containerPort: 10587
@@ -243,8 +245,7 @@ manifest should match snapshot:
     apiVersion: v1
     data:
       mailserver-secret.yaml: |
-        mailserver-username: test
-        mailserver-password: test
+        bWFpbHNlcnZlci11c2VybmFtZTogdGVzdAogICAgICAgICAgICBtYWlsc2VydmVyLXBhc3N3b3JkOiB0ZXN0
     kind: Secret
     metadata:
       labels:

charts/docker-mailserver/tests/secret_test.yaml

@@ -11,11 +11,10 @@ tests:
   - it: manifest should match snapshot
     set:
       secrets:
-        - name: mailserver-secret.yaml
+        mailserver-secret.yaml:
+          name: mailserver-secret.yaml
           create: true
           path: secret.yaml
-          data: |
-            mailserver-username: test
-            mailserver-password: test
+          data: bWFpbHNlcnZlci11c2VybmFtZTogdGVzdAogICAgICAgICAgICBtYWlsc2VydmVyLXBhc3N3b3JkOiB0ZXN0
     asserts:
       - matchSnapshot: { }

charts/docker-mailserver/values.yaml

@@ -611,15 +611,17 @@ configMaps:
 ## such as DKIM signing keys.
 ##
 ##  secrets:
-##  - name: rspamd.example.com                      # This is the name of the Secret
-##    create: true                                  # If true, create a new Secret
-##    path: rspamd.dkim.rsa-2048-mail-example.com.private.txt
-##    data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
+##    rspamd.example.com:
+##      name: rspamd.example.com                      # This is the name of the Secret
+##      create: true                                  # If true, create a new Secret
+##      path: rspamd.dkim.rsa-2048-mail-example.com.private.txt
+##      data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
 ##
-##  - name: rspamd.dkim.rsa-2048-mail-example.com.public
-##    create: true
-##    path: rspamd/dkim/rsa-2048-mail-example.com.public
-##    data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
+##    rspamd.dkim.rsa-2048-mail-example.com.public:
+##      name: rspamd.dkim.rsa-2048-mail-example.com.public
+##      create: true
+##      path: rspamd/dkim/rsa-2048-mail-example.com.public
+##      data: abace                           # If create is true, then you must specify content. Must be base 64 encoded!
 ##
 ##  If you set the create key to false, then you must manually create the ConfigMaps before deploying the chart.
 ##