From 2d7af7add8fd7e3362c4085c8f737dd800f3aae3 Mon Sep 17 00:00:00 2001 From: Pau Date: Sat, 25 Jan 2020 00:56:44 +0100 Subject: [PATCH] missing smtp_admin_emails env and explicit disable of smtp_mock because is on by default. (#21) Signed-off-by: paulopez78 --- charts/kong/Chart.yaml | 2 +- charts/kong/templates/_helpers.tpl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/kong/Chart.yaml b/charts/kong/Chart.yaml index 163d2426e..5ae3ae119 100644 --- a/charts/kong/Chart.yaml +++ b/charts/kong/Chart.yaml @@ -10,5 +10,5 @@ maintainers: email: harry@konghq.com name: kong sources: -version: 1.1.0 +version: 1.1.1 appVersion: 1.4 diff --git a/charts/kong/templates/_helpers.tpl b/charts/kong/templates/_helpers.tpl index 79fd245e2..44cfd3226 100644 --- a/charts/kong/templates/_helpers.tpl +++ b/charts/kong/templates/_helpers.tpl @@ -409,10 +409,12 @@ the template that it itself is using form the above sections. {{- end }} {{- if .Values.enterprise.smtp.enabled }} + {{- $_ := set $autoEnv "KONG_SMTP_MOCK" "off" -}} {{- $_ := set $autoEnv "KONG_PORTAL_EMAILS_FROM" .Values.enterprise.smtp.portal_emails_from -}} {{- $_ := set $autoEnv "KONG_PORTAL_EMAILS_REPLY_TO" .Values.enterprise.smtp.portal_emails_reply_to -}} {{- $_ := set $autoEnv "KONG_ADMIN_EMAILS_FROM" .Values.enterprise.smtp.admin_emails_from -}} {{- $_ := set $autoEnv "KONG_ADMIN_EMAILS_REPLY_TO" .Values.enterprise.smtp.admin_emails_reply_to -}} + {{- $_ := set $autoEnv "KONG_SMTP_ADMIN_EMAILS" .Values.enterprise.smtp.smtp_admin_emails -}} {{- $_ := set $autoEnv "KONG_SMTP_HOST" .Values.enterprise.smtp.smtp_host -}} {{- $_ := set $autoEnv "KONG_SMTP_PORT" .Values.enterprise.smtp.smtp_port -}} {{- $_ := set $autoEnv "KONG_SMTP_STARTTLS" (quote .Values.enterprise.smtp.smtp_starttls) -}}