Skip to content

Commit 5183eee

Browse files
MINOR: kubernetes-ingress: Add envFrom to Deployment and Deamonset (#256)
Analogous to #252, but for `kubernetes-ingress` chart.
1 parent 85e14b3 commit 5183eee

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

kubernetes-ingress/templates/controller-daemonset.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,10 @@ spec:
215215
{{- if .Values.controller.extraEnvs -}}
216216
{{- toYaml .Values.controller.extraEnvs | nindent 10 }}
217217
{{- end }}
218+
{{- with .Values.controller.extraEnvFrom }}
219+
envFrom:
220+
{{- toYaml . | trim | nindent 12 }}
221+
{{- end }}
218222
resources:
219223
{{- toYaml .Values.controller.resources | nindent 12 }}
220224
{{- if .Values.controller.lifecycle }}

kubernetes-ingress/templates/controller-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ spec:
208208
{{- if .Values.controller.extraEnvs -}}
209209
{{- toYaml .Values.controller.extraEnvs | nindent 10 }}
210210
{{- end }}
211+
{{- with .Values.controller.extraEnvFrom }}
212+
envFrom:
213+
{{- toYaml . | trim | nindent 12 }}
214+
{{- end }}
211215
resources:
212216
{{- toYaml .Values.controller.resources | nindent 12 }}
213217
{{- if .Values.controller.lifecycle }}

kubernetes-ingress/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,13 @@ controller:
521521
# - name: TZ
522522
# value: "Etc/UTC"
523523

524+
## Use envFrom to add env vars from a secret or ConfigMap to the HAProxy container
525+
## ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
526+
extraEnvFrom: []
527+
## Example passing the pod IP into a container
528+
# - configMapRef:
529+
# name: ha-env-config
530+
524531
## Add additional containers
525532
extraContainers: []
526533
## Example sidecar

0 commit comments

Comments
 (0)