From 08e3972d0f153dc3a6885960346301c574c46900 Mon Sep 17 00:00:00 2001 From: Chris Barton Date: Tue, 10 Mar 2020 17:19:48 -0700 Subject: [PATCH] [stable/graylog] Add support for sidecar containers There are cases when a sidecar container is appropriate to run with the Graylog server. One such use case is mounting a FUSE backend for enterprise archives Signed-off-by: Chris Barton --- stable/graylog/Chart.yaml | 2 +- stable/graylog/README.md | 1 + stable/graylog/templates/statefulset.yaml | 3 +++ stable/graylog/values.yaml | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/stable/graylog/Chart.yaml b/stable/graylog/Chart.yaml index 4dc672aefb17..0f9bfd2d913b 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.1 +version: 1.6.2 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 60c631998c8a..e9869a9d4db0 100644 --- a/stable/graylog/README.md +++ b/stable/graylog/README.md @@ -168,6 +168,7 @@ The following table lists the configurable parameters of the Graylog chart and t | `graylog.provisioner.enabled` | Enable optional Job to run an arbitrary Bash script | `false` | | `graylog.provisioner.useGraylogServiceAccount` | Use the same ServiceAccount used by Graylog pod | `false` | | `graylog.provisioner.script` | The contents of the provisioner Bash script | `` | +| `graylog.sidecarContainers` | Sidecar containers to run in the server statefulset | `[]` | | `graylog.extraVolumeMounts` | Additional Volume mounts | `[]` | | `graylog.extraVolumes` | Additional Volumes | `[]` | | `graylog.extraInitContainers` | Additional Init containers | `[]` | diff --git a/stable/graylog/templates/statefulset.yaml b/stable/graylog/templates/statefulset.yaml index d1bfd411440d..312592eeb358 100644 --- a/stable/graylog/templates/statefulset.yaml +++ b/stable/graylog/templates/statefulset.yaml @@ -200,6 +200,9 @@ spec: -u "{{ .Values.graylog.rootUsername }}:${GRAYLOG_PASSWORD_SECRET}" \ -H "X-Requested-By: {{ template "graylog.fullname" . }}" \ {{ template "graylog.formatUrl" (list . "localhost:9000/api/system/shutdown/shutdown") }} + {{- if .Values.graylog.sidecarContainers }} + {{ toYaml .Values.graylog.sidecarContainers | nindent 8 }} + {{- end }} terminationGracePeriodSeconds: {{ default 30 .Values.graylog.terminationGracePeriodSeconds }} volumes: - name: config diff --git a/stable/graylog/values.yaml b/stable/graylog/values.yaml index 34184936ff42..65b6bc09e911 100644 --- a/stable/graylog/values.yaml +++ b/stable/graylog/values.yaml @@ -114,6 +114,10 @@ graylog: # - name: graylog-plugin-auth-sso-3.0.0.jar # url: https://github.com/Graylog2/graylog-plugin-auth-sso/releases/download/3.0.0/graylog-plugin-auth-sso-3.0.0.jar + ## Sidecar containers + ## + sidecarContainers: [] + ## Additional init containers ## extraInitContainers: []