From b8f8c2580a4cdf1fb693523afa30f91af0c34370 Mon Sep 17 00:00:00 2001 From: mohitrajain Date: Tue, 28 Apr 2026 13:41:30 +0200 Subject: [PATCH] fix: WPB-24090 fixed values for smtp helm chart --- changelog.d/2-wire-builds/smpt-values-fix | 1 + values/smtp/demo-values.example.yaml | 74 +++++++++++------------ values/smtp/prod-values.example.yaml | 67 ++++++++++---------- 3 files changed, 72 insertions(+), 70 deletions(-) create mode 100644 changelog.d/2-wire-builds/smpt-values-fix diff --git a/changelog.d/2-wire-builds/smpt-values-fix b/changelog.d/2-wire-builds/smpt-values-fix new file mode 100644 index 000000000..5c55e4a80 --- /dev/null +++ b/changelog.d/2-wire-builds/smpt-values-fix @@ -0,0 +1 @@ +Fixed: values for smtp helm chart diff --git a/values/smtp/demo-values.example.yaml b/values/smtp/demo-values.example.yaml index 61af4315b..297b57297 100644 --- a/values/smtp/demo-values.example.yaml +++ b/values/smtp/demo-values.example.yaml @@ -1,43 +1,43 @@ -# CHANGEME-PROD: This is often a good default when using calico's default CIDR -# https://github.com/kubernetes-sigs/kubespray/blob/master/docs/calico.md#optional--define-the-default-pool-cidr -# or flannel's https://github.com/kubernetes-sigs/kubespray/blob/master/docs/flannel.md#flannel +# CHANGEME-DEMO: CHange it according to what has been configured for minikube pod_network_cidr at +# https://github.com/wireapp/wire-server-deploy/blob/master/ansible/inventory/demo/host.yml#L39 # If you override those values, etc., then verify that this CIDR still makes sense -# For all variables the "egos-tech/smtp" image supports see: https://gitlab.com/egos-tech/smtp and https://github.com/ntppool/charts/tree/main/charts/smtp +# https://github.com/wireapp/helm-charts/tree/dev/charts/smtp -service: - type: ClusterIP # for outside of cluster access, change to NodePort and add nodePort to service.yaml - port: 25 +smtp: + service: + type: ClusterIP # for outside of cluster access, change to NodePort and add nodePort to service.yaml + port: 25 -# for DKIM support -# extraVolumes: -# - name: dkim-key -# secret: -# secretName: dkim-private-key + # for DKIM support + # extraVolumes: + # - name: dkim-key + # secret: + # secretName: dkim-private-key -# extraVolumeMounts: -# - name: dkim-key -# mountPath: /secrets/dkim.key -# subPath: wire-mail.private -# readOnly: true + # extraVolumeMounts: + # - name: dkim-key + # mountPath: /secrets/dkim.key + # subPath: wire-mail.private + # readOnly: true -config: - RELAY_NETWORKS: ":10.233.0.0/16" -# for DKIM support -# MAILNAME: mail.example.com -# DKIM_KEY_PATH: /secrets/dkim.key -# DKIM_DOMAIN: "example.com" -# DKIM_PRIVATE_KEY: "/etc/exim4/dkim.key" + config: + RELAY_NETWORKS: ":10.233.0.0/16" + # for DKIM support + # MAILNAME: mail.example.com + # DKIM_KEY_PATH: /secrets/dkim.key + # DKIM_DOMAIN: "example.com" + # DKIM_PRIVATE_KEY: "/etc/exim4/dkim.key" -# PORT: "25" -# NET_DEV: eth0 -# OTHER_HOSTNAMES: other.example.com -# DISABLE_IPV6: 1 -# BIND_IP: 0.0.0.0 -# BIND_IP6: ::0 -# KEY_PATH: /path/to/key.crt -# CERTIFICATE_PATH: /path/to/certificate.crt -# SMARTHOST_ADDRESS: mail.example.com -# SMARTHOST_PORT: "587" -# SMARTHOST_USER: exampleuser -# SMARTHOST_PASSWORD: secret -# SMARTHOST_ALIASES: "*.example.com" + # PORT: "25" + # NET_DEV: eth0 + # OTHER_HOSTNAMES: other.example.com + # DISABLE_IPV6: 1 + # BIND_IP: 0.0.0.0 + # BIND_IP6: ::0 + # KEY_PATH: /path/to/key.crt + # CERTIFICATE_PATH: /path/to/certificate.crt + # SMARTHOST_ADDRESS: mail.example.com + # SMARTHOST_PORT: "587" + # SMARTHOST_USER: exampleuser + # SMARTHOST_PASSWORD: secret + # SMARTHOST_ALIASES: "*.example.com" diff --git a/values/smtp/prod-values.example.yaml b/values/smtp/prod-values.example.yaml index 61af4315b..099aa4da8 100644 --- a/values/smtp/prod-values.example.yaml +++ b/values/smtp/prod-values.example.yaml @@ -4,40 +4,41 @@ # If you override those values, etc., then verify that this CIDR still makes sense # For all variables the "egos-tech/smtp" image supports see: https://gitlab.com/egos-tech/smtp and https://github.com/ntppool/charts/tree/main/charts/smtp -service: - type: ClusterIP # for outside of cluster access, change to NodePort and add nodePort to service.yaml - port: 25 +smtp: + service: + type: ClusterIP # for outside of cluster access, change to NodePort and add nodePort to service.yaml + port: 25 -# for DKIM support -# extraVolumes: -# - name: dkim-key -# secret: -# secretName: dkim-private-key + # for DKIM support + # extraVolumes: + # - name: dkim-key + # secret: + # secretName: dkim-private-key -# extraVolumeMounts: -# - name: dkim-key -# mountPath: /secrets/dkim.key -# subPath: wire-mail.private -# readOnly: true + # extraVolumeMounts: + # - name: dkim-key + # mountPath: /secrets/dkim.key + # subPath: wire-mail.private + # readOnly: true -config: - RELAY_NETWORKS: ":10.233.0.0/16" -# for DKIM support -# MAILNAME: mail.example.com -# DKIM_KEY_PATH: /secrets/dkim.key -# DKIM_DOMAIN: "example.com" -# DKIM_PRIVATE_KEY: "/etc/exim4/dkim.key" + config: + RELAY_NETWORKS: ":10.233.0.0/16" + # for DKIM support + # MAILNAME: mail.example.com + # DKIM_KEY_PATH: /secrets/dkim.key + # DKIM_DOMAIN: "example.com" + # DKIM_PRIVATE_KEY: "/etc/exim4/dkim.key" -# PORT: "25" -# NET_DEV: eth0 -# OTHER_HOSTNAMES: other.example.com -# DISABLE_IPV6: 1 -# BIND_IP: 0.0.0.0 -# BIND_IP6: ::0 -# KEY_PATH: /path/to/key.crt -# CERTIFICATE_PATH: /path/to/certificate.crt -# SMARTHOST_ADDRESS: mail.example.com -# SMARTHOST_PORT: "587" -# SMARTHOST_USER: exampleuser -# SMARTHOST_PASSWORD: secret -# SMARTHOST_ALIASES: "*.example.com" + # PORT: "25" + # NET_DEV: eth0 + # OTHER_HOSTNAMES: other.example.com + # DISABLE_IPV6: 1 + # BIND_IP: 0.0.0.0 + # BIND_IP6: ::0 + # KEY_PATH: /path/to/key.crt + # CERTIFICATE_PATH: /path/to/certificate.crt + # SMARTHOST_ADDRESS: mail.example.com + # SMARTHOST_PORT: "587" + # SMARTHOST_USER: exampleuser + # SMARTHOST_PASSWORD: secret + # SMARTHOST_ALIASES: "*.example.com"