Merge b98dd8d into 41402a8

wandb · Feb 5, 2025 · 7e2afac · 7e2afac
2 parents 41402a8 + b98dd8d
commit 7e2afac
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/charts/operator-wandb/Chart.lock b/charts/operator-wandb/Chart.lock
@@ -63,4 +63,4 @@ dependencies:
   repository: file://../wandb-base
   version: 0.4.1
 digest: sha256:d6b5ef46b80814179a954ed674dc248c65cdc8192ead7a11f1df3861da29feed
-generated: "2025-02-04T18:10:09.463049-08:00"
+generated: "2025-02-05T11:05:02.905698-06:00"
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.25.0
+version: 0.25.1
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

diff --git a/charts/operator-wandb/charts/app/templates/deployment.yaml b/charts/operator-wandb/charts/app/templates/deployment.yaml
@@ -93,6 +93,9 @@ spec:
             - name: anaconda
               containerPort: 8082
               protocol: TCP
+            - name: local
+              containerPort: 8083
+              protocol: TCP
             - name: gorilla-statsd
               containerPort: 8125
               protocol: TCP

diff --git a/charts/operator-wandb/charts/app/templates/service.yaml b/charts/operator-wandb/charts/app/templates/service.yaml
@@ -48,5 +48,8 @@ spec:
     - port: 8082
       protocol: TCP
       name: anaconda
+    - port: 8083
+      protocol: TCP
+      name: local
   selector:
     {{- include "app.labels" . | nindent 4 }}
diff --git a/charts/operator-wandb/templates/session-key.yaml b/charts/operator-wandb/templates/session-key.yaml
@@ -14,3 +14,5 @@ data:
   # Set $gorillaSessionKey to existing secret data or generate a random one when not exists
   {{- $gorillaSessionKey := (get $secretData "GORILLA_SESSION_KEY") | default (randAlphaNum 32 | b64enc) }}
   GORILLA_SESSION_KEY: {{ $gorillaSessionKey | quote }}
+  {{- $jwkUrl := ( .Values.global.auth.jwkUrl | default (printf "http://%s-app:8083/api/jwks.json" .Release.Name)) | b64enc  }}
+  GORILLA_AUTH_JWK_URL: {{ $jwkUrl | quote }}
diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
@@ -73,9 +73,9 @@ global:
 
   otel:
     traces:
-      host: ""       # defaults to the otel-daemonset service
-      port: 4317     # grpc default is 4317, http default is 4318
-      proto: "grpc"  # grpc, http
+      host: "" # defaults to the otel-daemonset service
+      port: 4317 # grpc default is 4317, http default is 4318
+      proto: "grpc" # grpc, http
 
   clickhouse:
     install: false
@@ -97,6 +97,7 @@ global:
 
   auth:
     sessionLengthHours: 720
+    jwkUrl: "" # Internal URL for the auth service should be using oidc or auth0
     oidc:
       clientId: ""
       secret: ""