Support subpaths in buckets

wandb · Oct 18, 2023 · 3a05f1f · 3a05f1f
1 parent c117330
commit 3a05f1f
Show file tree

Hide file tree

Showing 2 changed files with 5 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.10.21
+version: 0.10.22
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

diff --git a/charts/operator-wandb/charts/app/templates/_helpers.tpl b/charts/operator-wandb/charts/app/templates/_helpers.tpl
@@ -112,16 +112,16 @@ app deployments.
 
 {{- define "app.bucket" -}}
 {{- if eq .Values.global.bucket.provider "az" }}
-{{- printf "az://%s/%s" .Values.global.bucket.name .Values.global.bucket.path -}}
+{{- trimSuffix "/" (printf "az://%s/%s" .Values.global.bucket.name .Values.global.bucket.path) -}}
 {{- end }}
 {{- if eq .Values.global.bucket.provider "gcs" }}
-{{- printf "gs://%s" .Values.global.bucket.name -}}
+{{- trimSuffix "/" (printf "gs://%s" .Values.global.bucket.name) -}}
 {{- end }}
 {{- if eq .Values.global.bucket.provider "s3" }}
 {{- if and .Values.global.bucket.accessKey .Values.global.bucket.secretKey}}
-{{- printf "s3://%s:%s@%s" .Values.global.bucket.accessKey .Values.global.bucket.secretKey .Values.global.bucket.name -}}
+{{- trimSuffix "/" (printf "s3://%s:%s@%s/%s" .Values.global.bucket.accessKey .Values.global.bucket.secretKey .Values.global.bucket.name .Values.global.bucket.path) -}}
 {{- else }}
-{{- printf "s3://%s" .Values.global.bucket.name -}}
+{{- trimSuffix "/" (printf "s3://%s/%s" .Values.global.bucket.name .Values.global.bucket.path) -}}
 {{- end }}
 {{- end }}
 {{- end }}