[stable/logstash] Added envFrom support to logstash container (helm#2…

…3416) Signed-off-by: Vignesh Subramanian <[email protected]>
mmingorance-dh · Aug 12, 2020 · b2f720d · b2f720d
1 parent f42e3c4
commit b2f720d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/stable/logstash/Chart.yaml b/stable/logstash/Chart.yaml
@@ -3,7 +3,7 @@ description: Logstash is an open source, server-side data processing pipeline
 icon: https://www.elastic.co/assets/blt86e4472872eed314/logo-elastic-logstash-lt.svg
 home: https://www.elastic.co/products/logstash
 name: logstash
-version: 2.4.0
+version: 2.4.1
 appVersion: 7.1.1
 sources:
 - https://www.docker.elastic.co

diff --git a/stable/logstash/README.md b/stable/logstash/README.md
@@ -100,6 +100,7 @@ The following table lists the configurable parameters of the chart and its defau
 | `podAnnotations`                | Pod annotations                                    | `{}`                                             |
 | `podLabels`                     | Pod labels                                         | `{}`                                             |
 | `extraEnv`                      | Extra pod environment variables                    | `[]`                                             |
+| `envFrom`                       | Environment variables from configMaps & secrets    | `[]`                                             |
 | `extraContainers`               | Add additional containers                          | `[]`                                             |
 | `extraInitContainers`           | Add additional initContainers                      | `[]`                                             |
 | `podManagementPolicy`           | podManagementPolicy of the StatefulSet             | `OrderedReady`                                   |

diff --git a/stable/logstash/templates/statefulset.yaml b/stable/logstash/templates/statefulset.yaml
@@ -93,6 +93,10 @@ spec:
           {{- end }}
           {{- if .Values.extraEnv }}
 {{ .Values.extraEnv | toYaml | indent 12 }}
+          {{- end }}
+          {{- if .Values.envFrom }}
+          envFrom:
+{{ toYaml .Values.envFrom | indent 12 }}
           {{- end }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}

diff --git a/stable/logstash/values.yaml b/stable/logstash/values.yaml
@@ -119,6 +119,12 @@ podLabels: {}
 
 extraEnv: []
 
+envFrom: []
+  # - configMapRef:
+  #     name: configMap-name
+  # - secretRef:
+  #     name: secret-name
+
 extraInitContainers: []
   # - name: echo
   #   image: busybox