Change bucket values scheme

wandb · Aug 29, 2023 · 09669b1 · 09669b1
1 parent b7cbf1a
commit 09669b1
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 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.4.4
+version: 0.5.0
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

diff --git a/charts/operator-wandb/charts/app/templates/NOTES.txt b/charts/operator-wandb/charts/app/templates/NOTES.txt
diff --git a/charts/operator-wandb/charts/app/templates/_helpers.tpl b/charts/operator-wandb/charts/app/templates/_helpers.tpl
@@ -109,3 +109,18 @@ app deployments.
 {{- print $cs -}}
 {{- end }}
 {{- end }}
+
+{{- define "app.bucket" -}}
+{{- if eq .Values.global.bucket.provider "azure" }}
+{{- printf "az://%s/%s" .Values.global.bucket.name .Values.global.bucket.path -}}
+{{- end }}
+{{- if eq .Values.global.bucket.provider "google" }}
+{{- printf "gs://%s" .Values.global.bucket.name .Values.global.bucket.path -}}
+{{- end }}
+{{- if eq .Values.global.bucket.provider "s3" }}
+{{- printf "s3://%s" .Values.global.bucket.name -}}
+{{- end }}
+{{- if eq .Values.global.bucket.provider "aws" }}
+{{- printf "s3://%s" .Values.global.bucket.name -}}
+{{- end }}
+{{- end }}
diff --git a/charts/operator-wandb/charts/app/templates/deployment.yaml b/charts/operator-wandb/charts/app/templates/deployment.yaml
@@ -144,13 +144,16 @@ spec:
               value: "{{ .Values.global.auth.sessionLengthHours }}h"
 
             - name: BUCKET
-              value: {{ .Values.global.storage.connectionString }}
+              value: "{{ include "app.bucket" . }}"
             - name: BUCKET_QUEUE
               value: "internal://"
             - name: AWS_REGION
-              value: {{ .Values.global.storage.region }}
+              value: {{ .Values.global.bucket.region }}
             - name: AWS_S3_KMS_ID
-              value: "{{ .Values.global.storage.kmsKeyArn }}"
+              value: "{{ .Values.global.bucket.kmsKeyArn }}"
+
+            - name: OPERATOR_ENABLED
+              value: "true"
 
             - name: LOGGING_ENABLED
               value: 'true'

diff --git a/charts/operator-wandb/charts/weave/templates/pvc.yaml b/charts/operator-wandb/charts/weave/templates/pvc.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- include "weave.commonLabels" . | nindent 4 }}
     {{- include "weave.labels" . | nindent 4 }}
 spec:
-  accessModes: [ReadWriteOnce]
+  accessModes: [ReadWriteMany]
   {{ include "wandb.storageClass" . | nindent 4 }}
   resources:
     requests:

diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
@@ -55,10 +55,14 @@ global:
       authMethod: ""
       issuer: ""
 
-  storage:
-    connectionString: ""
+  bucket:
+    provider: "s3"
+    name: ""
+    path: ""
     region: ""
-    kmsKeyArn: ""
+    kmsKey: ""
+    secretKey: ""
+    accessKey: ""
 
   redis:
     host: ""
@@ -92,6 +96,7 @@ app:
 
 weave:
   install: true
+  storageClass: ""
   image:
     repository: wandb/local
     tag: latest