fix: Allow setting custom NodePorts for externalService (#383)

* feat: allow externalService nodePort to be set * fixed doc + defaults Signed-off-by: fastlorenzo <[email protected]> --------- Signed-off-by: fastlorenzo <[email protected]> Co-authored-by: Damien <[email protected]>
Mailu · Dec 22, 2024 · 0b1a9cd · 0b1a9cd
1 parent 0fd99a6
commit 0b1a9cd
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/mailu/README.md b/mailu/README.md
@@ -325,6 +325,14 @@ Check that the deployed pods are all running.
 | `front.externalService.ports.smtps`           | Expose SMTP port (TLS) - 465/tcp                                                      | `true`          |
 | `front.externalService.ports.submission`      | Expose Submission port - 587/tcp                                                      | `false`         |
 | `front.externalService.ports.manageSieve`     | Expose ManageSieve port - 4190/tcp                                                    | `true`          |
+| `front.externalService.nodePorts.pop3`        | NodePort to use for POP3 (defaults to 110/tcp)                                        | `110`           |
+| `front.externalService.nodePorts.pop3s`       | NodePort to use for POP3 (TLS) (defaults to 995/tcp)                                  | `995`           |
+| `front.externalService.nodePorts.imap`        | NodePort to use for IMAP (defaults to 143/tcp)                                        | `143`           |
+| `front.externalService.nodePorts.imaps`       | NodePort to use for IMAP (TLS) (defaults to 993/tcp)                                  | `993`           |
+| `front.externalService.nodePorts.smtp`        | NodePort to use for SMTP (defaults to 25/tcp)                                         | `25`            |
+| `front.externalService.nodePorts.smtps`       | NodePort to use for SMTP (TLS) (defaults to 465/tcp)                                  | `465`           |
+| `front.externalService.nodePorts.submission`  | NodePort to use for Submission (defaults to 587/tcp)                                  | `587`           |
+| `front.externalService.nodePorts.manageSieve` | NodePort to use for ManageSieve (defaults to 4190/tcp)                                | `4190`          |
 | `front.kind`                                  | Kind of resource to create for the front (`Deployment` or `DaemonSet`)                | `Deployment`    |
 | `front.replicaCount`                          | Number of front replicas to deploy (only for `Deployment` kind)                       | `1`             |
 | `front.resources.limits`                      | The resources limits for the container                                                | `{}`            |

diff --git a/mailu/templates/front/service-external.yaml b/mailu/templates/front/service-external.yaml
@@ -28,63 +28,63 @@ spec:
       port: 110
       protocol: TCP
       {{ if eq $.Values.front.externalService.type "NodePort" -}}
-      nodePort: 110
+      nodePort: {{ .nodePorts.pop3 }}
       {{- end }}
     {{- end }}
     {{- if .ports.pop3s }}
     - name: pop3s
       port: 995
       protocol: TCP
       {{ if eq $.Values.front.externalService.type "NodePort" -}}
-      nodePort: 995
+      nodePort: {{ .nodePorts.pop3s }}
       {{- end }}
     {{- end }}
     {{- if .ports.imap }}
     - name: imap
       port: 143
       protocol: TCP
       {{ if eq $.Values.front.externalService.type "NodePort" -}}
-      nodePort: 143
+      nodePort: {{ .nodePorts.imap }}
       {{- end }}
     {{- end }}
     {{- if .ports.imaps }}
     - name: imaps
       port: 993
       protocol: TCP
       {{ if eq $.Values.front.externalService.type "NodePort" -}}
-      nodePort: 993
+      nodePort: {{ .nodePorts.imaps }}
       {{- end }}
     {{- end }}
     {{- if .ports.smtp }}
     - name: smtp
       port: 25
       protocol: TCP
       {{ if eq $.Values.front.externalService.type "NodePort" -}}
-      nodePort: 25
+      nodePort: {{ .nodePorts.smtp }}
       {{- end }}
     {{- end }}
     {{- if .ports.smtps }}
     - name: smtps
       port: 465
       protocol: TCP
       {{ if eq $.Values.front.externalService.type "NodePort" -}}
-      nodePort: 465
+      nodePort: {{ .nodePorts.smtps }}
       {{- end }}
     {{- end }}
     {{- if .ports.submission }}
     - name: smtpd
       port: 587
       protocol: TCP
       {{ if eq $.Values.front.externalService.type "NodePort" -}}
-      nodePort: 587
+      nodePort: {{ .nodePorts.submission }}
       {{- end }}
     {{- end }}
     {{- if .ports.manageSieve }}
     - name: sieve
       port: 4190
       protocol: TCP
       {{ if eq $.Values.front.externalService.type "NodePort" -}}
-      nodePort: 4190
+      nodePort: {{ .nodePorts.manageSieve }}
       {{- end }}
     {{- end }}
 {{- end }}

diff --git a/mailu/values.yaml b/mailu/values.yaml
@@ -687,6 +687,14 @@ front:
   ## @param front.externalService.ports.smtps Expose SMTP port (TLS) - 465/tcp
   ## @param front.externalService.ports.submission Expose Submission port - 587/tcp
   ## @param front.externalService.ports.manageSieve Expose ManageSieve port - 4190/tcp
+  ## @param front.externalService.nodePorts.pop3 NodePort to use for POP3 (defaults to 110/tcp)
+  ## @param front.externalService.nodePorts.pop3s NodePort to use for POP3 (TLS) (defaults to 995/tcp)
+  ## @param front.externalService.nodePorts.imap NodePort to use for IMAP (defaults to 143/tcp)
+  ## @param front.externalService.nodePorts.imaps NodePort to use for IMAP (TLS) (defaults to 993/tcp)
+  ## @param front.externalService.nodePorts.smtp NodePort to use for SMTP (defaults to 25/tcp)
+  ## @param front.externalService.nodePorts.smtps NodePort to use for SMTP (TLS) (defaults to 465/tcp)
+  ## @param front.externalService.nodePorts.submission NodePort to use for Submission (defaults to 587/tcp)
+  ## @param front.externalService.nodePorts.manageSieve NodePort to use for ManageSieve (defaults to 4190/tcp)
   externalService:
     enabled: false
     type: ClusterIP
@@ -704,6 +712,15 @@ front:
       smtps: true
       submission: false
       manageSieve: true
+    nodePorts:
+      pop3: 110
+      pop3s: 995
+      imap: 143
+      imaps: 993
+      smtp: 25
+      smtps: 465
+      submission: 587
+      manageSieve: 4190
 
   ## @param front.kind Kind of resource to create for the front (`Deployment` or `DaemonSet`)
   kind: Deployment