[mailhog] Add Outgoing SMTP config (#409)

* Add outgoing-smtp secret and values * Docs * Bump chart version * Do not use default values for outgoingSMTP.fileContents Co-authored-by: Rainer 'rei' Schuth <[email protected]> Co-authored-by: mircohaug <[email protected]>
codecentric · Apr 9, 2021 · eb8255f · pflechat · Jun 25, 2021 · eb8255f
1 parent d72b242
commit eb8255f
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 1 deletion.
diff --git a/charts/mailhog/Chart.yaml b/charts/mailhog/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 description: An e-mail testing tool for developers
 name: mailhog
 appVersion: v1.0.1
-version: 4.0.0
+version: 4.1.0
 type: application
 keywords:
   - mailhog

diff --git a/charts/mailhog/templates/_helpers.tpl b/charts/mailhog/templates/_helpers.tpl
@@ -70,3 +70,14 @@ Create the name for the auth secret.
         {{- template "mailhog.fullname" . -}}-auth
     {{- end -}}
 {{- end -}}
+
+{{/*
+Create the name for the outgoing-smtp secret.
+*/}}
+{{- define "mailhog.outgoingSMTPSecret" -}}
+    {{- if .Values.outgoingSMTP.existingSecret -}}
+        {{- .Values.outgoingSMTP.existingSecret -}}
+    {{- else -}}
+        {{- template "mailhog.fullname" . -}}-outgoing-smtp
+    {{- end -}}
+{{- end -}}
diff --git a/charts/mailhog/templates/deployment.yaml b/charts/mailhog/templates/deployment.yaml
@@ -44,6 +44,10 @@ spec:
             - name: MH_AUTH_FILE
               value: /authdir/{{ .Values.auth.fileName }}
             {{- end }}
+            {{- if .Values.outgoingSMTP.enabled }}
+            - name: MH_OUTGOING_SMTP
+              value: /config/{{ .Values.outgoingSMTP.fileName }}
+            {{- end }}
             {{- with .Values.extraEnv }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
@@ -68,6 +72,12 @@ spec:
               mountPath: /authdir
               readOnly: true
           {{- end }}
+          {{- if .Values.outgoingSMTP.enabled }}
+          volumeMounts:
+            - name: outsmtpdir
+              mountPath: /config
+              readOnly: true
+          {{- end }}
           {{- with .Values.containerSecurityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
@@ -92,3 +102,9 @@ spec:
           secret:
             secretName: {{ template "mailhog.authFileSecret" . }}
       {{- end }}
+      {{- if .Values.outgoingSMTP.enabled }}
+      volumes:
+        - name: outsmtpdir
+          secret:
+            secretName: {{ template "mailhog.outgoingSMTPSecret" . }}
+      {{- end }}
diff --git a/charts/mailhog/templates/smtp-secret.yaml b/charts/mailhog/templates/smtp-secret.yaml
@@ -0,0 +1,12 @@
+{{- if and (.Values.outgoingSMTP.enabled) (not .Values.outgoingSMTP.existingSecret) -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    {{- include "mailhog.labels" . | nindent 4 }}
+  name: {{ template "mailhog.outgoingSMTPSecret" . }}
+  namespace: {{ .Release.Namespace }}
+type: Opaque
+data:
+  {{ .Values.outgoingSMTP.fileName }}: {{ .Values.outgoingSMTP.fileContents | toJson | b64enc }}
+{{- end -}}
diff --git a/charts/mailhog/values.yaml b/charts/mailhog/values.yaml
@@ -68,6 +68,28 @@ auth:
   fileName: auth.txt
   fileContents: ""
 
+# JSON file defining outgoing SMTP servers
+outgoingSMTP:
+  enabled: false
+  existingSecret: ""
+  fileName: outgoing-smtp.json
+  fileContents: {}
+    # See https://github.com/mailhog/MailHog/blob/master/docs/CONFIG.md#outgoing-smtp-configuration
+    # Only name, host and port are required.
+    #
+    # server_name1:
+    #   name: "server_name1"
+    #   host: "mail.example.com"
+    #   port: "25"    # NOTE: go requires this port number to be a string... otherwise the container won't start
+    #   email: ""
+    #   username: ""
+    #  password: ""
+    #  mechanism: "PLAIN|CRAM-MD5"
+    # server_name2:
+    #   name: "server_name2"
+    #   host: "mail2.example.com"
+    #   port: "587"   # NOTE: go requires this port number to be a string... otherwise the container won't start
+
 podAnnotations: {}
 
 podLabels: {}