From cef08ecdbe59995a4e9fa76cfd7f37ecc8fd52c0 Mon Sep 17 00:00:00 2001
From: CharlieC3 <charles.cantoni@gmail.com>
Date: Thu, 27 Sep 2018 12:20:21 -0400
Subject: [PATCH] logstash: volumes fix (#8013)

* Consolidating volume blocks

Signed-off-by: Charles Cantoni <charles.cantoni@gmail.com>

* Version bump

Signed-off-by: Charles Cantoni <charles.cantoni@gmail.com>
---
 incubator/logstash/Chart.yaml                 | 2 +-
 incubator/logstash/templates/statefulset.yaml | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/incubator/logstash/Chart.yaml b/incubator/logstash/Chart.yaml
index cee4f5be8d..1002afab2f 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.2
+version: 0.9.3
 appVersion: 6.4.1
 sources:
 - https://www.docker.elastic.co
diff --git a/incubator/logstash/templates/statefulset.yaml b/incubator/logstash/templates/statefulset.yaml
index af4484ed33..8d8f10ac86 100644
--- a/incubator/logstash/templates/statefulset.yaml
+++ b/incubator/logstash/templates/statefulset.yaml
@@ -110,10 +110,6 @@ spec:
 {{ toYaml .Values.exporter.logstash.resources | indent 12 }}
 {{- end }}
 
-    {{- with .Values.volumes }}
-      volumes:
-{{ toYaml . | indent 8 }}
-    {{- end }}
     {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
@@ -134,6 +130,9 @@ spec:
         - name: pipeline
           configMap:
             name: {{ template "logstash.fullname" . }}-pipeline
+    {{- with .Values.volumes }}
+{{ toYaml . | indent 8 }}
+    {{- end }}
 {{- if not .Values.persistence.enabled }}
         - name: data
           emptyDir: {}