From 5ef9a9a2540486a6da7bd815bd451959e6b70c74 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 6 Dec 2022 14:00:56 +0000 Subject: [PATCH] enable support for company proxy --- .../budibase/templates/app-service-deployment.yaml | 12 ++++++++++++ .../templates/worker-service-deployment.yaml | 12 ++++++++++++ charts/budibase/values.yaml | 3 +++ 3 files changed, 27 insertions(+) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index bf1b672d37..81e70c50ac 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -158,6 +158,18 @@ spec: - name: ELASTIC_APM_SERVER_URL value: {{ .Values.globals.elasticApmServerUrl | quote }} {{ end }} + {{ if .Values.globals.globalAgentHttpProxy }} + - name: GLOBAL_AGENT_HTTP_PROXY + value: {{ .Values.globals.globalAgentHttpProxy | quote }} + {{ end }} + {{ if .Values.globals.globalAgentHttpsProxy }} + - name: GLOBAL_AGENT_HTTPS_PROXY + value: {{ .Values.globals.globalAgentHttpsProxy | quote }} + {{ end }} + {{ if .Values.globals.globalAgentNoProxy }} + - name: GLOBAL_AGENT_NO_PROXY + value: {{ .Values.globals.globalAgentNoProxy | quote }} + {{ end }} - name: CDN_URL value: {{ .Values.globals.cdnUrl }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index df692a0723..bb79aab8d8 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -147,6 +147,18 @@ spec: - name: ELASTIC_APM_SERVER_URL value: {{ .Values.globals.elasticApmServerUrl | quote }} {{ end }} + {{ if .Values.globals.globalAgentHttpProxy }} + - name: GLOBAL_AGENT_HTTP_PROXY + value: {{ .Values.globals.globalAgentHttpProxy | quote }} + {{ end }} + {{ if .Values.globals.globalAgentHttpsProxy }} + - name: GLOBAL_AGENT_HTTPS_PROXY + value: {{ .Values.globals.globalAgentHttpsProxy | quote }} + {{ end }} + {{ if .Values.globals.globalAgentNoProxy }} + - name: GLOBAL_AGENT_NO_PROXY + value: {{ .Values.globals.globalAgentNoProxy | quote }} + {{ end }} - name: CDN_URL value: {{ .Values.globals.cdnUrl }} diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index a2a761aa86..3c788fbcc9 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -106,6 +106,9 @@ globals: # elasticApmEnabled: # elasticApmSecretToken: # elasticApmServerUrl: +# globalAgentHttpProxy: +# globalAgentHttpsProxy: +# globalAgentNoProxy: services: budibaseVersion: latest