From 06c5da42701d283d070a576a564fcbb54cb0f04d Mon Sep 17 00:00:00 2001 From: Nils Vogels Date: Tue, 10 Sep 2024 15:31:42 +0200 Subject: [PATCH 1/3] Update deprecation description --- mailu/README.md | 6 ++++-- mailu/templates/_services.tpl | 4 ++-- mailu/templates/front/deployment.yaml | 2 +- mailu/templates/front/service-external.yaml | 4 ++-- mailu/templates/front/service.yaml | 2 +- mailu/values.yaml | 8 ++++++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/mailu/README.md b/mailu/README.md index a628e779..8c209be2 100644 --- a/mailu/README.md +++ b/mailu/README.md @@ -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 @@ -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 | `true` | | `front.externalService.ports.submission` | Expose Submission port - 587/tcp | `false` | +| `front.externalService.ports.submissions` | Expose SMTP 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` | diff --git a/mailu/templates/_services.tpl b/mailu/templates/_services.tpl index bdb405e3..0de5d765 100644 --- a/mailu/templates/_services.tpl +++ b/mailu/templates/_services.tpl @@ -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 -}} @@ -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 -}} diff --git a/mailu/templates/front/deployment.yaml b/mailu/templates/front/deployment.yaml index 8d1b4444..dc13cc4f 100644 --- a/mailu/templates/front/deployment.yaml +++ b/mailu/templates/front/deployment.yaml @@ -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 }} diff --git a/mailu/templates/front/service-external.yaml b/mailu/templates/front/service-external.yaml index d868b73e..43614c2d 100644 --- a/mailu/templates/front/service-external.yaml +++ b/mailu/templates/front/service-external.yaml @@ -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" -}} diff --git a/mailu/templates/front/service.yaml b/mailu/templates/front/service.yaml index 131802a5..cc19e1ff 100644 --- a/mailu/templates/front/service.yaml +++ b/mailu/templates/front/service.yaml @@ -31,7 +31,7 @@ spec: - name: smtp port: 25 protocol: TCP - - name: smtps + - name: submissions port: 465 protocol: TCP - name: smtpd diff --git a/mailu/values.yaml b/mailu/values.yaml index 91f44f07..cb1c0d8b 100644 --- a/mailu/values.yaml +++ b/mailu/values.yaml @@ -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: @@ -637,6 +638,7 @@ ingress: smtp: false smtps: false submission: false + submissions: false manageSieve: false ## @section Proxy auth configuration @@ -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 SMTP port (TLS) - 465/tcp ## @param front.externalService.ports.manageSieve Expose ManageSieve port - 4190/tcp externalService: enabled: false @@ -703,6 +706,7 @@ front: smtp: true smtps: true submission: false + submissions: true manageSieve: true ## @param front.kind Kind of resource to create for the front (`Deployment` or `DaemonSet`) From dfce95f6b44521e724b6e27d791e194f973aaa5c Mon Sep 17 00:00:00 2001 From: Nils Vogels Date: Tue, 10 Sep 2024 15:35:49 +0200 Subject: [PATCH 2/3] Replace in one more spot --- mailu/README.md | 2 +- mailu/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mailu/README.md b/mailu/README.md index 8c209be2..82a74a0f 100644 --- a/mailu/README.md +++ b/mailu/README.md @@ -325,7 +325,7 @@ Check that the deployed pods are all running. | `front.externalService.ports.smtp` | Expose SMTP port - 25/tcp | `true` | | `front.externalService.ports.smtps` | DEPRECATED: Do not use, use submissions instead | `true` | | `front.externalService.ports.submission` | Expose Submission port - 587/tcp | `false` | -| `front.externalService.ports.submissions` | Expose SMTP port (TLS) - 465/tcp | `true` | +| `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` | diff --git a/mailu/values.yaml b/mailu/values.yaml index cb1c0d8b..b3d8b61f 100644 --- a/mailu/values.yaml +++ b/mailu/values.yaml @@ -688,7 +688,7 @@ front: ## @param front.externalService.ports.smtp Expose SMTP port - 25/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 SMTP port (TLS) - 465/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 From 2775d94bb4be252d84da03d3afdd6a828333ef83 Mon Sep 17 00:00:00 2001 From: Nils Vogels Date: Tue, 10 Sep 2024 15:52:21 +0200 Subject: [PATCH 3/3] Change default of smtps to false, so disabling submissions actually works --- mailu/README.md | 2 +- mailu/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mailu/README.md b/mailu/README.md index 82a74a0f..a9c700b8 100644 --- a/mailu/README.md +++ b/mailu/README.md @@ -323,7 +323,7 @@ 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` | DEPRECATED: Do not use, use submissions instead | `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` | diff --git a/mailu/values.yaml b/mailu/values.yaml index b3d8b61f..8ddace6a 100644 --- a/mailu/values.yaml +++ b/mailu/values.yaml @@ -704,7 +704,7 @@ front: imap: false imaps: true smtp: true - smtps: true + smtps: false submission: false submissions: true manageSieve: true