MINOR: haproxy: Adds envFrom to Deployment and Deamonset (#252)

* Add envFrom to the HA deployment * Add envFrom to the HA daemonset * Update the description
haproxytech · Aug 7, 2024 · e568719 · e568719
1 parent fb8af0e
commit e568719
Show file tree

Hide file tree

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

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

diff --git a/haproxy/values.yaml b/haproxy/values.yaml
@@ -197,6 +197,13 @@ extraEnvs: []
 #     fieldRef:
 #       fieldPath: status.podIP
 
+## Use envFrom to add env vars from a secret or configmap to the HA Proxy 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
+
 ## Additional volumeMounts to the controller main container
 extraVolumeMounts: []
 ## Example empty volume mounts when using securityContext->readOnlyRootFilesystem