Merge 20dfb9a into 56088a7

wandb · Nov 12, 2024 · 00c0ce3 · 00c0ce3
2 parents 56088a7 + 20dfb9a
commit 00c0ce3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 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.18.14
+version: 0.18.15
 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
@@ -135,7 +135,9 @@ app deployments.
 {{- define "app.internalJWTMap" -}}
 '{
 {{- range $value := .Values.internalJWTMap -}}
+{{- if and (not (empty $value.subject)) (not (empty $value.issuer)) }}
 {{- printf "%q: %q" $value.subject $value.issuer }},
 {{- end -}}
+{{- end -}}
 }'
 {{- end -}}
diff --git a/charts/operator-wandb/charts/app/values.yaml b/charts/operator-wandb/charts/app/values.yaml
@@ -74,6 +74,7 @@ artifactsGc:
   NumWorkers: 0
   DeleteFilesNumWorkers: 0
 
+# internalJWTMap is used to map service accounts to their issuers.
 internalJWTMap:
   - subject: "system:serviceaccount:{{ .Release.Namespace }}:{{ .Release.Name }}-weave-trace"
-    issuer: "https://kubernetes.{{ .Release.Namespace }}.svc.cluster.local"
+    issuer: ""