Change memberlist approach for members.

Whyeasy · Sep 21, 2020 · 323677e · 323677e
1 parent b79714d
commit 323677e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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