Merge remote-tracking branch 'shreddedbacon/mailpit-smtp-port' into m…

…ailpit-smtp-port
jouve · Apr 24, 2024 · 0410424 · 0410424
2 parents ad26436 + 2cccf7c
commit 0410424
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/charts/mailpit/Chart.yaml b/charts/mailpit/Chart.yaml
@@ -3,7 +3,7 @@ name: mailpit
 description: An email and SMTP testing tool with API for developers
 icon: https://raw.githubusercontent.com/axllent/mailpit/develop/server/ui/mailpit.svg
 type: application
-version: 0.17.0
+version: 0.17.1
 appVersion: 1.17.1
 dependencies:
 - name: common

diff --git a/charts/mailpit/README.md b/charts/mailpit/README.md
@@ -66,14 +66,14 @@ helm install mailpit jouve/mailpit
 | Name                                    | Description                                                                                                                      | Value                    |
 | --------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------ |
 | `service.http.type`                     | service type                                                                                                                     | `ClusterIP`              |
+| `service.http.port`                     | port for http                                                                                                                    | `80`                     |
 | `service.http.nodePort`                 | nodeport bind for HTTP service                                                                                                   | `0`                      |
-| `service.http.nodePort`                 | Node port for HTTP                                                                                                               | `0`                      |
 | `service.http.loadBalancerIP`           | %%MAIN_CONTAINER_NAME%% service Load Balancer IP                                                                                 | `""`                     |
 | `service.http.loadBalancerSourceRanges` | %%MAIN_CONTAINER_NAME%% service Load Balancer sources                                                                            | `[]`                     |
 | `service.http.externalTrafficPolicy`    | %%MAIN_CONTAINER_NAME%% service external traffic policy                                                                          | `Cluster`                |
 | `service.smtp.type`                     | service type                                                                                                                     | `ClusterIP`              |
+| `service.smtp.port`                     | port for SMTP                                                                                                                    | `25`                     |
 | `service.smtp.nodePort`                 | nodeport bind for STMP service                                                                                                   | `0`                      |
-| `service.smtp.nodePort`                 | Node port for HTTP                                                                                                               | `0`                      |
 | `service.smtp.loadBalancerIP`           | %%MAIN_CONTAINER_NAME%% service Load Balancer IP                                                                                 | `""`                     |
 | `service.smtp.loadBalancerSourceRanges` | %%MAIN_CONTAINER_NAME%% service Load Balancer sources                                                                            | `[]`                     |
 | `service.smtp.externalTrafficPolicy`    | %%MAIN_CONTAINER_NAME%% service external traffic policy                                                                          | `Cluster`                |

diff --git a/charts/mailpit/templates/http-service.yaml b/charts/mailpit/templates/http-service.yaml
@@ -20,7 +20,7 @@ spec:
   {{- end }}
   ports:
     - name: http
-      port: 80
+      port: {{ .Values.service.http.port }}
       {{- if and (eq .Values.service.http.type "NodePort" "LoadBalancer") (gt (.Values.service.http.nodePort | int) 0) }}
       nodePort: {{ .Values.service.http.nodePort }}
       {{- end }}

diff --git a/charts/mailpit/templates/smtp-service.yaml b/charts/mailpit/templates/smtp-service.yaml
@@ -20,7 +20,7 @@ spec:
   {{- end }}
   ports:
     - name: smtp
-      port: 25
+      port: {{ .Values.service.smtp.port }}
       {{- if and (eq .Values.service.smtp.type "NodePort" "LoadBalancer") (gt (.Values.service.smtp.nodePort | int) 0) }}
       nodePort: {{ .Values.service.smtp.nodePort }}
       {{- end }}

diff --git a/charts/mailpit/values.schema.json b/charts/mailpit/values.schema.json
@@ -268,9 +268,14 @@
                             "description": "service type",
                             "default": "ClusterIP"
                         },
+                        "port": {
+                            "type": "number",
+                            "description": "port for http",
+                            "default": 80
+                        },
                         "nodePort": {
                             "type": "number",
-                            "description": "Node port for HTTP",
+                            "description": "nodeport bind for HTTP service",
                             "default": 0
                         },
                         "loadBalancerIP": {
@@ -299,9 +304,14 @@
                             "description": "service type",
                             "default": "ClusterIP"
                         },
+                        "port": {
+                            "type": "number",
+                            "description": "port for SMTP",
+                            "default": 25
+                        },
                         "nodePort": {
                             "type": "number",
-                            "description": "Node port for HTTP",
+                            "description": "nodeport bind for STMP service",
                             "default": 0
                         },
                         "loadBalancerIP": {

diff --git a/charts/mailpit/values.yaml b/charts/mailpit/values.yaml
@@ -207,11 +207,12 @@ mailpit:
 service:
   http:
     ## @param service.http.type service type
-    ## @param service.http.nodePort nodeport bind for HTTP service
     ##
     type: ClusterIP
-    ## Node ports to expose
-    ## @param service.http.nodePort Node port for HTTP
+    ## @param service.http.port port for http
+    ##
+    port: 80
+    ## @param service.http.nodePort nodeport bind for HTTP service
     ##
     nodePort: 0
     ## @param service.http.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP
@@ -231,11 +232,12 @@ service:
     externalTrafficPolicy: Cluster
   smtp:
     ## @param service.smtp.type service type
-    ## @param service.smtp.nodePort nodeport bind for STMP service
     ##
     type: ClusterIP
-    ## Node ports to expose
-    ## @param service.smtp.nodePort Node port for HTTP
+    ## @param service.smtp.port port for SMTP
+    ##
+    port: 25
+    ## @param service.smtp.nodePort nodeport bind for STMP service
     ##
     nodePort: 0
     ## @param service.smtp.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP