Skip to content

Wpb 24090 smtp values fix #901

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

Open
mohitrajain wants to merge 1 commit into
base: WPB-24090-terraform-fixes
Choose a base branch
from
+72 −70
Open

Wpb 24090 smtp values fix #901

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
1 change: 1 addition & 0 deletions changelog.d/2-wire-builds/smpt-values-fix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed: values for smtp helm chart
74 changes: 37 additions & 37 deletions values/smtp/demo-values.example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
67 changes: 34 additions & 33 deletions values/smtp/prod-values.example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading