feat: Support to pull bucket configurations from secrets (#224)

Support to pull bucket configurations from secrets
wandb · Sep 30, 2024 · dbd3973 · dbd3973
1 parent 43982fb
commit dbd3973
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/charts/operator-wandb/Chart.yaml b/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.18.1
+version: 0.18.2
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

diff --git a/charts/operator-wandb/templates/_bucket.tpl b/charts/operator-wandb/templates/_bucket.tpl
@@ -1,6 +1,12 @@
 {{/*
-Return name of secret where bucket information is stored
+Return the bucket credentials secret name
 */}}
 {{- define "wandb.bucket.secret" -}}
-{{- print .Release.Name "-bucket" -}}
+{{- if .Values.global.bucket.secretName -}}
+  {{ .Values.global.bucket.secretName }}
+{{- else if .Values.global.defaultBucket.secretName -}}
+  {{ .Values.global.defaultBucket.secretName }}
+{{- else }}
+  {{- print .Release.Name "-bucket" -}}
 {{- end -}}
+{{- end }}
diff --git a/charts/operator-wandb/templates/bucket.yaml b/charts/operator-wandb/templates/bucket.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.global.bucket.secretName }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -6,4 +7,5 @@ metadata:
     {{- include "wandb.commonLabels" . | nindent 4 }}
 data:
   ACCESS_KEY: {{ .Values.global.bucket.accessKey | default .Values.global.defaultBucket.accessKey | b64enc }}
-  SECRET_KEY: {{ .Values.global.bucket.secretKey | default .Values.global.defaultBucket.secretKey | b64enc }}
+  SECRET_KEY: {{ .Values.global.bucket.secretKey | default .Values.global.defaultBucket.secretKey | b64enc }}
+{{- end }}
diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
@@ -96,9 +96,11 @@ global:
     kmsKey: ""
     secretKey: ""
     accessKey: ""
+    secretName: ""
 
   # If specified the application will use this bucket for all storage operations, and will not be overridable by the user.
-  bucket: {}
+  bucket:
+    secretName: ""
 
   redis:
     host: ""