Merge branch 'main' into otel

wandb · Oct 19, 2023 · 09c1772 · 09c1772
2 parents 936e464 + f979a97
commit 09c1772
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 52 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.24
 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
@@ -111,17 +111,19 @@ app deployments.
 {{- end }}
 
 {{- define "app.bucket" -}}
-{{- if eq .Values.global.bucket.provider "az" }}
-{{- 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 -}}
-{{- 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 -}}
-{{- else }}
-{{- printf "s3://%s" .Values.global.bucket.name -}}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- $bucket := "" -}} 
+{{- if eq .Values.global.bucket.provider "az" -}}
+{{- $bucket = printf "az://%s/%s" .Values.global.bucket.name .Values.global.bucket.path -}}
+{{- end -}}
+{{- if eq .Values.global.bucket.provider "gcs" -}}
+{{- $bucket = 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 -}}
+{{- $bucket = printf "s3://%s:%s@%s/%s" .Values.global.bucket.accessKey .Values.global.bucket.secretKey .Values.global.bucket.name .Values.global.bucket.path -}}
+{{- else -}}
+{{- $bucket = printf "s3://%s/%s" .Values.global.bucket.name .Values.global.bucket.path -}}
+{{- end -}}
+{{- end -}}
+{{- trimSuffix "/" $bucket -}}
+{{- end -}}
diff --git a/charts/operator-wandb/charts/parquet/templates/_helpers.tpl b/charts/operator-wandb/charts/parquet/templates/_helpers.tpl
@@ -111,17 +111,19 @@ app deployments.
 {{- end -}}
 
 {{- define "parquet.bucket" -}}
-{{- if eq .Values.global.bucket.provider "az" }}
-{{- 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 -}}
-{{- 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 -}}
-{{- else }}
-{{- printf "s3://%s" .Values.global.bucket.name -}}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- $bucket := "" -}} 
+{{- if eq .Values.global.bucket.provider "az" -}}
+{{- $bucket = printf "az://%s/%s" .Values.global.bucket.name .Values.global.bucket.path -}}
+{{- end -}}
+{{- if eq .Values.global.bucket.provider "gcs" -}}
+{{- $bucket = 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 -}}
+{{- $bucket = printf "s3://%s:%s@%s/%s" .Values.global.bucket.accessKey .Values.global.bucket.secretKey .Values.global.bucket.name .Values.global.bucket.path -}}
+{{- else -}}
+{{- $bucket = printf "s3://%s/%s" .Values.global.bucket.name .Values.global.bucket.path -}}
+{{- end -}}
+{{- end -}}
+{{- trimSuffix "/" $bucket -}}
+{{- end -}}
diff --git a/charts/operator-wandb/charts/prometheus/charts/mysql-exporter/templates/_helpers.tpl b/charts/operator-wandb/charts/prometheus/charts/mysql-exporter/templates/_helpers.tpl
@@ -110,14 +110,3 @@ app deployments.
 {{- end }}
 {{- end }}
 
-{{- define "mysql-exporter.bucket" -}}
-{{- if eq .Values.global.bucket.provider "az" }}
-{{- 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 -}}
-{{- end }}
-{{- if eq .Values.global.bucket.provider "s3" }}
-{{- printf "s3://%s" .Values.global.bucket.name -}}
-{{- end }}
-{{- end }}
diff --git a/charts/operator-wandb/charts/prometheus/charts/redis-exporter/templates/_helpers.tpl b/charts/operator-wandb/charts/prometheus/charts/redis-exporter/templates/_helpers.tpl
@@ -109,15 +109,3 @@ app deployments.
 {{- print $cs -}}
 {{- end }}
 {{- end }}
-
-{{- define "redis-exporter.bucket" -}}
-{{- if eq .Values.global.bucket.provider "az" }}
-{{- 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 -}}
-{{- end }}
-{{- if eq .Values.global.bucket.provider "s3" }}
-{{- printf "s3://%s" .Values.global.bucket.name -}}
-{{- end }}
-{{- end }}