From 254f214478dafc3dc6708ac2c9bbd1998b5ac687 Mon Sep 17 00:00:00 2001 From: Nisan Itzhakov Date: Sat, 22 Dec 2018 18:08:15 +0200 Subject: [PATCH] Added options to allow custom variables from secrets (#10221) Signed-off-by: Nisan Itzhakov --- stable/fluentd-elasticsearch/Chart.yaml | 2 +- stable/fluentd-elasticsearch/README.md | 1 + stable/fluentd-elasticsearch/templates/daemonset.yaml | 9 +++++++++ stable/fluentd-elasticsearch/values.yaml | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/stable/fluentd-elasticsearch/Chart.yaml b/stable/fluentd-elasticsearch/Chart.yaml index 205c1cbcaf..eddfd10e87 100644 --- a/stable/fluentd-elasticsearch/Chart.yaml +++ b/stable/fluentd-elasticsearch/Chart.yaml @@ -1,5 +1,5 @@ name: fluentd-elasticsearch -version: 2.0.1 +version: 2.0.2 appVersion: 2.3.2 home: https://www.fluentd.org/ description: A Fluentd Helm chart for Kubernetes with Elasticsearch output diff --git a/stable/fluentd-elasticsearch/README.md b/stable/fluentd-elasticsearch/README.md index b1a81b1a0b..3443179f3f 100644 --- a/stable/fluentd-elasticsearch/README.md +++ b/stable/fluentd-elasticsearch/README.md @@ -54,6 +54,7 @@ The following table lists the configurable parameters of the Fluentd elasticsear | `elasticsearch.buffer_queue_limit` | Elasticsearch buffer queue limit | `8` | | `elasticsearch.scheme` | Elasticsearch scheme setting | `http` | | `env` | List of environment variables that are added to the fluentd pods | `{}` | +| `secret` | List of environment variables that are set from secrets and added to the fluentd pods | `[]` | | `extraVolumeMounts` | Mount an extra volume, required to mount ssl certificates when elasticsearch has tls enabled | | | `extraVolume` | Extra volume | | | `image.repository` | Image | `gcr.io/google-containers/fluentd-elasticsearch` | diff --git a/stable/fluentd-elasticsearch/templates/daemonset.yaml b/stable/fluentd-elasticsearch/templates/daemonset.yaml index fdcd67e8cd..b0a67330f1 100644 --- a/stable/fluentd-elasticsearch/templates/daemonset.yaml +++ b/stable/fluentd-elasticsearch/templates/daemonset.yaml @@ -62,6 +62,15 @@ spec: value: {{ $value | quote }} {{- end }} {{- end }} + {{- if .Values.secret }} + {{- range $key, $value := .Values.secret }} + - name: {{ .name }} + valueFrom: + secretKeyRef: + name: {{ $value.secret_name }} + key: {{ $value.secret_key | quote }} + {{- end }} + {{- end }} - name: K8S_NODE_NAME valueFrom: fieldRef: diff --git a/stable/fluentd-elasticsearch/values.yaml b/stable/fluentd-elasticsearch/values.yaml index b0f5e794ce..510628262f 100644 --- a/stable/fluentd-elasticsearch/values.yaml +++ b/stable/fluentd-elasticsearch/values.yaml @@ -32,6 +32,12 @@ elasticsearch: env: # OUTPUT_USER: my_user +# If you want to add custom environment variables from secrets, use the secret list +secret: +# - name: ELASTICSEARCH_PASSWORD +# secret_name: elasticsearch +# secret_key: password + rbac: create: true