control-service: add configurable smtp host property (#2411)

what: added configurable mail.smtp.host property in the helm charts why: since this was quite an old property it was previously hardcoded in the control-service application.properties and I missed updating it when we introduced authenticated email functionality. testing: helm chart validations Signed-off-by: mrMoZ1 <[email protected]>
vmware · Jul 14, 2023 · 25e1f7b · 25e1f7b
1 parent f93a00f
commit 25e1f7b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.../control-service/projects/helm_charts/pipelines-control-service/templates/deployment.yaml b/.../control-service/projects/helm_charts/pipelines-control-service/templates/deployment.yaml
@@ -281,6 +281,8 @@ spec:
             - name: DATAJOBS_DEPLOYMENT_SUPPORTED_PYTHON_VERSIONS
               value: {{ .Values.deploymentSupportedPythonVersions | toJson | quote }}
             {{- end }}
+            - name: MAIL_SMTP_HOST
+              value: "{{ .Values.mail.smtp.host }}"
             {{- if .Values.mail.smtp.auth }}
             - name: MAIL_SMTP_AUTH
               value: "{{ .Values.mail.smtp.auth }}"

diff --git a/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml b/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml
@@ -1034,6 +1034,7 @@ mail:
     auth: false
     starttls:
       enable: false
+    host: ""
     user: ""
     password: ""
     ssl:

diff --git a/...trol-service/projects/pipelines_control_service/src/main/resources/application.properties b/...trol-service/projects/pipelines_control_service/src/main/resources/application.properties
@@ -173,7 +173,7 @@ datajobs.executions.logsUrl.endTimeOffsetSeconds=${DATAJOBS_EXECUTIONS_LOGS_URL_
 
 # https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html
 mail.transport.protocol= ${MAIL_TRANSPORT_PROTOCOL:smtp}
-mail.smtp.host=smtp.vmware.com
+mail.smtp.host=${MAIL_SMTP_HOST:smtp.vmware.com}
 # Fill these in if the notification emails need to go through an authenticated email.
 mail.smtp.auth=${MAIL_SMTP_AUTH:false}
 mail.smtp.starttls.enable=${MAIL_SMTP_STARTTLS_ENABLE:false}