From 2cccf7cb4c1af5bece28b65c0078325bc8748278 Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Tue, 23 Apr 2024 15:42:41 +1000 Subject: [PATCH] chore: change smtp port and tidy up duplicate nodeport text --- charts/mailpit/Chart.yaml | 2 +- charts/mailpit/README.md | 3 +-- charts/mailpit/templates/smtp-service.yaml | 2 +- charts/mailpit/values.schema.json | 7 ++++++- charts/mailpit/values.yaml | 10 ++++++---- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/charts/mailpit/Chart.yaml b/charts/mailpit/Chart.yaml index 6662a8b..0b61492 100644 --- 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.15.3 +version: 0.15.4 appVersion: 1.15.1 dependencies: - name: common diff --git a/charts/mailpit/README.md b/charts/mailpit/README.md index e9b41ad..4337a1d 100644 --- a/charts/mailpit/README.md +++ b/charts/mailpit/README.md @@ -64,13 +64,12 @@ helm install mailpit jouve/mailpit | --------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | | `service.http.type` | service type | `ClusterIP` | | `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 STMP service | `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/smtp-service.yaml b/charts/mailpit/templates/smtp-service.yaml index b2aa7e1..e69030e 100644 --- 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 index 987f0d2..b6b29c4 100644 --- a/charts/mailpit/values.schema.json +++ b/charts/mailpit/values.schema.json @@ -294,9 +294,14 @@ "description": "service type", "default": "ClusterIP" }, + "port": { + "type": "number", + "description": "port for SMTP", + "default": 0 + }, "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 index 5f9e320..1ffdfcb 100644 --- a/charts/mailpit/values.yaml +++ b/charts/mailpit/values.yaml @@ -191,11 +191,10 @@ 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.nodePort nodeport bind for HTTP service ## nodePort: 0 ## @param service.http.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP @@ -215,11 +214,14 @@ service: externalTrafficPolicy: Cluster smtp: ## @param service.smtp.type service type - ## @param service.smtp.nodePort nodeport bind for STMP service ## type: ClusterIP + ## ports to expose + ## @param service.smtp.port port for SMTP + ## + port: 25 ## Node ports to expose - ## @param service.smtp.nodePort Node port for HTTP + ## @param service.smtp.nodePort nodeport bind for STMP service ## nodePort: 0 ## @param service.smtp.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP