Merge pull request #3208 from abenbachir/abderb/tempo-memberlistport

[tempo-distributed] Use memberlistBindPort instead of hardcoded values
grafana · Jul 15, 2024 · e7e0553 · e7e0553
2 parents 2e3e8fa + bd24d03
commit e7e0553
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.15.0
+version: 1.15.1
 appVersion: 2.5.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.15.0](https://img.shields.io/badge/Version-1.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
+![Version: 1.15.1](https://img.shields.io/badge/Version-1.15.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml
@@ -68,7 +68,7 @@ spec:
           ports:
             - containerPort: 3100
               name: http-metrics
-            - containerPort: 7946
+            - containerPort: {{ include "tempo.memberlistBindPort" . }}
               name: http-memberlist
           {{- with .Values.compactor.extraEnv }}
           env:

diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml
@@ -64,7 +64,7 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: distributor
           ports:
-            - containerPort: 7946
+            - containerPort: {{ include "tempo.memberlistBindPort" . }}
               name: http-memberlist
               protocol: TCP
             - containerPort: 3100

diff --git a/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml b/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml
@@ -10,9 +10,9 @@ spec:
   clusterIP: None
   ports:
     - name: gossip-ring
-      port: 7946
+      port: {{ include "tempo.memberlistBindPort" . }}
       protocol: TCP
-      targetPort: http-memberlist
+      targetPort: {{ include "tempo.memberlistBindPort" . }}
       {{- if .Values.tempo.memberlist.appProtocol }}
       appProtocol: {{ .Values.tempo.memberlist.appProtocol }}
       {{- end }}

diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
@@ -85,7 +85,7 @@ spec:
             - name: grpc
               containerPort: 9095
             - name: http-memberlist
-              containerPort: 7946
+              containerPort: {{ include "tempo.memberlistBindPort" . }}
             - name: http-metrics
               containerPort: 3100
           {{- with .Values.ingester.extraEnv }}

diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml
@@ -68,7 +68,7 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: querier
           ports:
-            - containerPort: 7946
+            - containerPort: {{ include "tempo.memberlistBindPort" . }}
               name: http-memberlist
               protocol: TCP
             - containerPort: 3100