MINOR: kubernetes-ingress: Add envFrom to Deployment and Deamonset (#256

) Analogous to #252, but for `kubernetes-ingress` chart.
haproxytech · Aug 21, 2024 · 5183eee · 5183eee
1 parent 85e14b3
commit 5183eee
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/kubernetes-ingress/templates/controller-daemonset.yaml b/kubernetes-ingress/templates/controller-daemonset.yaml
@@ -215,6 +215,10 @@ spec:
           {{- if .Values.controller.extraEnvs -}}
           {{- toYaml .Values.controller.extraEnvs | nindent 10 }}
           {{- end }}
+          {{- with .Values.controller.extraEnvFrom }}
+          envFrom:
+            {{- toYaml . | trim | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.controller.resources | nindent 12 }}
           {{- if .Values.controller.lifecycle }}

diff --git a/kubernetes-ingress/templates/controller-deployment.yaml b/kubernetes-ingress/templates/controller-deployment.yaml
@@ -208,6 +208,10 @@ spec:
           {{- if .Values.controller.extraEnvs -}}
           {{- toYaml .Values.controller.extraEnvs | nindent 10 }}
           {{- end }}
+          {{- with .Values.controller.extraEnvFrom }}
+          envFrom:
+            {{- toYaml . | trim | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.controller.resources | nindent 12 }}
           {{- if .Values.controller.lifecycle }}

diff --git a/kubernetes-ingress/values.yaml b/kubernetes-ingress/values.yaml
@@ -521,6 +521,13 @@ controller:
     # - name: TZ
     #   value: "Etc/UTC"
 
+  ## Use envFrom to add env vars from a secret or ConfigMap to the HAProxy container
+  ## ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
+  extraEnvFrom: []
+  ## Example passing the pod IP into a container
+  #  - configMapRef:
+  #      name: ha-env-config
+
   ## Add additional containers
   extraContainers: []
     ## Example sidecar