Merge 171e1ef into f896d90

wandb · Jan 21, 2025 · 9c90283 · 9c90283
2 parents f896d90 + 171e1ef
commit 9c90283
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/charts/operator-wandb/Chart.lock b/charts/operator-wandb/Chart.lock
@@ -4,7 +4,7 @@ dependencies:
   version: 0.1.0
 - name: wandb-base
   repository: file://../wandb-base
-  version: 0.3.4
+  version: 0.4.0
 - name: console
   repository: file://charts/console
   version: 0.1.0
@@ -34,7 +34,7 @@ dependencies:
   version: 25.3.5
 - name: etcd
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 10.7.2
+  version: 10.7.3
 - name: bufstream
   repository: file://charts/bufstream
   version: 0.3.5
@@ -58,9 +58,9 @@ dependencies:
   version: 0.1.0
 - name: wandb-base
   repository: file://../wandb-base
-  version: 0.3.4
+  version: 0.4.0
 - name: wandb-base
   repository: file://../wandb-base
-  version: 0.3.4
-digest: sha256:98ce75756c091ccd2e7bfb092be88f84444f05e1493bc4adfc66208267a452dd
-generated: "2025-01-15T19:56:47.399339-06:00"
+  version: 0.4.0
+digest: sha256:d9e104084992aaca36330a56d4a5b825fd20f0bdf995070bf93f46a883375169
+generated: "2025-01-21T12:17:36.303852-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.23.9
+version: 0.24.0
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

diff --git a/charts/wandb-base/Chart.yaml b/charts/wandb-base/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: wandb-base
 description: A generic helm chart for deploying services to kubernetes
 type: application
-version: 0.3.4
+version: 0.4.0
 icon: https://wandb.ai/logo.svg
 
 maintainers:

diff --git a/charts/wandb-base/templates/service.yaml b/charts/wandb-base/templates/service.yaml
@@ -1,4 +1,18 @@
 {{- if .Values.service.enabled }}
+{{- if .Values.global.createGCPLoadBalancerBackend }}
+{{- if eq .Values.global.cloudProvider "gcp" }}
+---
+apiVersion: cloud.google.com/v1
+kind: BackendConfig
+metadata:
+  name: {{ include "wandb-base.fullname" . }}-backend-config
+  labels:
+    {{- include "wandb-base.labels" . | nindent 4 }}
+spec:
+  timeoutSec: 120
+{{- end }}
+{{- end }}
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -8,6 +22,10 @@ metadata:
   {{- if eq .Values.global.cloudProvider "aws" }}
   annotations:
     alb.ingress.kubernetes.io/healthcheck-path: /ready
+    {{- if and .Values.global.createGCPLoadBalancerBackend (eq .Values.global.cloudProvider "gcp") }}
+    cloud.google.com/neg: '{"ingress": true}'
+    cloud.google.com/backend-config: '{"default": "{{ $.Release.Name }}-app-backend-config"}'
+    {{- end }}
   {{- end }}
 spec:
   type: {{ .Values.service.type }}
@@ -17,4 +35,4 @@ spec:
     {{- end }}
   selector:
     {{- include "wandb-base.selectorLabels" . | nindent 4 }}
-  {{ end }}
+{{- end }}