diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 92c010b5..25dcb0da 100644 --- 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 index 9284e84a..48c4e071 100644 --- 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 index c1f5c912..b7f8eb54 100644 --- 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 index 277ac13f..ec31c105 100644 --- 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 -}}