feat(operator-wandb): add mailFrom to SMTP config

charts/operator-wandb/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: operator-wandb
 description: A Helm chart for deploying W&B to Kubernetes
 type: application
-version: 0.41.5
+version: 0.41.6
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

charts/operator-wandb/templates/_env.tpl

@@ -472,9 +472,9 @@ Global values will override any chart-specific values.
 {{- /*
   ATTENTION!
 
-  SMTP_PASSWORD, SMTP_PORT, SMTP_HOST, SMTP_USER
+  SMTP_PASSWORD, SMTP_PORT, SMTP_HOST, SMTP_USER, GORILLA_EMAIL_FROM_ADDRESS
 
-  Are all set in the values.yaml under global.email.smtp.(host,port,user,password)
+  Are all set in the values.yaml under global.email.smtp.(host,port,user,password,mailFrom)
 
   The following blocks enable values to be provided in one of two ways:
 
@@ -485,6 +485,7 @@ Global values will override any chart-specific values.
         port: 587
         user: "noreply@example.com"
         password: "supersafe"
+        mailFrom: "noreply@example.com"
 
   AS K8s REFS:
     email:
@@ -509,6 +510,11 @@ Global values will override any chart-specific values.
             secretKeyRef:
               name: "smtp-settings-secret"
               key: "password"
+        mailFrom:
+          valueFrom:
+            secretKeyRef:
+              name: "smtp-settings-secret"
+              key: "mailFrom"
 */ -}}
 
 {{- if kindIs "map" .Values.global.email.smtp.host }}
@@ -548,6 +554,14 @@ Global values will override any chart-specific values.
 
 - name: GORILLA_EMAIL_SINK
   value: "{{ include "wandb.emailSink" . | trim }}"
+
+{{- if kindIs "map" .Values.global.email.smtp.mailFrom }}
+- name: GORILLA_EMAIL_FROM_ADDRESS
+{{- toYaml .Values.global.email.smtp.mailFrom | nindent 2 }}
+{{- else if ne .Values.global.email.smtp.mailFrom "" }}
+- name: GORILLA_EMAIL_FROM_ADDRESS
+  value: "{{ include "wandb.smtp.mailFrom" . }}"
+{{- end }}
 {{- end -}}
 
 {{- define "wandb.downwardEnvs" -}}

charts/operator-wandb/templates/_smtp.tpl

@@ -26,6 +26,13 @@ Return the SMTP password
 {{- print $.Values.global.email.smtp.password -}}
 {{- end -}}
 
+{{/*
+Return the SMTP mailFrom address
+*/}}
+{{- define "wandb.smtp.mailFrom" -}}
+{{- print $.Values.global.email.smtp.mailFrom -}}
+{{- end -}}
+
 {{/*
 Const: Internals should not be tied back to the values.yaml in any way.
 */}}

charts/operator-wandb/values.yaml

@@ -321,6 +321,7 @@ global:
       port: 587
       user: ""
       password: ""
+      mailFrom: ""
 
   #
   # For Advanced Users:
@@ -349,6 +350,11 @@ global:
   #         secretKeyRef:
   #           name: "email-settings-secret"
   #           key: "password"
+  #     mailFrom:
+  #       valueFrom:
+  #         secretKeyRef:
+  #           name: "email-settings-secret"
+  #           key: "mailFrom"
 
   auth:
     sessionLengthHours: 720