fix(postfix): bring postfix configs closer together

charts/mok/Chart.yaml

@@ -3,7 +3,7 @@ name: mok
 description: |
   Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 type: application
-version: 0.10.0
+version: 0.10.1
 sources:
   - https://de.postfix.org/ftpmirror/index.html
   - https://github.com/dovecot/core

charts/mok/README.md

 # mok
 
-![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.10.1](https://img.shields.io/badge/Version-0.10.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 

charts/mok/templates/postfix-config.yaml

@@ -200,6 +200,9 @@ data:
 
     smtpd_banner = $myhostname ESMTP $mail_name
     biff = no
+    {{- if .Values.postfix.hostname }}
+    myhostname =  {{ .Values.postfix.hostname }}
+    {{- end }}
 
     append_dot_mydomain = no
 

charts/mok/templates/postfix.yaml

@@ -88,6 +88,14 @@ spec:
           securityContext:
             {{- toYaml .Values.postfix.securityContext | nindent 12 }}
           volumeMounts:
+            - name: config
+              mountPath: /etc/postfix/master.conf
+              subPath: master.conf
+              readOnly: true
+            - name: config
+              mountPath: /etc/postfix/main.conf
+              subPath: main.conf
+              readOnly: true
             - name: spool
               mountPath: /var/spool/postfix/
             - name: cache
@@ -115,6 +123,14 @@ spec:
           securityContext:
             {{- toYaml .Values.postfix.securityContext | nindent 12 }}
           volumeMounts:
+            - name: config
+              mountPath: /etc/postfix/master.conf
+              subPath: master.conf
+              readOnly: true
+            - name: config
+              mountPath: /etc/postfix/main.conf
+              subPath: main.conf
+              readOnly: true
             - name: spool
               mountPath: /var/spool/postfix/
             - name: cache
@@ -201,9 +217,11 @@ spec:
             - name: config
               mountPath: /etc/postfix/master.conf
               subPath: master.conf
+              readOnly: true
             - name: config
               mountPath: /etc/postfix/main.conf
               subPath: main.conf
+              readOnly: true
             - name: spool
               mountPath: /var/spool/postfix/
             - name: cache
@@ -233,6 +251,7 @@ spec:
         - name: config
           configMap:
             name: {{ include "mok.fullname" . }}-postfix
+            defaultMode: 644
         - name: tls
           secret:
             secretName: {{ required "TLS secret for postfix is required" .Values.postfix.tls.secretName }}

charts/mok/tests/__snapshot__/postfix_test.yaml.snap

@@ -501,9 +501,11 @@ should match snapshot:
               volumeMounts:
                 - mountPath: /etc/postfix/master.conf
                   name: config
+                  readOnly: true
                   subPath: master.conf
                 - mountPath: /etc/postfix/main.conf
                   name: config
+                  readOnly: true
                   subPath: main.conf
                 - mountPath: /var/spool/postfix/
                   name: spool
@@ -546,6 +548,14 @@ should match snapshot:
                     - ALL
                 runAsNonRoot: false
               volumeMounts:
+                - mountPath: /etc/postfix/master.conf
+                  name: config
+                  readOnly: true
+                  subPath: master.conf
+                - mountPath: /etc/postfix/main.conf
+                  name: config
+                  readOnly: true
+                  subPath: main.conf
                 - mountPath: /var/spool/postfix/
                   name: spool
                 - mountPath: /srv/tmp
@@ -585,6 +595,14 @@ should match snapshot:
                     - ALL
                 runAsNonRoot: false
               volumeMounts:
+                - mountPath: /etc/postfix/master.conf
+                  name: config
+                  readOnly: true
+                  subPath: master.conf
+                - mountPath: /etc/postfix/main.conf
+                  name: config
+                  readOnly: true
+                  subPath: main.conf
                 - mountPath: /var/spool/postfix/
                   name: spool
                 - mountPath: /srv/tmp
@@ -602,6 +620,7 @@ should match snapshot:
               secret:
                 secretName: RELEASE-NAME-mok-postfix-maps
             - configMap:
+                defaultMode: 644
                 name: RELEASE-NAME-mok-postfix
               name: config
             - name: tls