Merge pull request #1 from fr6nco/feature/smtp-relay-config

Add options to enable SMTP relay configuration
jouve · May 30, 2023 · a5aa094 · a5aa094
2 parents af326ec + b37623c
commit a5aa094
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 9 deletions.
diff --git a/charts/mailpit/Chart.yaml b/charts/mailpit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: mailpit
 description: An email and SMTP testing tool with API for developers
 type: application
-version: 0.1.4
+version: 0.2.0
 appVersion: 1.6.10
 sources:
 - https://github.com/jouve/charts

diff --git a/charts/mailpit/README.md b/charts/mailpit/README.md
@@ -22,7 +22,7 @@ helm repo add jouve https://jouve.github.io/charts/
 | ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ | ----------------- |
 | `image.registry`                                  | image registry                                                                                                                             | `docker.io`       |
 | `image.repository`                                | image repository                                                                                                                           | `axllent/mailpit` |
-| `image.tag`                                       | image tag (immutable tags are recommended)                                                                                                 | `v1.6.10`          |
+| `image.tag`                                       | image tag (immutable tags are recommended)                                                                                                 | `v1.6.10`         |
 | `image.digest`                                    | image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""`              |
 | `image.pullPolicy`                                | image pull policy                                                                                                                          | `IfNotPresent`    |
 | `image.pullSecrets`                               | image pull secrets                                                                                                                         | `[]`              |
@@ -50,13 +50,18 @@ helm repo add jouve https://jouve.github.io/charts/
 | `mailpit.smtp.authFile.htpasswd`                  | htpasswd content                                                                                                                           | `""`              |
 | `mailpit.smtp.tls.enabled`                        | Enable tls for SMTP                                                                                                                        | `false`           |
 | `mailpit.smtp.tls.secretName`                     | tls secret for SMTP                                                                                                                        | `""`              |
+| `mailpit.relay.enabled`                           | Enable STMP relay configuration                                                                                                            | `false`           |
+| `mailpit.relay.config`                            | Mailpit Relay Configuration object, `smtpRelayConfigStruct struct`                                                                         | `{}`              |
+| `mailpit.relay.relayAll`                          | Automatically relay all emails                                                                                                             | `false`           |
 
 ### Traffic Exposure Parameters
 
 | Name                       | Description                                                                                                                      | Value            |
 | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ---------------- |
 | `service.http.type`        | service type                                                                                                                     | `ClusterIP`      |
+| `service.http.nodePort`    | port to bind to in case of LoadBalancer or NodePort type                                                                         | `""`             | 
 | `service.smtp.type`        | service type                                                                                                                     | `ClusterIP`      |
+| `service.smtp.nodePort`    | port to bind to in case of LoadBalancer or NodePort type                                                                         | `""`             | 
 | `ingress.enabled`          | Enable ingress record generation for %%MAIN_CONTAINER_NAME%%                                                                     | `false`          |
 | `ingress.hostname`         | Default host for the ingress record                                                                                              | `hostname.local` |
 | `ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)                                                    | `""`             |

diff --git a/charts/mailpit/templates/deployment.yaml b/charts/mailpit/templates/deployment.yaml
@@ -76,6 +76,13 @@ spec:
           {{- if .Values.image.debug }}
           - --verbose
           {{- end }}
+          {{- if .Values.mailpit.relay.enabled }}
+          - --smtp-relay-config
+          - /etc/mailpit/smtp_relay.yaml
+          {{- if .Values.mailpit.relay.relayAll }}
+          - --smtp-relay-all
+          {{- end }}
+          {{- end }}
           {{- with .Values.args }}
           {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 12 }}
           {{- end }}
@@ -93,7 +100,7 @@ spec:
           volumeMounts:
           - name: data
             mountPath: /var/lib/mailpit
-          {{- if or .Values.mailpit.ui.authFile.enabled .Values.mailpit.ui.authFile.enabled .Values.mailpit.ui.tls.secretName .Values.mailpit.smtp.tls.secretName }}
+          {{- if or .Values.mailpit.ui.authFile.enabled .Values.mailpit.ui.authFile.enabled .Values.mailpit.ui.tls.secretName .Values.mailpit.smtp.tls.secretName .Values.mailpit.relay.enabled }}
           - name: etc
             mountPath: /etc/mailpit
           {{- end }}
