fix: Default value for path (#201)

wandb · Aug 2, 2024 · 70fda00 · 70fda00
1 parent 88b0756
commit 70fda00
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 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.17.1
+version: 0.17.2
 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
@@ -117,16 +117,16 @@ app deployments.
 {{- end }}
 {{- $bucket := "" -}} 
 {{- if eq $bucketValues.provider "az" -}}
-{{- $bucket = printf "az://%s/%s" $bucketValues.name $bucketValues.path -}}
+{{- $bucket = printf "az://%s/%s" $bucketValues.name (default "" $bucketValues.path) -}}
 {{- end -}}
 {{- if eq $bucketValues.provider "gcs" -}}
-{{- $bucket = printf "gs://%s/%s" $bucketValues.name $bucketValues.path -}}
+{{- $bucket = printf "gs://%s/%s" $bucketValues.name (default "" $bucketValues.path) -}}
 {{- end -}}
 {{- if eq $bucketValues.provider "s3" -}}
 {{- if and $bucketValues.accessKey $bucketValues.secretKey -}}
-{{- $bucket = printf "s3://%s:%s@%s/%s" $bucketValues.accessKey $bucketValues.secretKey $bucketValues.name $bucketValues.path -}}
+{{- $bucket = printf "s3://%s:%s@%s/%s" $bucketValues.accessKey $bucketValues.secretKey $bucketValues.name (default "" $bucketValues.path) -}}
 {{- else -}}
-{{- $bucket = printf "s3://%s/%s" $bucketValues.name $bucketValues.path -}}
+{{- $bucket = printf "s3://%s/%s" $bucketValues.name (default "" $bucketValues.path) -}}
 {{- end -}}
 {{- end -}}
 {{- trimSuffix "/" $bucket -}}

diff --git a/charts/operator-wandb/charts/flat-run-fields-updater/templates/_helpers.tpl b/charts/operator-wandb/charts/flat-run-fields-updater/templates/_helpers.tpl
@@ -113,16 +113,16 @@ Create the name of the service account to use
 {{- end }}
 {{- $bucket := "" -}}
 {{- if eq $bucketValues.provider "az" -}}
-{{- $bucket = printf "az://%s/%s" $bucketValues.name $bucketValues.path -}}
+{{- $bucket = printf "az://%s/%s" $bucketValues.name (default "" $bucketValues.path) -}}
 {{- end -}}
 {{- if eq $bucketValues.provider "gcs" -}}
-{{- $bucket = printf "gs://%s/%s" $bucketValues.name $bucketValues.path -}}
+{{- $bucket = printf "gs://%s/%s" $bucketValues.name (default "" $bucketValues.path) -}}
 {{- end -}}
 {{- if eq $bucketValues.provider "s3" -}}
 {{- if and $bucketValues.accessKey $bucketValues.secretKey -}}
-{{- $bucket = printf "s3://%s:%s@%s/%s" $bucketValues.accessKey $bucketValues.secretKey $bucketValues.name $bucketValues.path -}}
+{{- $bucket = printf "s3://%s:%s@%s/%s" $bucketValues.accessKey $bucketValues.secretKey $bucketValues.name (default "" $bucketValues.path) -}}
 {{- else -}}
-{{- $bucket = printf "s3://%s/%s" $bucketValues.name $bucketValues.path -}}
+{{- $bucket = printf "s3://%s/%s" $bucketValues.name (default "" $bucketValues.path) -}}
 {{- end -}}
 {{- end -}}
 {{- trimSuffix "/" $bucket -}}

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