From 3000fc2b729497d4297ee4fd1f64ba7406a24e30 Mon Sep 17 00:00:00 2001 From: Endre Czirbesz Date: Wed, 19 Jun 2019 16:06:33 +0100 Subject: [PATCH] [stable/kibana] Enabling environment from secrets (#14854) * [stable/kibana] Enabling environment from secrets Signed-off-by: Endre Czirbesz * [stable/kibana] Fixing indentation Signed-off-by: Endre Czirbesz --- stable/kibana/Chart.yaml | 2 +- stable/kibana/README.md | 3 +++ stable/kibana/templates/deployment.yaml | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml index f726766810..daf0ece263 100644 --- a/stable/kibana/Chart.yaml +++ b/stable/kibana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: kibana -version: 3.0.0 +version: 3.1.0 appVersion: 6.7.0 description: Kibana is an open source data visualization plugin for Elasticsearch icon: https://raw.githubusercontent.com/elastic/kibana/master/src/ui/public/icons/kibana-color.svg diff --git a/stable/kibana/README.md b/stable/kibana/README.md index dbe510d20f..71c904d009 100644 --- a/stable/kibana/README.md +++ b/stable/kibana/README.md @@ -42,6 +42,9 @@ The following table lists the configurable parameters of the kibana chart and th | ------------------------------------------ | ---------------------------------------------------------------------- | ------------------------------------- | | `affinity` | node/pod affinities | None | | `env` | Environment variables to configure Kibana | `{}` | +| `envFromSecrets` | Environment variables from secrets to the cronjob container | {} | +| `envFromSecrets.*.from.secret` | - `secretKeyRef.name` used for environment variable | | +| `envFromSecrets.*.from.key` | - `secretKeyRef.key` used for environment variable | | | `files` | Kibana configuration files | None | | `livenessProbe.enabled` | livenessProbe to be enabled? | `false` | | `livenessProbe.path` | path for livenessProbe | `/status` | diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml index 33208eaa3c..5d11696036 100644 --- a/stable/kibana/templates/deployment.yaml +++ b/stable/kibana/templates/deployment.yaml @@ -140,6 +140,15 @@ spec: - name: "{{ $key }}" value: "{{ $value }}" {{- end }} +{{- if .Values.envFromSecrets }} + {{- range $key,$value := .Values.envFromSecrets }} + - name: {{ $key | upper | quote}} + valueFrom: + secretKeyRef: + name: {{ $value.from.secret | quote}} + key: {{ $value.from.key | quote}} + {{- end }} +{{- end }} {{- if (not .Values.authProxyEnabled) }} ports: - containerPort: {{ .Values.service.internalPort }}