From b10dfdecc9647d515756f9a19dd67b4cb9f4f862 Mon Sep 17 00:00:00 2001 From: Mark Burnett Date: Fri, 19 Jan 2018 14:09:54 -0600 Subject: [PATCH] Add general env configuration to Armada API This is primarly intended for use to configure proxy settings. Change-Id: Iec0051f96b01083c602d230cca5c1a4711bee2c1 --- charts/armada/templates/deployment-api.yaml | 7 +++++++ charts/armada/values.yaml | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml index f9f226a0..b8f2e337 100644 --- a/charts/armada/templates/deployment-api.yaml +++ b/charts/armada/templates/deployment-api.yaml @@ -50,6 +50,13 @@ spec: image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} + {{- if .Values.pod.env.armada_api }} + env: + {{- range .Values.pod.env.armada_api }} + - name: {{ .name | quote }} + value: {{ .value | quote }} + {{- end }} + {{- end }} securityContext: runAsUser: {{ .Values.pod.user.armada.uid }} ports: diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml index 6ea7aba0..9580b1af 100644 --- a/charts/armada/values.yaml +++ b/charts/armada/values.yaml @@ -155,6 +155,20 @@ conf: tiller:get_released: "rule:admin_required" pod: + env: + armada_api: +# - name: http_proxy +# value: http://proxy.example.com:8080 +# - name: https_proxy +# value: http://proxy.example.com:8080 +# - name: no_proxy +# value: 10.96.0.1 +# - name: HTTP_PROXY +# value: http://proxy.example.com:8080 +# - name: HTTPS_PROXY +# value: http://proxy.example.com:8080 +# - name: NO_PROXY +# value: 10.96.0.1 mounts: armada_api: init_container: null