Merge "Support HTTP proxy in the Promenade API deployment"

This commit is contained in:
Scott Hussey 2018-01-08 16:56:39 -05:00 committed by Gerrit Code Review
commit 4efd5dde19
2 changed files with 21 additions and 0 deletions

View File

@ -46,6 +46,13 @@ spec:
command:
- /opt/promenade/entrypoint.sh
- server
{{- if .Values.pod.env.promenade_api }}
env:
{{- range .Values.pod.env.promenade_api }}
- name: {{ .name }}
value: {{ .value }}
{{- end }}
{{- end }}
ports:
- name: api-public
containerPort: {{ .Values.network.api.port }}

View File

@ -132,6 +132,20 @@ pod:
default: preferredDuringSchedulingIgnoredDuringExecution
topologyKey:
default: kubernetes.io/hostname
env:
promenade_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
replicas:
api: 1
lifecycle: