From 7f78328de98fbdd82b200aeaa1ce0c7b207d8e3c Mon Sep 17 00:00:00 2001 From: Zachary Blasczyk <77289967+zacharyblasczyk@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:44:01 -0600 Subject: [PATCH] feat: Adding console proxy config (#355) --- charts/operator-wandb/Chart.yaml | 2 +- .../charts/console/templates/deployment.yaml | 20 +++++++++++++++++++ .../operator-wandb/charts/console/values.yaml | 6 ++++++ charts/operator-wandb/values.yaml | 5 +++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 08810522..e1743049 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.27.0 +version: 0.28.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..b7f288d4 100644 --- a/charts/operator-wandb/charts/console/templates/deployment.yaml +++ b/charts/operator-wandb/charts/console/templates/deployment.yaml @@ -74,6 +74,26 @@ 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 }} + {{- if .Values.proxy.debug }} + - name: PROXY_DEBUG + value: {{ .Values.proxy.debug | 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..354de614 100644 --- a/charts/operator-wandb/charts/console/values.yaml +++ b/charts/operator-wandb/charts/console/values.yaml @@ -3,6 +3,12 @@ enabled: true nameOverride: "" fullnameOverride: "" +proxy: + httpProxy: "" + httpsProxy: "" + noProxy: "" + debug: false + image: repository: wandb/console tag: latest diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml index 9df8a152..4ccf8e7e 100644 --- a/charts/operator-wandb/values.yaml +++ b/charts/operator-wandb/values.yaml @@ -292,6 +292,11 @@ console: image: repository: wandb/console tag: latest + proxy: + httpProxy: "" + httpsProxy: "" + noProxy: "" + debug: false 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