Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MailDev] Separate SMTP and web ports on Pod and k8s Service #1036

Merged
merged 1 commit into from
Feb 10, 2024
Merged

[MailDev] Separate SMTP and web ports on Pod and k8s Service #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/maildev/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: maildev
description: MailDev is a simple way to test your emails during development with an easy to use web interface.
type: application
version: 1.1.0
version: 1.1.1
appVersion: "2.1.0"
home: https://github.com/christianknell/helm-charts
icon: https://avatars1.githubusercontent.com/u/26743469
Expand All @@ -16,7 +16,7 @@ sources:
annotations:
artifacthub.io/changes: |
- kind: changed
description: image version to 2.1.0
description: separate pod and service ports
artifacthub.io/screenshots: |
- title: SMTP server & web interface for viewing and testing emails during development.
url: https://maildev.github.io/maildev/assets/img/original/maildev-light.png
Expand Down
2 changes: 2 additions & 0 deletions charts/maildev/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,10 @@ The command removes all the Kubernetes components associated with the chart and
| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
| services.smtp.nodePort | string | `nil` | You can set the node port for the external SMTP server that should be used or leave it blank to get a random node port. Only active if `services.smtp.type == NodePort` |
| services.smtp.port | int | `1025` | Kubernetes port to use for the internal SMTP server |
| services.smtp.podPort | int | `1025` | Pod port to use for the internal SMTP server |
| services.smtp.type | string | `"ClusterIP"` | Kubernetes service type for the SMTP server |
| services.web.port | int | `1080` | Kubernetes port to use for the web GUI |
| services.web.podPort | int | `1080` | Pod port to use for the web GUI |
| services.web.type | string | `"ClusterIP"` | Kubernetes service type for the web GUI |
| tolerations | list | `[]` | Toleration labels for pod assignment |

Expand Down
8 changes: 4 additions & 4 deletions charts/maildev/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ spec:
value: {{ .Values.maildev.config.mailDirectory | quote }}
# SMTP Settings
- name: MAILDEV_SMTP_PORT
value: {{ .Values.services.smtp.port | quote }}
value: {{ .Values.services.smtp.podPort | quote }}
{{- if .Values.maildev.config.smtp.hideExtensions }}
- name: MAILDEV_HIDE_EXTENSIONS
value: {{ .Values.maildev.config.smtp.hideExtensions | quote }}
Expand Down Expand Up @@ -123,7 +123,7 @@ spec:
key: web-password
{{- end }}
- name: MAILDEV_WEB_PORT
value: {{ .Values.services.web.port | quote }}
value: {{ .Values.services.web.podPort | quote }}
{{- if .Values.extraEnv }}
## Additional Setings
{{- range .Values.extraEnv }}
Expand All @@ -135,10 +135,10 @@ spec:
{{- end }}
ports:
- name: web
containerPort: {{ .Values.services.web.port }}
containerPort: {{ .Values.services.web.podPort }}
protocol: TCP
- name: smtp
containerPort: {{ .Values.services.smtp.port }}
containerPort: {{ .Values.services.smtp.podPort }}
protocol: TCP
livenessProbe:
httpGet:
Expand Down
8 changes: 6 additions & 2 deletions charts/maildev/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,17 @@ services:
web:
# -- Kubernetes service type for the web GUI
type: ClusterIP
# -- Kubernetes port to use for the web GUI
# -- Kubernetes service port to use for the web GUI
port: 1080
# -- Pod port to use for the web GUI
podPort: 1080
smtp:
# -- Kubernetes service type for the SMTP server
type: ClusterIP
# -- Kubernetes port to use for the internal SMTP server
# -- Kubernetes service port to use for the internal SMTP server
port: 1025
# -- Pod port to use for the internal SMTP server
podPort: 1025
# -- You can set the node port for the external SMTP server that should be used or leave it blank to get a random node port. Only active if `services.smtp.type == NodePort`
nodePort:

Expand Down
Loading