From 323677e2fa2189f6015141e0b9641e9061e145c5 Mon Sep 17 00:00:00 2001
From: Whyeasy <Whyeasy@users.noreply.github.com>
Date: Mon, 21 Sep 2020 12:07:27 +0200
Subject: [PATCH] Change memberlist approach for members.

---
 charts/distributed-loki/Chart.yaml                           | 2 +-
 charts/distributed-loki/README.md                            | 2 +-
 charts/distributed-loki/templates/config/loki-cm.yaml        | 4 +++-
 .../templates/distributor/distributor-svc.yaml               | 5 +++++
 charts/distributed-loki/templates/ingester/ingester-svc.yaml | 5 +++++
 charts/distributed-loki/templates/querier/querier-svc.yaml   | 5 +++++
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/charts/distributed-loki/Chart.yaml b/charts/distributed-loki/Chart.yaml
index 86932cc..4d0287b 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.4
+version: 0.3.5
 appVersion: 1.6.0
diff --git a/charts/distributed-loki/README.md b/charts/distributed-loki/README.md
index a9ee593..fab5f13 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.4`
+Current chart version is `0.3.5`
 
 
 
diff --git a/charts/distributed-loki/templates/config/loki-cm.yaml b/charts/distributed-loki/templates/config/loki-cm.yaml
index 779aff4..a55dc24 100644
--- a/charts/distributed-loki/templates/config/loki-cm.yaml
+++ b/charts/distributed-loki/templates/config/loki-cm.yaml
@@ -25,7 +25,9 @@ data:
         rejoin_interval: {{ .Values.memberlist.rejoin }}
         bind_port: {{ .Values.memberlist.port }}
         join_members: [
-            {{ include "loki-helm.fullname" . }}-memberlist
+            {{ include "loki-helm.distributor" . }}
+            {{ include "loki-helm.ingester" . }}
+            {{ include "loki-helm.querier" . }}
         ]
 
     distributor:
diff --git a/charts/distributed-loki/templates/distributor/distributor-svc.yaml b/charts/distributed-loki/templates/distributor/distributor-svc.yaml
index 45ffb67..4c52222 100644
--- a/charts/distributed-loki/templates/distributor/distributor-svc.yaml
+++ b/charts/distributed-loki/templates/distributor/distributor-svc.yaml
@@ -13,5 +13,10 @@ spec:
   - name: distributor-grpc
     port: 9095
     targetPort: 9095
+  {{- if .Values.memberlist.enable }}
+  - name: distributor-memberlist
+    port: {{ .Values.memberlist.port}}
+    targetPort: {{ .Values.memberlist.port}}
+  {{- end }}
   selector: {{- include "loki-helm.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: distributor
diff --git a/charts/distributed-loki/templates/ingester/ingester-svc.yaml b/charts/distributed-loki/templates/ingester/ingester-svc.yaml
index 3659d0f..0079aac 100644
--- a/charts/distributed-loki/templates/ingester/ingester-svc.yaml
+++ b/charts/distributed-loki/templates/ingester/ingester-svc.yaml
@@ -13,5 +13,10 @@ spec:
   - name: ingester-grpc
     port: 9095
     targetPort: 9095
+  {{- if .Values.memberlist.enable }}
+  - name: ingester-memberlist
+    port: {{ .Values.memberlist.port}}
+    targetPort: {{ .Values.memberlist.port}}
+  {{- end }}
   selector: {{- include "loki-helm.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: ingester
diff --git a/charts/distributed-loki/templates/querier/querier-svc.yaml b/charts/distributed-loki/templates/querier/querier-svc.yaml
index 3e9d6bd..cec319e 100644
--- a/charts/distributed-loki/templates/querier/querier-svc.yaml
+++ b/charts/distributed-loki/templates/querier/querier-svc.yaml
@@ -13,5 +13,10 @@ spec:
   - name: querier-grpc
     port: 9095
     targetPort: 9095
+  {{- if .Values.memberlist.enable }}
+  - name: querier-memberlist
+    port: {{ .Values.memberlist.port}}
+    targetPort: {{ .Values.memberlist.port}}
+  {{- end }}
   selector: {{- include "loki-helm.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: querier