From 1394135698fb12d3c8bfe013c66a5fae25b2e43d Mon Sep 17 00:00:00 2001 From: Daniel Barnes Date: Fri, 24 Jan 2025 04:44:41 +0900 Subject: [PATCH 1/5] fix: Switch between default bucket and bucket based on name (#324) --- charts/operator-wandb/Chart.yaml | 2 +- charts/operator-wandb/templates/_bucket.tpl | 29 +++++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 200a0faf..169aa421 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.24.0 +version: 0.24.1 appVersion: 1.0.0 icon: https://wandb.ai/logo.svg diff --git a/charts/operator-wandb/templates/_bucket.tpl b/charts/operator-wandb/templates/_bucket.tpl index 2905925b..b3ff01f8 100644 --- a/charts/operator-wandb/templates/_bucket.tpl +++ b/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 }} From c0621d375d68723b5ea22d029c56b24ee99380de Mon Sep 17 00:00:00 2001 From: Kent Ross Date: Thu, 23 Jan 2025 15:36:33 -0800 Subject: [PATCH 2/5] fix: pass a port number to glue that doesn't collide with nginx (#325) --- charts/operator-wandb/Chart.yaml | 2 +- charts/operator-wandb/charts/app/templates/deployment.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 169aa421..8da50a7c 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.24.1 +version: 0.24.2 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 index 596f78ea..f63b0202 100644 --- a/charts/operator-wandb/charts/app/templates/deployment.yaml +++ b/charts/operator-wandb/charts/app/templates/deployment.yaml @@ -115,6 +115,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: @@ -212,7 +214,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 }} From 1f2b56f8e982afda8691afc6f036ee25c32c6e57 Mon Sep 17 00:00:00 2001 From: Zachary Blasczyk <77289967+zacharyblasczyk@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:52:02 -0600 Subject: [PATCH 3/5] fix: Shadow queue hard coded variables (#327) --- charts/operator-wandb/Chart.lock | 2 +- charts/operator-wandb/Chart.yaml | 2 +- charts/operator-wandb/README.md | 2 +- charts/operator-wandb/templates/gorilla.yaml | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/charts/operator-wandb/Chart.lock b/charts/operator-wandb/Chart.lock index 1ab42d82..6c3c6465 100644 --- a/charts/operator-wandb/Chart.lock +++ b/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" diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 8da50a7c..bcfc171f 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.24.2 +version: 0.24.4 appVersion: 1.0.0 icon: https://wandb.ai/logo.svg diff --git a/charts/operator-wandb/README.md b/charts/operator-wandb/README.md index 714fa36b..b1c4155c 100644 --- a/charts/operator-wandb/README.md +++ b/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. diff --git a/charts/operator-wandb/templates/gorilla.yaml b/charts/operator-wandb/templates/gorilla.yaml index 5f8b6db4..47d76cf3 100644 --- a/charts/operator-wandb/templates/gorilla.yaml +++ b/charts/operator-wandb/templates/gorilla.yaml @@ -60,15 +60,11 @@ data: 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" @@ -76,7 +72,6 @@ data: 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 }} From cc6b00c4c84f4fc36231cf8b8d9f8e08cfeba10f Mon Sep 17 00:00:00 2001 From: Zachary Blasczyk <77289967+zacharyblasczyk@users.noreply.github.com> Date: Mon, 27 Jan 2025 19:25:08 -0600 Subject: [PATCH 4/5] fix: Use the same defaults (#328) --- charts/operator-wandb/Chart.yaml | 2 +- charts/operator-wandb/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index bcfc171f..4f7661f9 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.24.4 +version: 0.24.5 appVersion: 1.0.0 icon: https://wandb.ai/logo.svg diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml index fd56106d..a680ce02 100644 --- a/charts/operator-wandb/values.yaml +++ b/charts/operator-wandb/values.yaml @@ -783,10 +783,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 From a349502aef2f83fe983d25d8ead09c3989852152 Mon Sep 17 00:00:00 2001 From: Zachary Blasczyk <77289967+zacharyblasczyk@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:52:23 -0600 Subject: [PATCH 5/5] fix: Anaconda for sweeps (#329) --- charts/operator-wandb/Chart.yaml | 2 +- charts/operator-wandb/charts/app/templates/deployment.yaml | 5 +++++ charts/operator-wandb/charts/app/templates/service.yaml | 3 +++ charts/operator-wandb/templates/gorilla.yaml | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 4f7661f9..b3673887 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.24.5 +version: 0.24.6 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 index f63b0202..46d20846 100644 --- a/charts/operator-wandb/charts/app/templates/deployment.yaml +++ b/charts/operator-wandb/charts/app/templates/deployment.yaml @@ -90,6 +90,9 @@ spec: - name: prometheus containerPort: 8181 protocol: TCP + - name: anaconda + containerPort: 8082 + protocol: TCP - name: gorilla-statsd containerPort: 8125 protocol: TCP @@ -285,6 +288,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 diff --git a/charts/operator-wandb/charts/app/templates/service.yaml b/charts/operator-wandb/charts/app/templates/service.yaml index 17c91e70..26516e1a 100644 --- a/charts/operator-wandb/charts/app/templates/service.yaml +++ b/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 }} diff --git a/charts/operator-wandb/templates/gorilla.yaml b/charts/operator-wandb/templates/gorilla.yaml index 47d76cf3..68073690 100644 --- a/charts/operator-wandb/templates/gorilla.yaml +++ b/charts/operator-wandb/templates/gorilla.yaml @@ -53,7 +53,8 @@ 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_"