From 204568a8eb5ff300a1856ef8d471eb0bc5669360 Mon Sep 17 00:00:00 2001
From: Whyeasy <Whyeasy@users.noreply.github.com>
Date: Mon, 21 Sep 2020 12:46:07 +0200
Subject: [PATCH] Change list creation memberlist.

---
 charts/distributed-loki/Chart.yaml                    |  2 +-
 charts/distributed-loki/README.md                     |  2 +-
 charts/distributed-loki/templates/config/loki-cm.yaml | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/charts/distributed-loki/Chart.yaml b/charts/distributed-loki/Chart.yaml
index 4d0287b..06f5fcc 100644
--- a/charts/distributed-loki/Chart.yaml
+++ b/charts/distributed-loki/Chart.yaml
@@ -3,5 +3,5 @@ name: loki-distributed
 description: A Helm chart for Kubernetes
 type: application
 
-version: 0.3.5
+version: 0.3.6
 appVersion: 1.6.0
diff --git a/charts/distributed-loki/README.md b/charts/distributed-loki/README.md
index fab5f13..e7b27a5 100644
--- a/charts/distributed-loki/README.md
+++ b/charts/distributed-loki/README.md
@@ -2,7 +2,7 @@ loki-distributed
 ================
 A Helm chart for Kubernetes
 
-Current chart version is `0.3.5`
+Current chart version is `0.3.6`
 
 
 
diff --git a/charts/distributed-loki/templates/config/loki-cm.yaml b/charts/distributed-loki/templates/config/loki-cm.yaml
index a55dc24..b5fc4b1 100644
--- a/charts/distributed-loki/templates/config/loki-cm.yaml
+++ b/charts/distributed-loki/templates/config/loki-cm.yaml
@@ -21,14 +21,15 @@ data:
                 host: {{ include "loki-helm.memcached-index-writes" . }}.{{ .Release.Namespace }}.svc.cluster.local
                 service: memcached-client
 
+    {{ if .Values.memberlist.enable }}
     memberlist:
         rejoin_interval: {{ .Values.memberlist.rejoin }}
         bind_port: {{ .Values.memberlist.port }}
-        join_members: [
-            {{ include "loki-helm.distributor" . }}
-            {{ include "loki-helm.ingester" . }}
-            {{ include "loki-helm.querier" . }}
-        ]
+        join_members:
+            - {{ include "loki-helm.distributor" . }}
+            - {{ include "loki-helm.ingester" . }}
+            - {{ include "loki-helm.querier" . }}
+    {{ end }}
 
     distributor:
         ring: