Skip to content

control-service: add configurable smtp host property #2411

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

Merged
mrMoZ1 merged 1 commit into from
Jul 14, 2023
Merged

control-service: add configurable smtp host property #2411

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
2 changes: 2 additions & 0 deletions .../control-service/projects/helm_charts/pipelines-control-service/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
1 change: 1 addition & 0 deletions projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,7 @@ mail:
auth: false
starttls:
enable: false
host: ""
user: ""
password: ""
ssl:
Expand Down
2 changes: 1 addition & 1 deletion ...trol-service/projects/pipelines_control_service/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down