From 4ad585eac95ad75441cb466cbfe9f77c4e32e412 Mon Sep 17 00:00:00 2001
From: Zachary Blasczyk <zachary.blasczyk@wandb.com>
Date: Thu, 27 Feb 2025 11:33:48 -0600
Subject: [PATCH] feat: Adding console proxy config

---
 charts/operator-wandb/Chart.yaml                 |  2 +-
 .../charts/console/templates/deployment.yaml     | 16 ++++++++++++++++
 charts/operator-wandb/charts/console/values.yaml |  5 +++++
 charts/operator-wandb/values.yaml                |  4 ++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml
index 47a2aa98..af886107 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.26.9
+version: 0.27.0
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 
diff --git a/charts/operator-wandb/charts/console/templates/deployment.yaml b/charts/operator-wandb/charts/console/templates/deployment.yaml
index 3418b8fb..75874c0c 100644
--- a/charts/operator-wandb/charts/console/templates/deployment.yaml
+++ b/charts/operator-wandb/charts/console/templates/deployment.yaml
@@ -74,6 +74,22 @@ spec:
                 fieldRef:
                   fieldPath: status.hostIP
 
+            # Optional HTTP proxy configuration
+            {{- if .Values.proxy }}
+            {{- if .Values.proxy.httpProxy }}
+            - name: HTTP_PROXY
+              value: {{ .Values.proxy.httpProxy | quote }}
+            {{- end }}
+            {{- if .Values.proxy.httpsProxy }}
+            - name: HTTPS_PROXY
+              value: {{ .Values.proxy.httpsProxy | quote }}
+            {{- end }}
+            {{- if .Values.proxy.noProxy }}
+            - name: NO_PROXY
+              value: {{ .Values.proxy.noProxy | quote }}
+            {{- end }}
+            {{- end }}
+
             {{- include "console.extraEnv" (dict "global" .Values.global "local" .Values) | nindent 12 }}
             {{- include "wandb.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }}
           livenessProbe:
diff --git a/charts/operator-wandb/charts/console/values.yaml b/charts/operator-wandb/charts/console/values.yaml
index 9ca5c381..8d9bc7eb 100644
--- a/charts/operator-wandb/charts/console/values.yaml
+++ b/charts/operator-wandb/charts/console/values.yaml
@@ -3,6 +3,11 @@ enabled: true
 nameOverride: ""
 fullnameOverride: ""
 
+proxy:
+  httpProxy: ""
+  httpsProxy: ""
+  noProxy: ""
+
 image:
   repository: wandb/console
   tag: latest
diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
index 77ee97c5..626af3c9 100644
--- a/charts/operator-wandb/values.yaml
+++ b/charts/operator-wandb/values.yaml
@@ -281,6 +281,10 @@ console:
   image:
     repository: wandb/console
     tag: latest
+  proxy:
+    httpProxy: ""
+    httpsProxy: ""
+    noProxy: ""
   extraEnv:
     # This value is used to expose the IAM identity (of the app) to the user in console for
     # adding the correct cross account permissions