From a137f123af24cd99bbc145ef167a85e2d46f1a27 Mon Sep 17 00:00:00 2001 From: CharlieC3 Date: Thu, 20 Sep 2018 18:33:55 -0400 Subject: [PATCH] logstash: Adding volumes configuration property for Logstash statefulset (#7778) * [incubator/logstash] Adding volumes configuration property for Logstash statefulset Signed-off-by: Charles Cantoni * [incubator/logstash] volumes property should be under spec, not spec.containers Signed-off-by: Charles Cantoni * Updating Volumes YAML syntax to match that of others. Signed-off-by: Charles Cantoni --- incubator/logstash/Chart.yaml | 2 +- incubator/logstash/README.md | 1 + incubator/logstash/templates/statefulset.yaml | 4 ++++ incubator/logstash/values.yaml | 11 +++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/incubator/logstash/Chart.yaml b/incubator/logstash/Chart.yaml index c0e326d9e2..61478aa13b 100644 --- a/incubator/logstash/Chart.yaml +++ b/incubator/logstash/Chart.yaml @@ -3,7 +3,7 @@ description: Logstash is an open source, server-side data processing pipeline icon: https://www.elastic.co/assets/blt86e4472872eed314/logo-elastic-logstash-lt.svg home: https://www.elastic.co/products/logstash name: logstash -version: 0.9.0 +version: 0.9.1 appVersion: 6.4.0 sources: - https://www.docker.elastic.co diff --git a/incubator/logstash/README.md b/incubator/logstash/README.md index e8ba6e2fa0..c848301909 100644 --- a/incubator/logstash/README.md +++ b/incubator/logstash/README.md @@ -100,6 +100,7 @@ The following table lists the configurable parameters of the chart and its defau | `persistence.accessMode` | Access mode for PVCs | `ReadWriteOnce` | | `persistence.size` | Size for PVCs | `2Gi` | | `volumeMounts` | Volume mounts to configure for logstash container | (see `values.yaml`) | +| `volumes` | Volumes to configure for logstash container | [] | | `terminationGracePeriodSeconds` | Duration the pod needs to terminate gracefully | `30` | `exporter.logstash` | Prometheus logstash-exporter settings | (see `values.yaml`) | | `exporter.logstash.enabled` | Enables Prometheus logstash-exporter | `false` | diff --git a/incubator/logstash/templates/statefulset.yaml b/incubator/logstash/templates/statefulset.yaml index 95da1e0588..af4484ed33 100644 --- a/incubator/logstash/templates/statefulset.yaml +++ b/incubator/logstash/templates/statefulset.yaml @@ -110,6 +110,10 @@ spec: {{ toYaml .Values.exporter.logstash.resources | indent 12 }} {{- end }} + {{- with .Values.volumes }} + volumes: +{{ toYaml . | indent 8 }} + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} diff --git a/incubator/logstash/values.yaml b/incubator/logstash/values.yaml index 4e3b279058..a7f04d181f 100644 --- a/incubator/logstash/values.yaml +++ b/incubator/logstash/values.yaml @@ -143,6 +143,17 @@ volumeMounts: - name: pipeline mountPath: /usr/share/logstash/pipeline +volumes: [] + # - name: tls + # secret: + # secretName: logstash-tls + # - name: pipeline + # configMap: + # name: logstash-pipeline + # - name: certs + # hostPath: + # path: /tmp + exporter: logstash: enabled: false