@@ -104,7 +111,7 @@ spec:
         {{- include "common.tplvalues.render" ( dict "value" . "context" $) | nindent 8 }}
         {{- end }}
       volumes:
-        {{- if or .Values.mailpit.ui.authFile.enabled .Values.mailpit.ui.authFile.enabled .Values.mailpit.ui.tls.secretName .Values.mailpit.smtp.tls.secretName }}
+        {{- if or .Values.mailpit.ui.authFile.enabled .Values.mailpit.ui.authFile.enabled .Values.mailpit.ui.tls.secretName .Values.mailpit.smtp.tls.secretName .Values.mailpit.relay.enabled }}
         - name: etc
           projected:
             sources:
@@ -130,6 +137,10 @@ spec:
               - key: tls.key
                 path: smtp.key
             {{- end }}
+            {{- if .Values.mailpit.relay.enabled }}
+            - secret:
+                name: {{ template "common.names.fullname" . }}-relay
+            {{- end }}
         {{- end }}
         - name: data
           {{- if .Values.persistence.enabled }}

diff --git a/charts/mailpit/templates/http-service.yaml b/charts/mailpit/templates/http-service.yaml
@@ -21,8 +21,8 @@ spec:
   ports:
     - name: http
       port: 80
-      {{- if and (or (eq .Values.service.http.type "NodePort") (eq .Values.service.http.type "LoadBalancer")) (not (empty .Values.service.http.nodePorts.http)) }}
-      nodePort: {{ .Values.service.http.nodePorts.http }}
+      {{- if and (or (eq .Values.service.http.type "NodePort") (eq .Values.service.http.type "LoadBalancer")) (not (empty .Values.service.http.nodePort)) }}
+      nodePort: {{ .Values.service.http.nodePort }}
       {{- end }}
       targetPort: http
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
diff --git a/charts/mailpit/templates/relay-config.yaml b/charts/mailpit/templates/relay-config.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.mailpit.relay.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "common.names.fullname" . }}-relay
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- with .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
+  {{- end }}
+type: Opaque
+{{- with .Values.mailpit.relay.config }}
+stringData:
+  smtp_relay.yaml: |
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- end }}
diff --git a/charts/mailpit/templates/smtp-service.yaml b/charts/mailpit/templates/smtp-service.yaml
@@ -21,8 +21,8 @@ spec:
   ports:
     - name: smtp
       port: 25
-      {{- if and (or (eq .Values.service.smtp.type "NodePort") (eq .Values.service.smtp.type "LoadBalancer")) (not (empty .Values.service.smtp.nodePorts.http)) }}
-      nodePort: {{ .Values.service.smtp.nodePorts.http }}
+      {{- if and (or (eq .Values.service.smtp.type "NodePort") (eq .Values.service.smtp.type "LoadBalancer")) (not (empty .Values.service.smtp.nodePort)) }}
+      nodePort: {{ .Values.service.smtp.nodePort }}
       {{- end }}
       targetPort: smtp
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
diff --git a/charts/mailpit/values.yaml b/charts/mailpit/values.yaml
@@ -112,7 +112,13 @@ mailpit:
     tls:
       enabled: false
       secretName: ""
-
+  relay:
+    ## @param mailpit.relay.enabled enable SMTP Relay configuration
+    ## @param mailpit.relay.config Mailpit SMTP relay configuration
+    ## @param.mailpit.relay.relayAll Relay all messages to relay
+    enabled: false
+    config: {}
+    relayAll: false
 
 ## @section Traffic Exposure Parameters
 ##
@@ -122,12 +128,16 @@ mailpit:
 service:
   http:
     ## @param service.http.type service type
+    ## @param service.http.nodePort nodeport bind for HTTP service
     ##
     type: ClusterIP
+    nodePort:
   smtp:
     ## @param service.smtp.type service type
+    ## @param service.smtp.nodePort nodeport bind for STMP service
     ##
     type: ClusterIP
+    nodePort:
 
 
 ## ingress parameters