From 100cc91598c7159557cbb4fcd0f2ad8a23e8611d Mon Sep 17 00:00:00 2001
From: rjaxin <rjaxin@users.noreply.github.com>
Date: Wed, 18 Apr 2018 14:09:00 -0600
Subject: [PATCH] [stable/neo4j] minor improvements to charts (#4880)

* changed values from empty dicts to empty arrays, added sidecars for replicas

* bump version

* addressing PR comments
---
 stable/neo4j/Chart.yaml                             |  2 +-
 stable/neo4j/templates/core-statefulset.yaml        |  4 ++--
 stable/neo4j/templates/readreplicas-deployment.yaml |  5 ++++-
 stable/neo4j/values.yaml                            | 11 ++++++++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/stable/neo4j/Chart.yaml b/stable/neo4j/Chart.yaml
index fbd3908532..a81175015c 100644
--- a/stable/neo4j/Chart.yaml
+++ b/stable/neo4j/Chart.yaml
@@ -1,6 +1,6 @@
 name: neo4j
 home: https://www.neo4j.com
-version: 0.7.0
+version: 0.7.1
 appVersion: 3.2.3
 description: Neo4j is the world's leading graph database
 icon: http://info.neo4j.com/rs/773-GON-065/images/neo4j_logo.png
diff --git a/stable/neo4j/templates/core-statefulset.yaml b/stable/neo4j/templates/core-statefulset.yaml
index 28b197af89..138f138a80 100644
--- a/stable/neo4j/templates/core-statefulset.yaml
+++ b/stable/neo4j/templates/core-statefulset.yaml
@@ -84,7 +84,7 @@ spec:
         resources:
 {{ toYaml .Values.resources | indent 10 }}
 {{- if .Values.core.sidecarContainers }}
-{{ toYaml .Values.core.sidecarContainers | indent 6}}
+{{ toYaml .Values.core.sidecarContainers | indent 6 }}
 {{- end }}
 {{- if .Values.imagePullSecret }}
       imagePullSecrets:
@@ -92,7 +92,7 @@ spec:
 {{- end -}}
 {{- if .Values.core.initContainers }}
       initContainers:
-{{ toYaml .Values.core.initContainers | indent 6}}
+{{ toYaml .Values.core.initContainers | indent 6 }}
 {{- end }}
       volumes:
         - name: plugins
diff --git a/stable/neo4j/templates/readreplicas-deployment.yaml b/stable/neo4j/templates/readreplicas-deployment.yaml
index 82007914cf..161013f74d 100644
--- a/stable/neo4j/templates/readreplicas-deployment.yaml
+++ b/stable/neo4j/templates/readreplicas-deployment.yaml
@@ -66,9 +66,12 @@ spec:
           mountPath: /plugins
         securityContext:
           privileged: true
+{{- if .Values.core.sidecarContainers }}
+{{ toYaml .Values.core.sidecarContainers | indent 6 }}
+{{- end }}
 {{- if .Values.readReplica.initContainers }}
       initContainers:
-{{ toYaml .Values.readReplica.initContainers | indent 6}}
+{{ toYaml .Values.readReplica.initContainers | indent 6 }}
 {{- end }}
       volumes:
         - name: plugins
diff --git a/stable/neo4j/values.yaml b/stable/neo4j/values.yaml
index d639ac796e..161040412e 100644
--- a/stable/neo4j/values.yaml
+++ b/stable/neo4j/values.yaml
@@ -56,12 +56,12 @@ core:
   # - name: EXTRA_VAR_2
   #   value: extra-var-value-2
 
-  sidecarContainers: {}
+  sidecarContainers: []
   ## Additional containers to be added to the Neo4j core pod.
   #  - name: my-sidecar
   #    image: nginx:latest
 
-  initContainers: {}
+  initContainers: []
   ## init containers to run before the Neo4j core pod e.g. to install plugins
 
   # - name: init-plugins
@@ -88,7 +88,12 @@ readReplica:
   # - name: EXTRA_VAR_2
   #   value: extra-var-value-2
 
-  initContainers: {}
+  sidecarContainers: []
+  ## Additional containers to be added to the Neo4j replica pod.
+  #  - name: my-sidecar
+  #    image: nginx:latest
+
+  initContainers: []
   ## init containers to run before the Neo4j replica pod e.g. to install plugins
 
   # - name: init-plugins