[DSD-2651] merged sms-gateway and email-gateway as msg-gateway (#479)

* [DSD-2651] configured sms * [DSD-2651] replaced msg with email * [DSD-2651] removed email update smtp * [DSD-2651] removed email updated smtp * [DSD-2651] removed email updated smtp * [DSD-2651] removed email updated smtp
mosip · Jul 6, 2023 · a6fd321 · a6fd321
1 parent ddc25e8
commit a6fd321
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 14 deletions.
diff --git a/charts/config-server/templates/_overides.tpl b/charts/config-server/templates/_overides.tpl
@@ -347,29 +347,53 @@ All env variables that are accessed from mosip config properties
       key: s3-user-secret
 {{- end }}
 
-- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_EMAIL_SMTP_HOST
+- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SMTP_HOST
   valueFrom:
     configMapKeyRef:
-      name: {{ .Values.overrides.configmaps.email }}
-      key: email-smtp-host
+      name: {{ .Values.overrides.configmaps.smtp }}
+      key: smtp-host
 
-- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_EMAIL_SMTP_PORT
+- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SMS_HOST
   valueFrom:
     configMapKeyRef:
-      name: {{ .Values.overrides.configmaps.email }}
-      key: email-smtp-port
+      name: {{ .Values.overrides.configmaps.sms }}
+      key: sms-host
 
-- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_EMAIL_SMTP_USERNAME
+- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SMTP_PORT
   valueFrom:
     configMapKeyRef:
-      name: {{ .Values.overrides.configmaps.email }}
-      key: email-smtp-username
+      name: {{ .Values.overrides.configmaps.smtp }}
+      key: smtp-port
 
-- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_EMAIL_SMTP_SECRET
+- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SMS_PORT
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Values.overrides.configmaps.sms }}
+      key: sms-port
+
+- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SMTP_USERNAME
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Values.overrides.configmaps.smtp }}
+      key: smtp-username
+
+- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SMS_USERNAME
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Values.overrides.configmaps.sms }}
+      key: sms-username
+
+- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SMTP_SECRET
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.overrides.secrets.smtp }}
+      key: smtp-secret
+
+- name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_SMS_SECRET
   valueFrom:
     secretKeyRef:
-      name: {{ .Values.overrides.secrets.email }}
-      key: email-smtp-secret
+      name: {{ .Values.overrides.secrets.sms }}
+      key: sms-secret
 
 - name: SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_PREREG_CAPTCHA_SITE_KEY
   valueFrom:

diff --git a/charts/config-server/values.yaml b/charts/config-server/values.yaml
@@ -154,15 +154,17 @@ overrides:
     softhsmIDA: softhsm-ida
     activemq: activemq-activemq-artemis
     s3: s3
-    email: email-gateway
+    smtp: msg-gateway
+    sms: msg-gateway
     captcha: mosip-captcha
     confSecretsVarious: conf-secrets-various
   configmaps:
     keycloakHost: keycloak-host
     global: global
     activemq: activemq-activemq-artemis-share
     s3: s3
-    email: email-gateway
+    smtp: msg-gateway
+    sms: msg-gateway
 ## The active profile env if you have another set of properties. Correspondingly, properties in Git repo will
 ## have names of type "*-default.properties"
 activeProfileEnv: default