From d271caf7d354adc8f48283171d49bfa755f6a86a Mon Sep 17 00:00:00 2001 From: Rodrigo Valerio Date: Tue, 19 May 2020 06:01:36 -0300 Subject: [PATCH] [stable/graylog] Adding option to define environment variables in raw yaml format (#22007) Signed-off-by: Rodrigo Valerio --- stable/graylog/Chart.yaml | 2 +- stable/graylog/README.md | 1 + stable/graylog/templates/statefulset.yaml | 5 +++++ stable/graylog/values.yaml | 9 +++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/stable/graylog/Chart.yaml b/stable/graylog/Chart.yaml index 0f9bfd2d91..43c51b6091 100755 --- a/stable/graylog/Chart.yaml +++ b/stable/graylog/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: graylog home: https://www.graylog.org -version: 1.6.2 +version: 1.6.3 appVersion: 3.1 description: Graylog is the centralized log management solution built to open standards for capturing, storing, and enabling real-time analysis of terabytes of machine data. keywords: diff --git a/stable/graylog/README.md b/stable/graylog/README.md index e9869a9d4d..b0ee13bd42 100644 --- a/stable/graylog/README.md +++ b/stable/graylog/README.md @@ -109,6 +109,7 @@ The following table lists the configurable parameters of the Graylog chart and t | `graylog.tolerations` | Graylog server tolerations | `[]` | | `graylog.nodeSelector` | Graylog server node selector | `{}` | | `graylog.env` | Graylog server env variables | `{}` | +| `graylog.envRaw` | Graylog server env variables in raw yaml format | `{}` | | `graylog.privileged` | Run as a privileged container | `false` | | `graylog.additionalJavaOpts` | Graylog service additional `JAVA_OPTS` | `` | | `graylog.service.type` | Kubernetes Service type | `ClusterIP` | diff --git a/stable/graylog/templates/statefulset.yaml b/stable/graylog/templates/statefulset.yaml index 312592eeb3..64eb5af92d 100644 --- a/stable/graylog/templates/statefulset.yaml +++ b/stable/graylog/templates/statefulset.yaml @@ -120,6 +120,11 @@ spec: - name: {{ $key }} value: {{ $value | quote }} {{- end }} + {{- if .Values.graylog.envRaw }} + {{- with .Values.graylog.envRaw }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- end }} securityContext: privileged: {{ .Values.graylog.privileged }} ports: diff --git a/stable/graylog/values.yaml b/stable/graylog/values.yaml index 65b6bc09e9..d9fff0c40b 100644 --- a/stable/graylog/values.yaml +++ b/stable/graylog/values.yaml @@ -55,6 +55,15 @@ graylog: ## env: {} + ## Additional environment variables in raw yaml format + ## - name: POD_IP + ## valueFrom: + ## fieldRef: + ## fieldPath: status.podIP + ## - name: SERVICE_8000_NAME + ## value: servicename + envRaw: {} + ## Run as privileged container ## privileged: false