From 2a36f8330884b7c064aa0c97bc7ef6ba838c4782 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@gmail.com>
Date: Mon, 17 Jan 2022 03:30:09 +0530
Subject: [PATCH] chore(helm): smtp variable injection

Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
 .../charts/alerts/templates/deployment.yaml   | 18 ++++++++++++++++++
 .../openreplay/charts/alerts/values.yaml      |  9 ---------
 .../charts/chalice/templates/deployment.yaml  | 18 ++++++++++++++++++
 scripts/helmcharts/vars.yaml                  | 19 ++++++++++---------
 4 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml
index a780e481f..34ece7eeb 100644
--- a/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml
@@ -62,6 +62,24 @@ spec:
               value: '{{ .Values.global.s3.secretKey }}'
             - name: AWS_DEFAULT_REGION
               value: '{{ .Values.global.s3.region }}'
+            - name: EMAIL_HOST
+              value: '{{ .Values.global.email.emailHost }}'
+            - name: EMAIL_PORT
+              value: '{{ .Values.global.email.emailPort }}'
+            - name: EMAIL_USER
+              value: '{{ .Values.global.email.emailUser }}'
+            - name: EMAIL_PASSWORD
+              value: '{{ .Values.global.email.emailPassword }}'
+            - name: EMAIL_USE_TLS
+              value: '{{ .Values.global.email.emailUseTls }}'
+            - name: EMAIL_USE_SSL
+              value: '{{ .Values.global.email.emailUseSsl }}'
+            - name: EMAIL_SSL_KEY
+              value: '{{ .Values.global.email.emailSslKey }}'
+            - name: EMAIL_SSL_CERT
+              value: '{{ .Values.global.email.emailSslCert }}'
+            - name: EMAIL_FROM
+              value: '{{ .Values.global.email.emailFrom }}'
             { { - range $key, $val := .Values.env } }
             - name: { { $key } }
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/alerts/values.yaml b/scripts/helmcharts/openreplay/charts/alerts/values.yaml
index 36ae111e3..590303a91 100644
--- a/scripts/helmcharts/openreplay/charts/alerts/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/alerts/values.yaml
@@ -76,15 +76,6 @@ autoscaling:
   # targetMemoryUtilizationPercentage: 80
 
 env:
-  EMAIL_HOST: ''
-  EMAIL_PORT: '587'
-  EMAIL_USER: ''
-  EMAIL_PASSWORD: ''
-  EMAIL_USE_TLS: 'true'
-  EMAIL_USE_SSL: 'false'
-  EMAIL_SSL_KEY: ''
-  EMAIL_SSL_CERT: ''
-  EMAIL_FROM: OpenReplay<do-not-reply@openreplay.com>
   SITE_URL: ''
   PYTHONUNBUFFERED: '0'
 
diff --git a/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml
index 805873de7..dd67fa1c5 100644
--- a/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml
@@ -70,6 +70,24 @@ spec:
               value: '{{ .Values.global.s3.sourcemaps_bucket }}' 
             - name: js_cache_bucket
               value: '{{ .Values.global.s3.assetsBucket }}' 
+            - name: EMAIL_HOST
+              value: '{{ .Values.global.email.emailHost }}'
+            - name: EMAIL_PORT
+              value: '{{ .Values.global.email.emailPort }}'
+            - name: EMAIL_USER
+              value: '{{ .Values.global.email.emailUser }}'
+            - name: EMAIL_PASSWORD
+              value: '{{ .Values.global.email.emailPassword }}'
+            - name: EMAIL_USE_TLS
+              value: '{{ .Values.global.email.emailUseTls }}'
+            - name: EMAIL_USE_SSL
+              value: '{{ .Values.global.email.emailUseSsl }}'
+            - name: EMAIL_SSL_KEY
+              value: '{{ .Values.global.email.emailSslKey }}'
+            - name: EMAIL_SSL_CERT
+              value: '{{ .Values.global.email.emailSslCert }}'
+            - name: EMAIL_FROM
+              value: '{{ .Values.global.email.emailFrom }}'
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/vars.yaml b/scripts/helmcharts/vars.yaml
index ebf9888cb..869c252e6 100644
--- a/scripts/helmcharts/vars.yaml
+++ b/scripts/helmcharts/vars.yaml
@@ -48,6 +48,16 @@ global:
     # are same as minio.global.minio.accesskey and  secretKey
     accessKey: "changeMeMinioAccessKey"
     secretKey: "changeMeMinioPassword"
+  email:
+    emailHost: ''
+    emailPort: '587'
+    emailUser: ''
+    emailPassword: ''
+    emailUseTls: 'true'
+    emailUseSsl: 'false'
+    emailSslKey: ''
+    emailSslCert: ''
+    emailFrom: OpenReplay<do-not-reply@openreplay.com>
 
   enterpriseEditionLicense: ""
   domainName: ""
@@ -55,15 +65,6 @@ global:
 chalice:
   env:
     jwt_secret: "SetARandomStringHere"
-    # EMAIL_HOST: ''
-    # EMAIL_PORT: '587'
-    # EMAIL_USER: ''
-    # EMAIL_PASSWORD: ''
-    # EMAIL_USE_TLS: 'true'
-    # EMAIL_USE_SSL: 'false'
-    # EMAIL_SSL_KEY: ''
-    # EMAIL_SSL_CERT: ''
-    # EMAIL_FROM: OpenReplay<do-not-reply@openreplay.com>
     # SAML2_MD_URL: ''
     # idp_entityId: ''
     # idp_sso_url: ''