airship/armada
Code Issues Proposed changes

Merge "Add general env configuration to Armada API"

Browse Source
This commit is contained in:
Anthony Lin 2018-01-22 12:47:46 -05:00 committed by Gerrit Code Review
commit 15957e5bd3
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
charts/armada/templates/deployment-api.yaml
View File

@ -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:

14
charts/armada/values.yaml
View File

@ -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