Merge branch 'main' into pnarode/pullSecret

charts/operator-wandb/Chart.lock

@@ -63,4 +63,4 @@ dependencies:
   repository: file://../wandb-base
   version: 0.4.0
 digest: sha256:d9e104084992aaca36330a56d4a5b825fd20f0bdf995070bf93f46a883375169
-generated: "2025-01-21T12:17:36.303852-06:00"
+generated: "2025-01-24T13:27:40.057251-06:00"

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.24.0
+version: 0.24.6
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

charts/operator-wandb/README.md

@@ -39,7 +39,7 @@ By default, the W&B Server chart includes an in-cluster Redis deployment that is
 provided by bitnami/Redis. This deployment is for trial purposes only and not
 recommended for use in production.
 
-## Use extneral stateful data
+## Use external stateful data
 
 You can configure the W&B Server Helm chart to point to external stateful
 storage for items like MySQL, Redis, and Storage.

charts/operator-wandb/charts/app/templates/deployment.yaml

@@ -92,6 +92,9 @@ spec:
             - name: prometheus
               containerPort: 8181
               protocol: TCP
+            - name: anaconda
+              containerPort: 8082
+              protocol: TCP
             - name: gorilla-statsd
               containerPort: 8125
               protocol: TCP
@@ -117,6 +120,8 @@ spec:
             # - name: PROXY_PASS_BACKEND_HOST
             #   value: "$({{.Release.Name | upper | replace "-" "_" }}_API_SERVICE_HOST):$({{.Release.Name | upper | replace "-" "_" }}_API_SERVICE_PORT)"
             # {{- end }}
+            - name: GORILLA_GLUE_CONTAINER_PORT
+              value: "9173"
             - name: BUCKET_ACCESS_KEY
               valueFrom:
                 secretKeyRef:
@@ -214,7 +219,7 @@ spec:
                   optional: true
             {{- end }}
             {{- if ne .Values.global.auth.oidc.clientId ""  }}
-            - name: OIDC_CLIENT_ID            
+            - name: OIDC_CLIENT_ID
               value: {{ .Values.global.auth.oidc.clientId }}
             - name: OIDC_AUTH_METHOD
               value: {{ .Values.global.auth.oidc.authMethod }}
@@ -285,6 +290,8 @@ spec:
                 }
             - name: GORILLA_SETTINGS_CACHE
               value: "{{ include "app.redis" . | trim }}"
+            - name: GORILLA_SWEEP_PROVIDER
+              value: "{{ .Values.global.sweepProvider | default (printf "http://%s-app:8082" .Release.Name) }}"
             - name: GORILLA_METADATA_CACHE
               value: "{{ include "app.redis" . | trim }}"
             - name: GORILLA_HISTORY_STORE

charts/operator-wandb/charts/app/templates/service.yaml

@@ -43,5 +43,8 @@ spec:
     - port: 8181
       protocol: TCP
       name: prometheus
+    - port: 8082
+      protocol: TCP
+      name: anaconda
   selector:
     {{- include "app.labels" . | nindent 4 }}

charts/operator-wandb/templates/_bucket.tpl

@@ -15,17 +15,30 @@
 
 {{- define "wandb.bucket" -}}
 {{- $url := "" -}}
-{{- $provider := .Values.global.bucket.provider | default .Values.global.defaultBucket.provider -}}
+{{- $path := "" -}}
+{{- $provider := "" -}}
+{{- $accessKey := "" -}}
+{{- $secretKey := "" -}}
+{{- if .Values.global.bucket.name -}}
+{{- $provider = .Values.global.bucket.provider -}}
+{{- $path = .Values.global.bucket.path -}}
+{{- $accessKey = default "" .Values.global.bucket.accessKey -}}
+{{- $secretKey = default "" .Values.global.bucket.secretKey -}}
+name: {{ .Values.global.bucket.name }}
+region: {{ .Values.global.bucket.region }}
+kmsKey: {{ .Values.global.bucket.kmsKey }}
+{{- else -}}
+{{- $provider = .Values.global.defaultBucket.provider -}}
+{{- $path = .Values.global.defaultBucket.path -}}
+{{- $accessKey = default "" .Values.global.defaultBucket.accessKey -}}
+{{- $secretKey = default "" .Values.global.defaultBucket.secretKey -}}
+name: {{ .Values.global.defaultBucket.name }}
+region: {{ .Values.global.defaultBucket.region }}
+kmsKey: {{ .Values.global.defaultBucket.kmsKey }}
+{{- end }}
 provider: {{ $provider }}
