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

Rename SMTPS to Submissions and deprecate old variable #369

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Rename SMTPS to Submissions and deprecate old variable #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06c5da4
Update deprecation description
WebSpider Sep 10, 2024
dfce95f
Replace in one more spot
WebSpider Sep 10, 2024
2775d94
Change default of smtps to false, so disabling submissions actually w…
WebSpider Sep 10, 2024
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
6 changes: 4 additions & 2 deletions mailu/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,9 @@ Check that the deployed pods are all running.
| `ingress.proxyProtocol.imap` | Enable PROXY protocol for IMAP (143/tcp) | `false` |
| `ingress.proxyProtocol.imaps` | Enable PROXY protocol for IMAPS (993/tcp) | `false` |
| `ingress.proxyProtocol.smtp` | Enable PROXY protocol for SMTP (25/tcp) | `false` |
| `ingress.proxyProtocol.smtps` | Enable PROXY protocol for SMTPS (465/tcp) | `false` |
| `ingress.proxyProtocol.smtps` | DEPRECATED: Do not use, use submissions instead. | `false` |
| `ingress.proxyProtocol.submission` | Enable PROXY protocol for Submission (587/tcp) | `false` |
| `ingress.proxyProtocol.submissions` | Enable PROXY protocol for Submissions (465/tcp) | `false` |
| `ingress.proxyProtocol.manageSieve` | Enable PROXY protocol for ManageSieve (4190/tcp) | `false` |

### Proxy auth configuration
Expand Down Expand Up @@ -322,8 +323,9 @@ Check that the deployed pods are all running.
| `front.externalService.ports.imap` | Expose IMAP port - 143/tcp | `false` |
| `front.externalService.ports.imaps` | Expose IMAP port (TLS) - 993/tcp | `true` |
| `front.externalService.ports.smtp` | Expose SMTP port - 25/tcp | `true` |
| `front.externalService.ports.smtps` | Expose SMTP port (TLS) - 465/tcp | `true` |
| `front.externalService.ports.smtps` | DEPRECATED: Do not use, use submissions instead | `false` |
| `front.externalService.ports.submission` | Expose Submission port - 587/tcp | `false` |
| `front.externalService.ports.submissions` | Expose Submission port (TLS) - 465/tcp | `true` |
| `front.externalService.ports.manageSieve` | Expose ManageSieve port - 4190/tcp | `true` |
| `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` |
Expand Down
4 changes: 2 additions & 2 deletions mailu/templates/_services.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Service fqdn (within cluster) can be retrieved with `mailu.SERVICE.serviceFqdn`
{{- if .Values.front.externalService.ports.smtp -}}
{{- $enabledPorts = append $enabledPorts "25" -}}
{{- end -}}
{{- if .Values.front.externalService.ports.smtps -}}
{{- if or .Values.front.externalService.ports.smtps .Values.front.externalService.ports.submissions -}}
{{- $enabledPorts = append $enabledPorts "465" -}}
{{- end -}}
{{- if .Values.front.externalService.ports.submission -}}
Expand Down Expand Up @@ -228,7 +228,7 @@ Service fqdn (within cluster) can be retrieved with `mailu.SERVICE.serviceFqdn`
{{- if .Values.front.externalService.ports.smtp -}}
{{- $proxyProtocolPorts = append $proxyProtocolPorts "25" -}}
{{- end -}}
{{- if .Values.front.externalService.ports.smtps -}}
{{- if or .Values.front.externalService.ports.smtps .Values.externalService.ports.submissions -}}
{{- $proxyProtocolPorts = append $proxyProtocolPorts "465" -}}
{{- end -}}
{{- if .Values.front.externalService.ports.submission -}}
Expand Down
2 changes: 1 addition & 1 deletion mailu/templates/front/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ spec:
{{- if .Values.front.hostPort.enabled }}
hostPort: 25
{{- end}}
- name: smtps
- name: submissions
protocol: TCP
containerPort: 465
{{- if .Values.front.hostPort.enabled }}
Expand Down
4 changes: 2 additions & 2 deletions mailu/templates/front/service-external.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ spec:
nodePort: 25
{{- end }}
{{- end }}
{{- if .ports.smtps }}
- name: smtps
{{- if or .ports.submissions .ports.smtps }}
- name: submissions
port: 465
protocol: TCP
{{ if eq $.Values.front.externalService.type "NodePort" -}}
Expand Down
2 changes: 1 addition & 1 deletion mailu/templates/front/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
- name: smtp
port: 25
protocol: TCP
- name: smtps
- name: submissions
port: 465
protocol: TCP
- name: smtpd
Expand Down
10 changes: 7 additions & 3 deletions mailu/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,9 @@ ingress:
## @param ingress.proxyProtocol.imap Enable PROXY protocol for IMAP (143/tcp)
## @param ingress.proxyProtocol.imaps Enable PROXY protocol for IMAPS (993/tcp)
## @param ingress.proxyProtocol.smtp Enable PROXY protocol for SMTP (25/tcp)
## @param ingress.proxyProtocol.smtps Enable PROXY protocol for SMTPS (465/tcp)
## @param ingress.proxyProtocol.smtps DEPRECATED: Do not use, use submissions instead.
## @param ingress.proxyProtocol.submission Enable PROXY protocol for Submission (587/tcp)
## @param ingress.proxyProtocol.submissions Enable PROXY protocol for Submissions (465/tcp)
## @param ingress.proxyProtocol.manageSieve Enable PROXY protocol for ManageSieve (4190/tcp)
## Enabling any of these requires to have ingress.realIpFrom set
proxyProtocol:
Expand All @@ -637,6 +638,7 @@ ingress:
smtp: false
smtps: false
submission: false
submissions: false
manageSieve: false

## @section Proxy auth configuration
Expand Down Expand Up @@ -684,8 +686,9 @@ front:
## @param front.externalService.ports.imap Expose IMAP port - 143/tcp
## @param front.externalService.ports.imaps Expose IMAP port (TLS) - 993/tcp
## @param front.externalService.ports.smtp Expose SMTP port - 25/tcp
## @param front.externalService.ports.smtps Expose SMTP port (TLS) - 465/tcp
## @param front.externalService.ports.smtps DEPRECATED: Do not use, use submissions instead
## @param front.externalService.ports.submission Expose Submission port - 587/tcp
## @param front.externalService.ports.submissions Expose Submission port (TLS) - 465/tcp
## @param front.externalService.ports.manageSieve Expose ManageSieve port - 4190/tcp
externalService:
enabled: false
Expand All @@ -701,8 +704,9 @@ front:
imap: false
imaps: true
smtp: true
smtps: true
smtps: false
submission: false
submissions: true
manageSieve: true

## @param front.kind Kind of resource to create for the front (`Deployment` or `DaemonSet`)
Expand Down
Loading