Update tpl

wandb · Sep 23, 2024 · 3009718 · 3009718
1 parent 08a75d8
commit 3009718
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/charts/operator-wandb/charts/mysql/templates/statefulset.yaml b/charts/operator-wandb/charts/mysql/templates/statefulset.yaml
@@ -49,7 +49,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ include "wandb.mysql.passwordSecret" . }}
-                  key: {{ if .Values.global.mysql.passwordSecret.key }}{{ .Values.global.mysql.passwordSecret.key }}{{ else }}MYSQL_ROOT_PASSWORD{{ end }}
+                  key: {{ if .Values.global.mysql.passwordSecret.rootKey }}{{ .Values.global.mysql.passwordSecret.rootKey }}{{ else }}MYSQL_ROOT_PASSWORD{{ end }}
             - name: MYSQL_PASSWORD
               valueFrom:
                 secretKeyRef:

diff --git a/charts/operator-wandb/templates/_mysql.tpl b/charts/operator-wandb/templates/_mysql.tpl
@@ -1,5 +1,5 @@
 {{/*
-Return name of the secret where information is stored, considering if the custom secret is defined
+Return the name of the secret where information is stored, considering if the custom secret is defined
 */}}
 {{- define "wandb.mysql.passwordSecret" -}}
 {{- if .Values.global.mysql.passwordSecret.name }}
@@ -10,16 +10,28 @@ Return name of the secret where information is stored, considering if the custom
 {{- end -}}
 
 {{/*
-Return key of the secret where information is stored, considering if the custom key is defined
+Return the key of the secret where the password is stored, considering if the custom key is defined
 */}}
 {{- define "wandb.mysql.passwordSecret.key" -}}
-{{- if .Values.global.mysql.passwordSecret.key }}
-  {{- .Values.global.mysql.passwordSecret.key -}}
+{{- if .Values.global.mysql.passwordSecret.userKey }}
+  {{- .Values.global.mysql.passwordSecret.userKey -}}
 {{- else }}
   MYSQL_PASSWORD
 {{- end -}}
 {{- end -}}
 
+{{/*
+Return the key of the secret where the root password is stored, considering if the custom root key is defined
+*/}}
+{{- define "wandb.mysql.passwordSecret.rootKey" -}}
+{{- if .Values.global.mysql.passwordSecret.rootKey }}
+  {{- .Values.global.mysql.passwordSecret.rootKey -}}
+{{- else }}
+  MYSQL_ROOT_PASSWORD
+{{- end -}}
+{{- end -}}
+
+
 {{/*
 Return the db port
 */}}

diff --git a/charts/operator-wandb/templates/mysql.yaml b/charts/operator-wandb/templates/mysql.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.global.mysql.passwordSecret (or (not .Values.global.mysql.passwordSecret.name) (not .Values.global.mysql.passwordSecret.key)) }}
+{{- if or (not .Values.global.mysql.passwordSecret.name) (eq .Values.global.mysql.passwordSecret.name "") }}
 {{- $secretName := (include "wandb.mysql.passwordSecret" .)  }}
 {{- $secret := (lookup "v1" "Secret" .Release.Namespace $secretName) }}
 apiVersion: v1

diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
@@ -60,7 +60,8 @@ global:
     password: ""
     passwordSecret:
       name: ""
-      key: ""
+      rootKey: "MYSQL_ROOT_PASSWORD"
+      userKey: "MYSQL_PASSWORD"
 
   slack:
     secret: ""