From b2f720d33515d2308c558d927722e197163efc3e Mon Sep 17 00:00:00 2001 From: Vignesh Subramanian Date: Wed, 12 Aug 2020 19:01:45 +0530 Subject: [PATCH] [stable/logstash] Added envFrom support to logstash container (#23416) Signed-off-by: Vignesh Subramanian --- stable/logstash/Chart.yaml | 2 +- stable/logstash/README.md | 1 + stable/logstash/templates/statefulset.yaml | 4 ++++ stable/logstash/values.yaml | 6 ++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/stable/logstash/Chart.yaml b/stable/logstash/Chart.yaml index 6309d4035a01..1e849c1b60fd 100644 --- 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 index 1bcd3624beb6..8aaad95e485f 100644 --- 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 index df169c275b59..dc485065f53c 100644 --- 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 index 695b6b1baf24..3e2c9b8d470e 100644 --- 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