-{{- $name := .Values.global.bucket.name | default .Values.global.defaultBucket.name }}
-name: {{ $name }}
-{{- $path := .Values.global.bucket.path | default .Values.global.defaultBucket.path }}
 path: {{ $path }}
-region: {{ .Values.global.bucket.region | default .Values.global.defaultBucket.region }}
-kmsKey: {{ .Values.global.bucket.kmsKey | default .Values.global.defaultBucket.kmsKey }}
-{{- $accessKey := default "" (.Values.global.bucket.accessKey | default .Values.global.defaultBucket.accessKey) }}
 accessKey: {{ $accessKey }}
-{{- $secretKey := default "" (.Values.global.bucket.secretKey | default .Values.global.defaultBucket.secretKey) }}
 secretKey: {{ $secretKey }}
 accessKeyName: {{ .Values.global.bucket.secret.accessKeyName }}
 secretKeyName: {{ .Values.global.bucket.secret.secretKeyName }}

charts/operator-wandb/templates/gorilla.yaml

@@ -53,30 +53,26 @@ data:
   {{- if .Values.extraCors }}
   GORILLA_CORS_ORIGINS: "{{ join "," .Values.extraCors }}"
   {{- end }}
-  GORILLA_SWEEP_PROVIDER: "{{ .Values.global.sweepProvider | default (printf "http://127.0.0.1:8082") }}"
+  GORILLA_SWEEP_PROVIDER: "{{ .Values.global.sweepProvider | default (printf "http://%s-app:8082" .Release.Name) }}"
+  WANDB_BASE_URL: "{{ .Values.global.baseUrl | default (printf "http://%s-app:8081" .Release.Name) }}"
   GORILLA_VIEW_SPEC_UPDATER_EXECUTABLE: "/usr/local/bin/view-spec-updater-linux"
   GORILLA_LIMITER: "noop://"
   GORILLA_PARQUET_RPC_PATH: "/_goRPC_"
   GORILLA_SCHEMA_FILE: "/schema.graphql"
   GORILLA_PORT: "8081"
   GORILLA_ACTIVITY_STORE_ENABLE: "true"
-  GORILLA_RUN_STORE_ONPREM_MIGRATE_DISABLE_READS: "false"
   GORILLA_GLUE_TASK_STORE: "memory://"
   GORILLA_COLLECT_AUDIT_LOGS: "true"
   GORILLA_USE_PARQUET_HISTORY_STORE: "true"
   GORILLA_PARQUET_PORT: "8087"
   GORILLA_RUN_UPDATE_QUEUE_ADDR: "internal://"
-  GORILLA_RUN_STORE_ONPREM_MIGRATE_CREATE_RUN_STORE: "true"
-  GORILLA_RUN_STORE_ONPREM_MIGRATE_CREATE_RUN_TABLES: "true"
-  GORILLA_RUN_STORE_ONPREM_MIGRATE_FLAT_RUNS_MIGRATOR: "true"
   GORILLA_FILE_STORE_IS_PROXIED: "false"
   GORILLA_ACTIVITY_STORE_SERVE: "true"
   GORILLA_GLUE_TASK_CONFIG_PATH: "/gorilla_glue_tasks_local.yaml"
   GORILLA_ONPREM: "true"
   GORILLA_STATSD_PORT: "8125"
   GORILLA_ACTIVITY_STORE_BACKFILL_ENABLE: "true"
   GORILLA_ARTIFACT_GC_ENABLED: "false"
-  GORILLA_RUN_STORE_ONPREM_MIGRATE_SHADOW_RUN_UPDATES: "true"
   GORILLA_GLUE_TASK_PROVIDER: "memory://"
   GORILLA_DEFAULT_REGION: "minio-local"
   {{- if .Values.global.executor.enabled }}

charts/operator-wandb/values.yaml

@@ -785,10 +785,10 @@ api:
         failureThreshold: 5
       resources:
         limits:
-          cpu: "2"
-          memory: 4Gi
+          cpu: "4"
+          memory: 8Gi
         requests:
-          cpu: "1"
+          cpu: 500m
           memory: 1Gi
       volumeMounts:
         - name: wandb-ca-certs