From 844bb9a0fa06208aed691477d8b2fb73ff346d5e Mon Sep 17 00:00:00 2001
From: Daniel Barnes <dabarnes2b@gmail.com>
Date: Sat, 1 Feb 2025 12:46:35 +0900
Subject: [PATCH 1/3] init

---
 charts/wandb-base/templates/service.yaml | 6 ++++--
 charts/wandb-base/values.yaml            | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/charts/wandb-base/templates/service.yaml b/charts/wandb-base/templates/service.yaml
index 06bdded8..1016148c 100644
--- 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
index 0785c7f6..983c269f 100644
--- 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:

From df61c44c88d521dc7ee416cb4815a5c2b8f5054f Mon Sep 17 00:00:00 2001
From: Daniel Barnes <dabarnes2b@gmail.com>
Date: Sat, 1 Feb 2025 12:48:35 +0900
Subject: [PATCH 2/3] version bump

---
 charts/wandb-base/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/wandb-base/Chart.yaml b/charts/wandb-base/Chart.yaml
index dcd6f5cb..123cca94 100644
--- 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:

From 6f464b844f1865aef113ae2153499a2432e91efd Mon Sep 17 00:00:00 2001
From: Daniel Barnes <dabarnes2b@gmail.com>
Date: Tue, 4 Feb 2025 04:59:32 +0900
Subject: [PATCH 3/3] update to global option

---
 charts/wandb-base/templates/service.yaml | 4 ++--
 charts/wandb-base/values.yaml            | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/charts/wandb-base/templates/service.yaml b/charts/wandb-base/templates/service.yaml
index 1016148c..d825a0a5 100644
--- a/charts/wandb-base/templates/service.yaml
+++ b/charts/wandb-base/templates/service.yaml
@@ -8,9 +8,9 @@ metadata:
   labels:
     {{- include "wandb-base.labels" . | nindent 4 }}
 spec:
-  {{- if .Values.ingress.gcpSecurityPolicy }}
+  {{- if .Values.global.gcpSecurityPolicy }}
   securityPolicy:
-    name: {{ .Values.ingress.gcpSecurityPolicy }}
+    name: {{ .Values.global.gcpSecurityPolicy }}
   {{- end }}
   timeoutSec: 120
 {{- end }}
diff --git a/charts/wandb-base/values.yaml b/charts/wandb-base/values.yaml
index 983c269f..0785c7f6 100644
--- a/charts/wandb-base/values.yaml
+++ b/charts/wandb-base/values.yaml
@@ -176,9 +176,6 @@ 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: