Merge df61c44 into 15c1c31

wandb · Feb 1, 2025 · e051166 · e051166
2 parents 15c1c31 + df61c44
commit e051166
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
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.4.0
+version: 0.4.1
 icon: https://wandb.ai/logo.svg
 
 maintainers:

diff --git a/charts/wandb-base/templates/service.yaml b/charts/wandb-base/templates/service.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.service.enabled }}
-{{- if .Values.global.createGCPLoadBalancerBackend }}
 {{- if eq .Values.global.cloudProvider "gcp" }}
 ---
 apiVersion: cloud.google.com/v1
@@ -9,9 +8,12 @@ metadata:
   labels:
     {{- include "wandb-base.labels" . | nindent 4 }}
 spec:
+  {{- if .Values.ingress.gcpSecurityPolicy }}
+  securityPolicy:
+    name: {{ .Values.ingress.gcpSecurityPolicy }}
+  {{- end }}
   timeoutSec: 120
 {{- end }}
-{{- end }}
 ---
 apiVersion: v1
 kind: Service

diff --git a/charts/wandb-base/values.yaml b/charts/wandb-base/values.yaml
@@ -176,6 +176,9 @@ service:
 
 # This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ingress:
+  # GCP only value: a CloudArmor policy to be attached to the gce LoadBalancer via a BackendConfig.
+  # https://cloud.google.com/kubernetes-engine/docs/how-to/ingress-configuration#cloud_armor
+  gcpSecurityPolicy: ""
   enabled: false
   className: ""
   annotations: