Update naming memberlist.

Remove ports from service.
Whyeasy · Sep 21, 2020 · b79714d · b79714d
1 parent 8dfd993
commit b79714d
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 21 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.3
+version: 0.3.4
 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.3`
+Current chart version is `0.3.4`
 
 
 

diff --git a/charts/distributed-loki/templates/config/loki-cm.yaml b/charts/distributed-loki/templates/config/loki-cm.yaml
@@ -25,7 +25,7 @@ data:
         rejoin_interval: {{ .Values.memberlist.rejoin }}
         bind_port: {{ .Values.memberlist.port }}
         join_members: [
-            {{ include "loki-helm.fullname" . }}-gossip-ring
+            {{ include "loki-helm.fullname" . }}-memberlist
         ]
 
     distributor:

diff --git a/charts/distributed-loki/templates/distributor/distributor-dpl.yaml b/charts/distributed-loki/templates/distributor/distributor-dpl.yaml
@@ -5,7 +5,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels: {{- include "loki-helm.labels" . | nindent 4 }}
     app.kubernetes.io/component: distributor
-    app.kubernetes.io/part-of: gossip-ring
 spec:
   minReadySeconds: 10
   replicas: {{ .Values.distributor.replicaCount }}

diff --git a/charts/distributed-loki/templates/distributor/distributor-svc.yaml b/charts/distributed-loki/templates/distributor/distributor-svc.yaml
@@ -13,10 +13,5 @@ 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-dpl.yaml b/charts/distributed-loki/templates/ingester/ingester-dpl.yaml
@@ -5,7 +5,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels: {{- include "loki-helm.labels" . | nindent 4 }}
     app.kubernetes.io/component: ingester
-    app.kubernetes.io/part-of: gossip-ring
 spec:
   minReadySeconds: 60
   replicas: {{ .Values.ingester.replicaCount }}

diff --git a/charts/distributed-loki/templates/ingester/ingester-svc.yaml b/charts/distributed-loki/templates/ingester/ingester-svc.yaml
@@ -13,10 +13,5 @@ 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-dpl.yaml b/charts/distributed-loki/templates/querier/querier-dpl.yaml
@@ -5,7 +5,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels: {{- include "loki-helm.labels" . | nindent 4 }}
     app.kubernetes.io/component: querier
-    app.kubernetes.io/part-of: gossip-ring
 spec:
   minReadySeconds: 10
   replicas: {{ .Values.querier.replicaCount }}

diff --git a/charts/distributed-loki/templates/querier/querier-svc.yaml b/charts/distributed-loki/templates/querier/querier-svc.yaml
@@ -13,10 +13,5 @@ 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