Skip to content

Fix proton-bridge default port wiring for Kubernetes #5

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

Merged
mgarratt merged 2 commits into from
Feb 15, 2026
Merged

Fix proton-bridge default port wiring for Kubernetes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1403e7c
Fix proton-bridge default port wiring for Kubernetes
mgarratt Feb 15, 2026
1724857
Make proton-bridge port defaults upgrade-safe
mgarratt Feb 15, 2026
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
2 changes: 1 addition & 1 deletion charts/proton-bridge/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: proton-bridge
description: Proton Mail Bridge deployment for in-cluster SMTP/IMAP access
type: application
version: 0.1.6
version: 0.1.8
appVersion: "3.22.0"
4 changes: 3 additions & 1 deletion charts/proton-bridge/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ kubectl -n "$NAMESPACE" rollout status deploy/"$DEPLOYMENT"
## Defaults

- Service type: `ClusterIP`
- Service ports: SMTP `25`, IMAP `143` (mapped to container ports `1025`/`1143` by default)
- Service ports: SMTP `25`, IMAP `143` (mapped to container ports `1026`/`1144` by default)
- Image tag: `latest`
- PVC: enabled, `ReadWriteOnce`, `2Gi`

Expand Down Expand Up @@ -98,6 +98,8 @@ Common overrides:
- `volumePermissions.enabled`
- `existingSecret`

If `bridge.host` is local (`127.0.0.1`, `localhost`, `::1`) and `container.*Port` matches `bridge.*Port`, the chart automatically shifts container ports by `+1` to avoid bridge/socat bind conflicts during installs and upgrades.

To bind directly on container ports `25` and `143`, enable privileged port binding:

```yaml
Expand Down
15 changes: 13 additions & 2 deletions charts/proton-bridge/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ spec:
{{- $vpMountPath := (get $volumePermissions "mountPath" | default "/home/bridge") }}
{{- $vpChown := (get $volumePermissions "chown" | default "1000:1000") }}
{{- $vpChmod := (get $volumePermissions "chmod" | default "u+rwX,g+rwX") }}
{{- $localBridgeHost := or (eq .Values.bridge.host "127.0.0.1") (eq .Values.bridge.host "localhost") (eq .Values.bridge.host "::1") }}
{{- $bridgeSmtpPort := int .Values.bridge.smtpPort }}
{{- $bridgeImapPort := int .Values.bridge.imapPort }}
{{- $containerSmtpPort := int .Values.container.smtpPort }}
{{- $containerImapPort := int .Values.container.imapPort }}
{{- if and $localBridgeHost (eq $bridgeSmtpPort $containerSmtpPort) }}
{{- $containerSmtpPort = add $bridgeSmtpPort 1 }}
{{- end }}
{{- if and $localBridgeHost (eq $bridgeImapPort $containerImapPort) }}
{{- $containerImapPort = add $bridgeImapPort 1 }}
{{- end }}
{{- with .Values.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
Expand Down Expand Up @@ -85,10 +96,10 @@ spec:
name: {{ include "proton-bridge.secretName" . }}
ports:
- name: smtp
containerPort: {{ .Values.container.smtpPort }}
containerPort: {{ $containerSmtpPort }}
protocol: TCP
- name: imap
containerPort: {{ .Values.container.imapPort }}
containerPort: {{ $containerImapPort }}
protocol: TCP
{{- if .Values.persistence.enabled }}
volumeMounts:
Expand Down
19 changes: 15 additions & 4 deletions charts/proton-bridge/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
{{- $localBridgeHost := or (eq .Values.bridge.host "127.0.0.1") (eq .Values.bridge.host "localhost") (eq .Values.bridge.host "::1") -}}
{{- $bridgeSmtpPort := int .Values.bridge.smtpPort -}}
{{- $bridgeImapPort := int .Values.bridge.imapPort -}}
{{- $containerSmtpPort := int .Values.container.smtpPort -}}
{{- $containerImapPort := int .Values.container.imapPort -}}
{{- if and $localBridgeHost (eq $bridgeSmtpPort $containerSmtpPort) -}}
{{- $containerSmtpPort = add $bridgeSmtpPort 1 -}}
{{- end -}}
{{- if and $localBridgeHost (eq $bridgeImapPort $containerImapPort) -}}
{{- $containerImapPort = add $bridgeImapPort 1 -}}
{{- end -}}
{{- if not .Values.existingSecret }}
apiVersion: v1
kind: Secret
Expand All @@ -8,8 +19,8 @@ metadata:
type: Opaque
stringData:
PROTON_BRIDGE_HOST: {{ .Values.bridge.host | quote }}
PROTON_BRIDGE_SMTP_PORT: {{ .Values.bridge.smtpPort | quote }}
PROTON_BRIDGE_IMAP_PORT: {{ .Values.bridge.imapPort | quote }}
CONTAINER_SMTP_PORT: {{ .Values.container.smtpPort | quote }}
CONTAINER_IMAP_PORT: {{ .Values.container.imapPort | quote }}
PROTON_BRIDGE_SMTP_PORT: {{ $bridgeSmtpPort | quote }}
PROTON_BRIDGE_IMAP_PORT: {{ $bridgeImapPort | quote }}
CONTAINER_SMTP_PORT: {{ $containerSmtpPort | quote }}
CONTAINER_IMAP_PORT: {{ $containerImapPort | quote }}
{{- end }}
4 changes: 2 additions & 2 deletions charts/proton-bridge/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ bridge:
mode: noninteractive

container:
smtpPort: 1025
imapPort: 1143
smtpPort: 1026
imapPort: 1144
# Set true to add NET_BIND_SERVICE capability so non-root process can bind <1024 (e.g. 25/143).
enablePrivilegedPortBinding: false

Expand Down