Fix for #84: Do not set storageClassName if not set in values.yml

bokysan · Aug 22, 2021 · 3cb19e7 · 3cb19e7
1 parent ddc147f
commit 3cb19e7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2 deletions.
diff --git a/configs/supervisord.conf b/configs/supervisord.conf
@@ -16,7 +16,7 @@ stdout_logfile_maxbytes = 0
 stderr_logfile_maxbytes = 0
 
 [program:postfix]
-command         = /usr/sbin/postfix -c /etc/postfix start-fg
+command         = /postfix.sh
 autostart       = true
 autorestart     = false
 directory       = /etc/postfix

diff --git a/helm/mail/templates/statefulset.yaml b/helm/mail/templates/statefulset.yaml
@@ -145,7 +145,7 @@ spec:
         accessModes: {{- toYaml .Values.persistence.accessModes | nindent 10 }}
         {{- if (eq "-" .Values.persistence.storageClass) }}
         storageClassName: ""
-        {{- else }}
+        {{- end }}{{- if .Values.persistence.storageClass }}
         storageClassName: "{{ .Values.persistence.storageClass }}"
         {{- end }}
         resources:

diff --git a/scripts/common-run.sh b/scripts/common-run.sh
diff --git a/scripts/common.sh b/scripts/common.sh
diff --git a/scripts/opendkim.sh b/scripts/opendkim.sh
diff --git a/scripts/postfix.sh b/scripts/postfix.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+/usr/sbin/postfix -c /etc/postfix start-fg | \
+fgrep -v 'connect from localhost[127.0.0.1]'
+fgrep -v 'lost connection after EHLO from localhost[127.0.0.1]' | \
+fgrep -v 'disconnect from localhost[127.0.0.1] ehlo=1 commands=1'
diff --git a/scripts/run.sh b/scripts/run.sh