[stable/graylog] extra init containers/volumes support (helm#19681)

* Add extra volumes and mounts support to graylog Adds `graylog.extraVolumes` and `graylog.extraVolumeMounts` as values to allow extra files to be mounted into the container for use at runtime. Signed-off-by: Chris Barton <chris.barton@recurly.com> * Add extra init containers to graylog Add the `graylog.extraInitContainers` value to extend the stateful set with additional init containers Signed-off-by: Chris Barton <chris.barton@recurly.com> * bump graylog to 1.5.0 Signed-off-by: Chris Barton <chris.barton@recurly.com>
mced · Dec 26, 2019 · 6ee3deb · 6ee3deb
1 parent 2824c3e
commit 6ee3deb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git 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.4.1
+version: 1.5.0
 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
@@ -143,6 +143,9 @@ The following table lists the configurable parameters of the Graylog chart and t
 | `graylog.init.resources`                | Configure resource requests and limits for the Graylog StatefulSet initContainer                                                                      | `{}`                                  |
 | `graylog.provisioner.enabled`           | Enable optional Job to run an arbitrary Bash script                                                                                                   | `false`                               |
 | `graylog.provisioner.script`            | The contents of the provisioner Bash script                                                                                                           | ``                                    |
+| `graylog.extraVolumeMounts`             | Additional Volume mounts                                                                                                                              | `[]`                                  |
+| `graylog.extraVolumes`                  | Additional Volumes                                                                                                                                    | `[]`                                  |
+| `graylog.extraInitContainers`           | Additional Init containers                                                                                                                            | `[]`                                  |
 | `rbac.create`                           | If true, create & use RBAC resources                                                                                                                  | `true`                                |
 | `rbac.serviceAccount.create`            | If true, create the Graylog service account                                                                                                           | `true`                                |
 | `rbac.serviceAccount.name`              | Name of the server service account to use or create                                                                                                   | `{{ graylog.fullname }}`              |

diff --git a/stable/graylog/templates/statefulset.yaml b/stable/graylog/templates/statefulset.yaml
@@ -84,6 +84,9 @@ spec:
 {{- if .Values.graylog.init.resources }}
           resources:
 {{ toYaml .Values.graylog.init.resources | indent 12 }}
+{{- end }}
+{{- if .Values.graylog.extraInitContainers }}
+{{ toYaml .Values.graylog.extraInitContainers | indent 8 }}
 {{- end }}
       containers:
         - name: graylog-server
@@ -166,6 +169,9 @@ spec:
           {{- end }}
             - name: kubectl
               mountPath: /k8s
+          {{- if .Values.graylog.extraVolumeMounts }}
+          {{ toYaml .Values.graylog.extraVolumeMounts | nindent 12 }}
+          {{- end }}
           lifecycle:
             preStop:
               exec:
@@ -200,6 +206,9 @@ spec:
         {{- end }}
         - name: kubectl
           emptyDir: {}
+{{- if .Values.graylog.extraVolumes }}
+{{ toYaml .Values.graylog.extraVolumes | indent 8}}
+{{- end }}
 {{- if not .Values.graylog.persistence.enabled }}
         - name: journal
           emptyDir: {}

diff --git a/stable/graylog/values.yaml b/stable/graylog/values.yaml
@@ -96,6 +96,18 @@ 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
 
+  ## Additional init containers
+  ##
+  extraInitContainers: []
+
+  ## Additional volume mounts
+  ##
+  extraVolumeMounts: []
+
+  ## Additional volumes
+  ##
+  extraVolumes: []
+
   ## A service for Graylog web interface
   ##
   service: