From fb0bb5152cdcd45eade9ac1f7fd08cb390403a0f Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 19:47:53 +0330
Subject: [PATCH 01/16] Fixed gateway port config static issue and added probe
 parameters

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../templates/gateway/deployment-gateway.yaml        | 12 ++++++++++--
 .../templates/gateway/service-gateway.yaml           |  4 ++--
 charts/tempo-distributed/values.yaml                 |  6 +++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml
index ea6cd5dd34..bd90b42233 100644
--- a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml
+++ b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml
@@ -55,7 +55,7 @@ spec:
           image: "{{ include "tempo.imageReference" $dict }}"
           imagePullPolicy: {{ .Values.gateway.image.pullPolicy }}
           ports:
-            - name: http-metrics
+            - name: {{  .Values.gateway.service.name }}
               containerPort: 8080
               protocol: TCP
           {{- if or .Values.global.extraEnv .Values.gateway.extraEnv }}
@@ -72,7 +72,15 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           readinessProbe:
-            {{- toYaml .Values.gateway.readinessProbe | nindent 12 }}
+            httpGet:
+              path: {{ .Values.gateway.path }}
+              port: {{ .Values.gateway.service.name }}
+              scheme: HTTP
+            initialDelaySeconds: {{ .Values.gateway.service.initialDelaySeconds }}
+            timeoutSeconds: {{ .Values.gateway.service.timeoutSeconds }}
+            periodSeconds: {{ .Values.gateway.service.periodSeconds }}
+            successThreshold: {{ .Values.gateway.service.successThreshold }}
+            failureThreshold: {{ .Values.gateway.service.failureThreshold }}
           volumeMounts:
             - name: config
               mountPath: /etc/nginx
diff --git a/charts/tempo-distributed/templates/gateway/service-gateway.yaml b/charts/tempo-distributed/templates/gateway/service-gateway.yaml
index 97efb6fd19..88e67d603d 100644
--- a/charts/tempo-distributed/templates/gateway/service-gateway.yaml
+++ b/charts/tempo-distributed/templates/gateway/service-gateway.yaml
@@ -22,9 +22,9 @@ spec:
   loadBalancerIP: {{ .Values.gateway.service.loadBalancerIP }}
   {{- end }}
   ports:
-    - name: http-metrics
+    - name: {{ .Values.gateway.service.name }}
       port: {{ .Values.gateway.service.port }}
-      targetPort: http-metrics
+      targetPort: 8080
       {{- if and (eq "NodePort" .Values.gateway.service.type) .Values.gateway.service.nodePort }}
       nodePort: {{ .Values.gateway.service.nodePort }}
       {{- end }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 9d9bdde4b8..37abd0313e 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -1903,6 +1903,8 @@ gateway:
   tolerations: []
   # Gateway service configuration
   service:
+    # -- Port Name of the gateway service
+    name: http-gateway
     # -- Port of the gateway service
     port: 80
     # -- Type of the gateway service
@@ -1960,9 +1962,11 @@ gateway:
   readinessProbe:
     httpGet:
       path: /
-      port: http-metrics
     initialDelaySeconds: 15
     timeoutSeconds: 1
+    periodSeconds: 10
+    successThreshold: 1
+    failureThreshold: 3
   nginxConfig:
     # -- NGINX log format
     logFormat: |-

From 05e7d61a88ccbc3b02464b3065476c10d7dfacbc Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 19:48:19 +0330
Subject: [PATCH 02/16] Bumped version

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 charts/tempo-distributed/Chart.yaml | 2 +-
 charts/tempo-distributed/README.md  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 133401e1cc..6f8541f3b8 100644
--- 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.28.0
+version: 1.28.1
 appVersion: 2.6.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 7e3c752af5..32d25af5f0 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.28.0](https://img.shields.io/badge/Version-1.28.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
+![Version: 1.28.1](https://img.shields.io/badge/Version-1.28.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -490,9 +490,11 @@ The memcached default args are removed and should be provided manually. The sett
 | gateway.podAnnotations | object | `{}` | Annotations for gateway pods |
 | gateway.podLabels | object | `{}` | Labels for gateway pods |
 | gateway.priorityClassName | string | `nil` | The name of the PriorityClass for gateway pods |
+| gateway.readinessProbe.failureThreshold | int | `3` |  |
 | gateway.readinessProbe.httpGet.path | string | `"/"` |  |
-| gateway.readinessProbe.httpGet.port | string | `"http-metrics"` |  |
 | gateway.readinessProbe.initialDelaySeconds | int | `15` |  |
+| gateway.readinessProbe.periodSeconds | int | `10` |  |
+| gateway.readinessProbe.successThreshold | int | `1` |  |
 | gateway.readinessProbe.timeoutSeconds | int | `1` |  |
 | gateway.replicas | int | `1` | Number of replicas for the gateway |
 | gateway.resources | object | `{}` | Resource requests and limits for the gateway |
@@ -501,6 +503,7 @@ The memcached default args are removed and should be provided manually. The sett
 | gateway.service.clusterIP | string | `nil` | ClusterIP of the gateway service |
 | gateway.service.labels | object | `{}` | Labels for gateway service |
 | gateway.service.loadBalancerIP | string | `nil` | Load balancer IP address if service type is LoadBalancer |
+| gateway.service.name | string | `"http-gateway"` | Port Name of the gateway service |
 | gateway.service.nodePort | string | `nil` | Node port if service type is NodePort |
 | gateway.service.port | int | `80` | Port of the gateway service |
 | gateway.service.type | string | `"ClusterIP"` | Type of the gateway service |

From e29fb3375879ffc0eaf5f0b61a21f416c374c28f Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 20:23:13 +0330
Subject: [PATCH 03/16] Fixed ingestor

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../ingester/service-ingester-discovery.yaml   | 18 +++++++++---------
 .../templates/ingester/service-ingester.yaml   | 18 +++++++++---------
 .../ingester/statefulset-ingester.yaml         |  8 ++++----
 charts/tempo-distributed/values.yaml           |  8 ++++++++
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml
index 2835cd866e..9ce772e3d5 100644
--- a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml
+++ b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml
@@ -15,16 +15,16 @@ spec:
   type: ClusterIP
   clusterIP: None
   ports:
-    - name: http-metrics
-      port: 3100
+    {{- range .Values.ingester.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
       protocol: TCP
-      targetPort: 3100
-    - name: grpc
-      port: 9095
-      protocol: TCP
-      targetPort: 9095
-      {{- if .Values.ingester.appProtocol.grpc }}
-      appProtocol: {{ .Values.ingester.appProtocol.grpc }}
+      targetPort: {{ .port }}
+      {{-if and (hasPrefix .name "grpc" ($.Values.ingester.appProtocol.grpc) )}}
+      appProtocol: {{ $.Values.ingester.appProtocol.grpc }}
       {{- end }}
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "tempo.selectorLabels" $dict | nindent 4 }}
diff --git a/charts/tempo-distributed/templates/ingester/service-ingester.yaml b/charts/tempo-distributed/templates/ingester/service-ingester.yaml
index 96867f0dcd..6f78014240 100644
--- a/charts/tempo-distributed/templates/ingester/service-ingester.yaml
+++ b/charts/tempo-distributed/templates/ingester/service-ingester.yaml
@@ -20,17 +20,17 @@ spec:
   ipFamilies: {{ .Values.tempo.service.ipFamilies }}
   ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }}
   ports:
-    - name: http-metrics
-      port: 3100
+    {{- range .Values.ingester.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
       protocol: TCP
-      targetPort: 3100
-    - name: grpc
-      port: 9095
-      protocol: TCP
-      targetPort: 9095
-      {{- if .Values.ingester.appProtocol.grpc }}
-      appProtocol: {{ .Values.ingester.appProtocol.grpc }}
+      targetPort: {{ .port }}
+      {{-if and (hasPrefix .name "grpc" ($.Values.ingester.appProtocol.grpc) )}}
+      appProtocol: {{ $.Values.ingester.appProtocol.grpc }}
       {{- end }}
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "ingester.selectorLabels" $dict | nindent 4 }}
 ---
diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
index 2671a23994..9ebb11dd18 100644
--- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
+++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
@@ -82,12 +82,12 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: ingester
           ports:
-            - name: grpc
-              containerPort: 9095
+            {{- range .Values.ingester.ports }}
+            - name: {{ .name | quote }}
+              containerPort: {{ .port }}
+            {{- end }}
             - name: http-memberlist
               containerPort: {{ include "tempo.memberlistBindPort" . }}
-            - name: http-metrics
-              containerPort: 3100
           {{- if or .Values.global.extraEnv .Values.ingester.extraEnv }}
           env:
             {{- with .Values.global.extraEnv }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 37abd0313e..b6e8d5d394 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -241,6 +241,14 @@ ingester:
     complete_block_timeout: null
     # -- Flush all traces to backend when ingester is stopped
     flush_all_on_shutdown: false
+  # -- Ingestor service ports
+  ports:
+    - name: grpc
+      port: 9095
+      service: true
+    - name: http-metrics
+      port: 3100
+      service: true
   service:
     # -- Annotations for ingester service
     annotations: {}

From 35b5a26c384d23a3b10ea6779fb06afa021f9015 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 20:27:39 +0330
Subject: [PATCH 04/16] Fixed distributor

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../distributor/deployment-distributor.yaml   |  6 ++--
 .../service-distributor-discovery.yaml        | 14 +++++++--
 .../distributor/service-distributor.yaml      | 13 ++++----
 charts/tempo-distributed/values.yaml          | 30 ++++++++++++-------
 4 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml
index c7495b3832..64eeacec46 100644
--- a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml
+++ b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml
@@ -64,11 +64,13 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: distributor
           ports:
+            {{- range .Values.distributor.ports }}
+            - name: {{ .name | quote }}
+              containerPort: {{ .port }}
+            {{- end }}
             - containerPort: {{ include "tempo.memberlistBindPort" . }}
               name: http-memberlist
               protocol: TCP
-            - containerPort: 3100
-              name: http-metrics
             {{- if .Values.traces.jaeger.thriftCompact.enabled }}
             - containerPort: 6831
               name: jaeger-compact
diff --git a/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml b/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml
index a226788b55..6657b655b3 100644
--- a/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml
+++ b/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml
@@ -18,9 +18,17 @@ spec:
   type: ClusterIP
   clusterIP: None
   ports:
-    - name: http-metrics
-      port: 3100
-      targetPort: http-metrics
+    {{- range .Values.distributor.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
+      protocol: TCP
+      targetPort: {{ .port }}
+      {{- if .Values.distributor.appProtocol.grpc }}
+      appProtocol: {{ .Values.distributor.appProtocol.grpc }}
+      {{- end }}
+    {{- end }}
+    {{- end }}
     {{- if .Values.traces.jaeger.thriftCompact.enabled }}
     - name: distributor-jaeger-thrift-compact
       port: 6831
diff --git a/charts/tempo-distributed/templates/distributor/service-distributor.yaml b/charts/tempo-distributed/templates/distributor/service-distributor.yaml
index 15c6317544..d80b41ec85 100644
--- a/charts/tempo-distributed/templates/distributor/service-distributor.yaml
+++ b/charts/tempo-distributed/templates/distributor/service-distributor.yaml
@@ -19,16 +19,17 @@ spec:
   ipFamilies: {{ .Values.tempo.service.ipFamilies }}
   ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }}
   ports:
-    - name: http-metrics
-      port: 3100
-      targetPort: http-metrics
-    - name: grpc
-      port: 9095
+    {{- range .Values.distributor.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
       protocol: TCP
-      targetPort: 9095
+      targetPort: {{ .port }}
       {{- if .Values.distributor.appProtocol.grpc }}
       appProtocol: {{ .Values.distributor.appProtocol.grpc }}
       {{- end }}
+    {{- end }}
+    {{- end }}
     {{- if .Values.traces.jaeger.thriftCompact.enabled }}
     - name: distributor-jaeger-thrift-compact
       port: 6831
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index b6e8d5d394..5fcde019c0 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -415,17 +415,6 @@ metricsGenerator:
     whenScaled: Retain
     # -- Volume retention behavior that applies when the StatefulSet is deleted
     whenDeleted: Retain
-  # -- Default ports
-  ports:
-    - name: grpc
-      port: 9095
-      service: true
-    - name: http-memberlist
-      port: 7946
-      service: false
-    - name: http-metrics
-      port: 3100
-      service: true
   # -- More information on configuration: https://grafana.com/docs/tempo/latest/configuration/#metrics-generator
   config:
     registry:
@@ -460,6 +449,17 @@ metricsGenerator:
     traces_storage:
       path: /var/tempo/traces
     metrics_ingestion_time_range_slack: 30s
+  # -- Metrics-generator service ports
+  ports:
+    - name: grpc
+      port: 9095
+      service: true
+    - name: http-memberlist
+      port: 7946
+      service: false
+    - name: http-metrics
+      port: 3100
+      service: true
   service:
     # -- Annotations for Metrics Generator service
     annotations: {}
@@ -499,6 +499,14 @@ distributor:
     repository: null
     # -- Docker image tag for the distributor image. Overrides `tempo.image.tag`
     tag: null
+  # -- Distributor service ports
+  ports:
+    - name: grpc
+      port: 9095
+      service: true
+    - name: http-metrics
+      port: 3100
+      service: true
   service:
     # -- Annotations for distributor service
     annotations: {}

From e4fb5181ee4823bd66472eb30371a27c08b67ac1 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 20:29:54 +0330
Subject: [PATCH 05/16] Fixed compactor

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../templates/compactor/deployment-compactor.yaml      |  6 ++++--
 .../templates/compactor/service-compactor.yaml         | 10 +++++++---
 charts/tempo-distributed/values.yaml                   |  8 ++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml
index 37f5342204..a1576967d6 100644
--- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml
+++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml
@@ -66,8 +66,10 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: compactor
           ports:
-            - containerPort: 3100
-              name: http-metrics
+            {{- range .Values.compactor.ports }}
+            - name: {{ .name | quote }}
+              containerPort: {{ .port }}
+            {{- end }}
             - containerPort: {{ include "tempo.memberlistBindPort" . }}
               name: http-memberlist
           {{- if or .Values.global.extraEnv .Values.compactor.extraEnv }}
diff --git a/charts/tempo-distributed/templates/compactor/service-compactor.yaml b/charts/tempo-distributed/templates/compactor/service-compactor.yaml
index fde2125f1b..8e11bc54c9 100644
--- a/charts/tempo-distributed/templates/compactor/service-compactor.yaml
+++ b/charts/tempo-distributed/templates/compactor/service-compactor.yaml
@@ -11,10 +11,14 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - name: http-metrics
-      port: 3100
-      targetPort: 3100
+    {{- range .Values.metricsGenerator.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
       protocol: TCP
+      targetPort: {{ .port }}
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "tempo.selectorLabels" (dict "ctx" . "component" "compactor") | nindent 4 }}
   ipFamilies: {{ .Values.tempo.service.ipFamilies }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 5fcde019c0..74451626f9 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -714,6 +714,14 @@ compactor:
       max_time_per_tenant: 5m
       # -- The time between compaction cycles
       compaction_cycle: 30s
+  # -- Compactor service ports
+  ports:
+    - name: grpc
+      port: 9095
+      service: true
+    - name: http-metrics
+      port: 3100
+      service: true
   service:
     # -- Annotations for compactor service
     annotations: {}

From 23443c500a28e37cf1e33910fc8c8d6c322ef0ac Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 20:33:46 +0330
Subject: [PATCH 06/16] Fixed querier

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../templates/querier/deployment-querier.yaml  |  6 ++++--
 .../templates/querier/service-querier.yaml     | 18 +++++++++---------
 charts/tempo-distributed/values.yaml           |  9 ++++++++-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml
index 8412589860..ee78e82a81 100644
--- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml
+++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml
@@ -68,11 +68,13 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: querier
           ports:
+            {{- range .Values.querier.ports }}
+            - name: {{ .name | quote }}
+              containerPort: {{ .port }}
+            {{- end }}
             - containerPort: {{ include "tempo.memberlistBindPort" . }}
               name: http-memberlist
               protocol: TCP
-            - containerPort: 3100
-              name: http-metrics
           {{- if or .Values.global.extraEnv .Values.querier.extraEnv }}
           env:
             {{- with .Values.global.extraEnv }}
diff --git a/charts/tempo-distributed/templates/querier/service-querier.yaml b/charts/tempo-distributed/templates/querier/service-querier.yaml
index 05dd42c106..bffd1e99d8 100644
--- a/charts/tempo-distributed/templates/querier/service-querier.yaml
+++ b/charts/tempo-distributed/templates/querier/service-querier.yaml
@@ -13,16 +13,16 @@ spec:
   ipFamilies: {{ .Values.tempo.service.ipFamilies }}
   ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }}
   ports:
-    - name: http-metrics
-      port: 3100
+    {{- range .Values.querier.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
       protocol: TCP
-      targetPort: 3100
-    - name: grpc
-      port: 9095
-      protocol: TCP
-      targetPort: 9095
-      {{- if .Values.querier.appProtocol.grpc }}
-      appProtocol: {{ .Values.querier.appProtocol.grpc }}
+      targetPort: {{ .port }}
+      {{- if and (hasPrefix .name "grpc") ($.Values.querier.appProtocol.grpc) }}
+      appProtocol: {{ $.Values.querier.appProtocol.grpc }}
       {{- end }}
+    {{- end }}
+    {{- end }}
   selector:
     {{- include "tempo.selectorLabels" (dict "ctx" . "component" "querier" "memberlist" true) | nindent 4 }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 74451626f9..e48c6edf55 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -840,7 +840,14 @@ querier:
       google_cloud_run: {}
     # -- This value controls the overall number of simultaneous subqueries that the querier will service at once. It does not distinguish between the types of queries.
     max_concurrent_queries: 20
-
+  # -- Querier service ports
+  ports:
+    - name: grpc
+      port: 9095
+      service: true
+    - name: http-metrics
+      port: 3100
+      service: true
   service:
     # -- Annotations for querier service
     annotations: {}

From 1227aff902ac76f26d0336cb8de753855b95c7c8 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 20:53:59 +0330
Subject: [PATCH 07/16] Fixed queryFrontend and tempo-query

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../deployment-query-frontend.yaml            |  8 ++---
 .../service-query-frontend-discovery.yaml     | 31 ++++++++++---------
 .../service-query-frontend.yaml               | 31 ++++++++++---------
 charts/tempo-distributed/values.yaml          | 21 +++++++++++--
 4 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
index 01f05b21cf..60021fdd4b 100644
--- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
+++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
@@ -68,10 +68,10 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: query-frontend
           ports:
-            - containerPort: 3100
-              name: http-metrics
-            - containerPort: 9095
-              name: grpc
+            {{- range .Values.queryFrontend.ports }}
+            - name: {{ .name | quote }}
+              containerPort: {{ .port }}
+            {{- end }}
           {{- if or .Values.global.extraEnv .Values.queryFrontend.extraEnv }}
           env:
             {{- with .Values.global.extraEnv }}
diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml
index 48d2c28f4c..fb7d37c74f 100644
--- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml
+++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml
@@ -16,16 +16,17 @@ spec:
   type: ClusterIP
   clusterIP: None
   ports:
-    - name: http
-      port: 3100
-      targetPort: 3100
-    - name: grpc
-      port: 9095
+    {{- range .Values.queryFrontend.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
       protocol: TCP
-      targetPort: 9095
-      {{- if .Values.queryFrontend.appProtocol.grpc }}
-      appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }}
+      targetPort: {{ .port }}
+      {{- if and (hasPrefix .name "grpc") ($.Values.queryFrontend.appProtocol.grpc) }}
+      appProtocol: {{ $.Values.queryFrontend.appProtocol.grpc }}
       {{- end }}
+    {{- end }}
+    {{- end }}
     - name: grpclb
       port: 9096
       protocol: TCP
@@ -34,12 +35,14 @@ spec:
       appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }}
       {{- end }}
     {{- if .Values.queryFrontend.query.enabled }}
-    - name: tempo-query-jaeger-ui
-      port: {{ .Values.queryFrontend.service.port }}
-      targetPort: {{ .Values.queryFrontend.service.port }}
-    - name: tempo-query-metrics
-      port: 16687
-      targetPort: jaeger-metrics
+    {{- range .Values.queryFrontend.query.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
+      protocol: TCP
+      targetPort: {{ .port }}
+    {{- end }}
+    {{- end }}
     {{- end }}
   publishNotReadyAddresses: true
   selector:
diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml
index ad7c568d70..1b5fe586f8 100644
--- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml
+++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml
@@ -17,23 +17,26 @@ spec:
   ipFamilies: {{ .Values.tempo.service.ipFamilies }}
   ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }}
   ports:
-    - name: http-metrics
-      port: 3100
-      targetPort: 3100
-    - name: grpc
-      port: 9095
+    {{- range .Values.queryFrontend.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
       protocol: TCP
-      targetPort: 9095
-      {{- if .Values.queryFrontend.appProtocol.grpc }}
-      appProtocol: {{ .Values.queryFrontend.appProtocol.grpc }}
+      targetPort: {{ .port }}
+      {{- if and (hasPrefix .name "grpc") ($.Values.queryFrontend.appProtocol.grpc) }}
+      appProtocol: {{ $.Values.queryFrontend.appProtocol.grpc }}
       {{- end }}
+    {{- end }}
+    {{- end }}
     {{- if .Values.queryFrontend.query.enabled }}
-    - name: tempo-query-jaeger-ui
-      port: {{ .Values.queryFrontend.service.port }}
-      targetPort: {{ .Values.queryFrontend.service.port }}
-    - name: tempo-query-metrics
-      port: 16687
-      targetPort: jaeger-metrics
+    {{- range .Values.queryFrontend.query.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
+      protocol: TCP
+      targetPort: {{ .port }}
+    {{- end }}
+    {{- end }}
     {{- end }}
   {{- if .Values.queryFrontend.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.queryFrontend.service.loadBalancerIP  }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index e48c6edf55..8576d330a0 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -870,6 +870,17 @@ queryFrontend:
       repository: grafana/tempo-query
       # -- Docker image tag for the tempo-query image. Overrides `tempo.image.tag`
       tag: null
+    # -- Query service ports
+    ports:
+      - name: tempo-query-metrics
+        port: 16687
+        service: true
+      - name: tempo-query-jaeger-ui
+        port: 16686
+        service: true
+      - name: tempo-query-jaeger-grpc
+        port: 16685
+        service: true
     # -- Resource requests and limits for the query
     resources: {}
     # -- Additional CLI args for tempo-query pods
@@ -948,9 +959,15 @@ queryFrontend:
     repository: null
     # -- Docker image tag for the query-frontend image. Overrides `tempo.image.tag`
     tag: null
+  # -- QueryFrontend service ports
+  ports:
+    - name: grpc
+      port: 9095
+      service: true
+    - name: http-metrics
+      port: 3100
+      service: true
   service:
-    # -- Port of the query-frontend service
-    port: 16686
     # -- Annotations for queryFrontend service
     annotations: {}
     # -- Labels for queryFrontend service

From 465c0c600124a57eb143e0ce2890698d489e82a2 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 20:57:33 +0330
Subject: [PATCH 08/16] Fixed Federation-frontend

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../deployment-federation-frontend.yaml               |  6 ++++--
 .../service-federation-frontend.yaml                  | 11 ++++++++---
 charts/tempo-distributed/values.yaml                  |  7 +++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/charts/tempo-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml b/charts/tempo-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml
index 20f2d8fa44..316c75ebfb 100644
--- a/charts/tempo-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml
+++ b/charts/tempo-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml
@@ -69,8 +69,10 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: federation-frontend
           ports:
-            - containerPort: 3100
-              name: http-metrics
+            {{- range .Values.enterpriseFederationFrontend.ports }}
+            - name: {{ .name | quote }}
+              containerPort: {{ .port }}
+            {{- end }}
           {{- if or .Values.global.extraEnv .Values.enterpriseFederationFrontend.extraEnv }}
           env:
             {{- with .Values.global.extraEnv }}
diff --git a/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml b/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml
index 8d1db22ce1..430b1f34e4 100644
--- a/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml
+++ b/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml
@@ -13,9 +13,14 @@ metadata:
 spec:
   type: {{ .Values.enterpriseFederationFrontend.service.type }}
   ports:
-    - name: http-metrics
-      port: 3100
-      targetPort: 3100
+    {{- range .Values.enterpriseFederationFrontend.ports }}
+    {{- if .service }}
+    - name: {{ .name | quote }}
+      port: {{ .port }}
+      protocol: TCP
+      targetPort: {{ .port }}
+    {{- end }}
+    {{- end }}
   {{- if .Values.enterpriseFederationFrontend.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.enterpriseFederationFrontend.service.loadBalancerIP  }}
   {{- end }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 8576d330a0..efd791652e 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -1099,9 +1099,12 @@ enterpriseFederationFrontend:
     repository: null
     # -- Docker image tag for the federation-frontend image. Overrides `tempo.image.tag`
     tag: null
+  # -- Federation-frontend service ports
+  ports:
+    - name: http-metrics
+      port: 3100
+      service: true
   service:
-    # -- Port of the federation-frontend service
-    port: 3100
     # -- Annotations for enterpriseFederationFrontend service
     annotations: {}
     # -- Type of service for the enterpriseFederationFrontend

From 650c08d9fc9716d5ed852e1ca33bfd500267899e Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 21:03:47 +0330
Subject: [PATCH 09/16] Bumped version

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 charts/tempo-distributed/Chart.yaml |  2 +-
 charts/tempo-distributed/README.md  | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 6f8541f3b8..91ea814b4f 100644
--- a/charts/tempo-distributed/Chart.yaml
+++ b/charts/tempo-distributed/Chart.yaml
@@ -37,4 +37,4 @@ dependencies:
     alias: rollout_operator
     repository: https://grafana.github.io/helm-charts
     version: 0.21.0
-    condition: rollout_operator.enabled
+    condition: rollout_operator.enabled
\ No newline at end of file
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 32d25af5f0..5968ea3ea4 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -316,6 +316,7 @@ The memcached default args are removed and should be provided manually. The sett
 | compactor.nodeSelector | object | `{}` | Node selector for compactor pods |
 | compactor.podAnnotations | object | `{}` | Annotations for compactor pods |
 | compactor.podLabels | object | `{}` | Labels for compactor pods |
+| compactor.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-metrics","port":3100,"service":true}]` | Compactor service ports |
 | compactor.priorityClassName | string | `nil` | The name of the PriorityClass for compactor pods |
 | compactor.replicas | int | `1` | Number of replicas for the compactor |
 | compactor.resources | object | `{}` | Resource requests and limits for the compactor |
@@ -350,6 +351,7 @@ The memcached default args are removed and should be provided manually. The sett
 | distributor.nodeSelector | object | `{}` | Node selector for distributor pods |
 | distributor.podAnnotations | object | `{}` | Annotations for distributor pods |
 | distributor.podLabels | object | `{}` | Labels for distributor pods |
+| distributor.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-metrics","port":3100,"service":true}]` | Distributor service ports |
 | distributor.priorityClassName | string | `nil` | The name of the PriorityClass for distributor pods |
 | distributor.replicas | int | `1` | Number of replicas for the distributor |
 | distributor.resources | object | `{}` | Resource requests and limits for the distributor |
@@ -389,6 +391,7 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseFederationFrontend.nodeSelector | object | `{}` | Node selector for federation-frontend pods |
 | enterpriseFederationFrontend.podAnnotations | object | `{}` | Annotations for federation-frontend pods |
 | enterpriseFederationFrontend.podLabels | object | `{}` | Labels for enterpriseFederationFrontend pods |
+| enterpriseFederationFrontend.ports | list | `[{"name":"http-metrics","port":3100,"service":true}]` | Federation-frontend service ports |
 | enterpriseFederationFrontend.priorityClassName | string | `nil` | The name of the PriorityClass for federation-frontend pods |
 | enterpriseFederationFrontend.proxy_targets | list | `[]` |  |
 | enterpriseFederationFrontend.replicas | int | `1` | Number of replicas for the federation-frontend |
@@ -396,7 +399,6 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseFederationFrontend.service.annotations | object | `{}` | Annotations for enterpriseFederationFrontend service |
 | enterpriseFederationFrontend.service.loadBalancerIP | string | `""` | If type is LoadBalancer you can assign the IP to the LoadBalancer |
 | enterpriseFederationFrontend.service.loadBalancerSourceRanges | list | `[]` | If type is LoadBalancer limit incoming traffic from IPs. |
-| enterpriseFederationFrontend.service.port | int | `3100` | Port of the federation-frontend service |
 | enterpriseFederationFrontend.service.type | string | `"ClusterIP"` | Type of service for the enterpriseFederationFrontend |
 | enterpriseFederationFrontend.terminationGracePeriodSeconds | int | `30` | Grace period to allow the federation-frontend to shutdown before it is killed |
 | enterpriseFederationFrontend.tolerations | list | `[]` | Tolerations for federation-frontend pods |
@@ -559,6 +561,7 @@ The memcached default args are removed and should be provided manually. The sett
 | ingester.persistentVolumeClaimRetentionPolicy.whenScaled | string | `"Retain"` | Volume retention behavior when the replica count of the StatefulSet is reduced |
 | ingester.podAnnotations | object | `{}` | Annotations for ingester pods |
 | ingester.podLabels | object | `{}` | Labels for ingester pods |
+| ingester.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-metrics","port":3100,"service":true}]` | Ingestor service ports |
 | ingester.priorityClassName | string | `nil` | The name of the PriorityClass for ingester pods |
 | ingester.replicas | int | `3` | Number of replicas for the ingester |
 | ingester.resources | object | `{}` | Resource requests and limits for the ingester |
@@ -685,7 +688,7 @@ The memcached default args are removed and should be provided manually. The sett
 | metricsGenerator.persistentVolumeClaimRetentionPolicy.whenScaled | string | `"Retain"` | Volume retention behavior when the replica count of the StatefulSet is reduced |
 | metricsGenerator.podAnnotations | object | `{}` | Annotations for metrics-generator pods |
 | metricsGenerator.podLabels | object | `{}` | Labels for metrics-generator pods |
-| metricsGenerator.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-memberlist","port":7946,"service":false},{"name":"http-metrics","port":3100,"service":true}]` | Default ports |
+| metricsGenerator.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-memberlist","port":7946,"service":false},{"name":"http-metrics","port":3100,"service":true}]` | Metrics-generator service ports |
 | metricsGenerator.priorityClassName | string | `nil` | The name of the PriorityClass for metrics-generator pods |
 | metricsGenerator.replicas | int | `1` | Number of replicas for the metrics-generator |
 | metricsGenerator.resources | object | `{}` | Resource requests and limits for the metrics-generator |
@@ -751,6 +754,7 @@ The memcached default args are removed and should be provided manually. The sett
 | querier.nodeSelector | object | `{}` | Node selector for querier pods |
 | querier.podAnnotations | object | `{}` | Annotations for querier pods |
 | querier.podLabels | object | `{}` | Labels for querier pods |
+| querier.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-metrics","port":3100,"service":true}]` | Querier service ports |
 | querier.priorityClassName | string | `nil` | The name of the PriorityClass for querier pods |
 | querier.replicas | int | `1` | Number of replicas for the querier |
 | querier.resources | object | `{}` | Resource requests and limits for the querier |
@@ -798,6 +802,7 @@ The memcached default args are removed and should be provided manually. The sett
 | queryFrontend.nodeSelector | object | `{}` | Node selector for query-frontend pods |
 | queryFrontend.podAnnotations | object | `{}` | Annotations for query-frontend pods |
 | queryFrontend.podLabels | object | `{}` | Labels for queryFrontend pods |
+| queryFrontend.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-metrics","port":3100,"service":true}]` | QueryFrontend service ports |
 | queryFrontend.priorityClassName | string | `nil` | The name of the PriorityClass for query-frontend pods |
 | queryFrontend.query.config | string | `"backend: 127.0.0.1:3100\n"` |  |
 | queryFrontend.query.enabled | bool | `false` | Required for grafana version <7.5 for compatibility with jaeger-ui. Doesn't work on ARM arch |
@@ -810,6 +815,7 @@ The memcached default args are removed and should be provided manually. The sett
 | queryFrontend.query.image.registry | string | `nil` | The Docker registry for the tempo-query image. Overrides `tempo.image.registry` |
 | queryFrontend.query.image.repository | string | `"grafana/tempo-query"` | Docker image repository for the tempo-query image. Overrides `tempo.image.repository` |
 | queryFrontend.query.image.tag | string | `nil` | Docker image tag for the tempo-query image. Overrides `tempo.image.tag` |
+| queryFrontend.query.ports | list | `[{"name":"tempo-query-metrics","port":16687,"service":true},{"name":"tempo-query-jaeger-ui","port":16686,"service":true},{"name":"tempo-query-jaeger-grpc","port":16685,"service":true}]` | Query service ports |
 | queryFrontend.query.resources | object | `{}` | Resource requests and limits for the query |
 | queryFrontend.replicas | int | `1` | Number of replicas for the query-frontend |
 | queryFrontend.resources | object | `{}` | Resource requests and limits for the query-frontend |
@@ -817,7 +823,6 @@ The memcached default args are removed and should be provided manually. The sett
 | queryFrontend.service.labels | object | `{}` | Labels for queryFrontend service |
 | queryFrontend.service.loadBalancerIP | string | `""` | If type is LoadBalancer you can assign the IP to the LoadBalancer |
 | queryFrontend.service.loadBalancerSourceRanges | list | `[]` | If type is LoadBalancer limit incoming traffic from IPs. |
-| queryFrontend.service.port | int | `16686` | Port of the query-frontend service |
 | queryFrontend.service.type | string | `"ClusterIP"` | Type of service for the queryFrontend |
 | queryFrontend.serviceDiscovery.annotations | object | `{}` | Annotations for queryFrontendDiscovery service |
 | queryFrontend.serviceDiscovery.labels | object | `{}` | Labels for queryFrontendDiscovery service |

From f8fd6550e1380717ab2cc5921d85b4f8d6bd6062 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 21:22:29 +0330
Subject: [PATCH 10/16] Updated tempo query

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../query-frontend/deployment-query-frontend.yaml         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
index 60021fdd4b..677f5319b9 100644
--- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
+++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
@@ -117,10 +117,10 @@ spec:
           imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
           name: tempo-query
           ports:
-            - containerPort: {{ .Values.queryFrontend.service.port }}
-              name: jaeger-ui
-            - containerPort: 16687
-              name: jaeger-metrics
+            {{- range .Values.queryFrontend.query.ports }}
+            - name: {{ .name | quote }}
+              containerPort: {{ .port }}
+            {{- end }}
           {{- with .Values.queryFrontend.query.extraEnv }}
           env:
             {{- toYaml . | nindent 12 }}

From 191ee26e40b4710f5b847b68eacd9e43e7188972 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 21:22:42 +0330
Subject: [PATCH 11/16] Updated config file

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 charts/tempo-distributed/values.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index efd791652e..047c12a960 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -241,7 +241,7 @@ ingester:
     complete_block_timeout: null
     # -- Flush all traces to backend when ingester is stopped
     flush_all_on_shutdown: false
-  # -- Ingestor service ports
+  # -- Ingester service ports
   ports:
     - name: grpc
       port: 9095
@@ -2112,32 +2112,32 @@ gateway:
 
           location ^~ /api {
             set $query_frontend {{ include "tempo.resourceName" (dict "ctx" . "component" "query-frontend") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
-            proxy_pass       http://$query_frontend:3100$request_uri;
+            proxy_pass       http://$query_frontend:{{ .Values.queryFrontend.ports }}$request_uri;
           }
 
           location = /flush {
             set $ingester {{ include "tempo.resourceName" (dict "ctx" . "component" "ingester") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
-            proxy_pass       http://$ingester:3100$request_uri;
+            proxy_pass       http://$ingester:{{ .Values.ingester.ports }}$request_uri;
           }
 
           location = /shutdown {
             set $ingester {{ include "tempo.resourceName" (dict "ctx" . "component" "ingester") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
-            proxy_pass       http://$ingester:3100$request_uri;
+            proxy_pass       http://$ingester:{{ .Values.ingester.ports }}$request_uri;
           }
 
           location = /distributor/ring {
             set $distributor {{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
-            proxy_pass       http://$distributor:3100$request_uri;
+            proxy_pass       http://$distributor:{{ .Values.distributor.ports }}$request_uri;
           }
 
           location = /ingester/ring {
             set $distributor {{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
-            proxy_pass       http://$distributor:3100$request_uri;
+            proxy_pass       http://$distributor:{{ .Values.distributor.ports }}$request_uri;
           }
 
           location = /compactor/ring {
             set $compactor {{ include "tempo.resourceName" (dict "ctx" . "component" "compactor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
-            proxy_pass       http://$compactor:3100$request_uri;
+            proxy_pass       http://$compactor:{{ .Values.compactor.ports }}request_uri;
           }
 
           {{- with .Values.gateway.nginxConfig.serverSnippet }}

From dad4e3c4646ca3ee471f431bcf00297ede4cfb3d Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 21:23:23 +0330
Subject: [PATCH 12/16] Fixed linter issue

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 charts/tempo-distributed/Chart.yaml | 2 +-
 charts/tempo-distributed/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 91ea814b4f..6f8541f3b8 100644
--- a/charts/tempo-distributed/Chart.yaml
+++ b/charts/tempo-distributed/Chart.yaml
@@ -37,4 +37,4 @@ dependencies:
     alias: rollout_operator
     repository: https://grafana.github.io/helm-charts
     version: 0.21.0
-    condition: rollout_operator.enabled
\ No newline at end of file
+    condition: rollout_operator.enabled
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 5968ea3ea4..fa7c2e8cdb 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -561,7 +561,7 @@ The memcached default args are removed and should be provided manually. The sett
 | ingester.persistentVolumeClaimRetentionPolicy.whenScaled | string | `"Retain"` | Volume retention behavior when the replica count of the StatefulSet is reduced |
 | ingester.podAnnotations | object | `{}` | Annotations for ingester pods |
 | ingester.podLabels | object | `{}` | Labels for ingester pods |
-| ingester.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-metrics","port":3100,"service":true}]` | Ingestor service ports |
+| ingester.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-metrics","port":3100,"service":true}]` | Ingester service ports |
 | ingester.priorityClassName | string | `nil` | The name of the PriorityClass for ingester pods |
 | ingester.replicas | int | `3` | Number of replicas for the ingester |
 | ingester.resources | object | `{}` | Resource requests and limits for the ingester |

From 5f3d061bef38da880b5516ee0529f1eeae43bdb6 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 21:29:08 +0330
Subject: [PATCH 13/16] Fixed linter issue

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../tempo-distributed/templates/ingester/service-ingester.yaml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/templates/ingester/service-ingester.yaml b/charts/tempo-distributed/templates/ingester/service-ingester.yaml
index 6f78014240..b416d7ba83 100644
--- a/charts/tempo-distributed/templates/ingester/service-ingester.yaml
+++ b/charts/tempo-distributed/templates/ingester/service-ingester.yaml
@@ -26,7 +26,7 @@ spec:
       port: {{ .port }}
       protocol: TCP
       targetPort: {{ .port }}
-      {{-if and (hasPrefix .name "grpc" ($.Values.ingester.appProtocol.grpc) )}}
+      {{- if and (hasPrefix .name "grpc" ($.Values.ingester.appProtocol.grpc) )}}
       appProtocol: {{ $.Values.ingester.appProtocol.grpc }}
       {{- end }}
     {{- end }}

From 59d8cb7597965afbb0ee50e1be9ff6490bc6217c Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 21:31:46 +0330
Subject: [PATCH 14/16] Fixed linter issue

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../templates/ingester/service-ingester-discovery.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml
index 9ce772e3d5..ce0da7a2ec 100644
--- a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml
+++ b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml
@@ -21,7 +21,7 @@ spec:
       port: {{ .port }}
       protocol: TCP
       targetPort: {{ .port }}
-      {{-if and (hasPrefix .name "grpc" ($.Values.ingester.appProtocol.grpc) )}}
+      {{- if and (hasPrefix .name "grpc" ($.Values.ingester.appProtocol.grpc) )}}
       appProtocol: {{ $.Values.ingester.appProtocol.grpc }}
       {{- end }}
     {{- end }}

From 14c1990f53930dce33e27bbe4ab5c7d78462ad75 Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 21:35:02 +0330
Subject: [PATCH 15/16] Bad arguments

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../templates/ingester/service-ingester-discovery.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml
index ce0da7a2ec..6389c70a0b 100644
--- a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml
+++ b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml
@@ -21,7 +21,7 @@ spec:
       port: {{ .port }}
       protocol: TCP
       targetPort: {{ .port }}
-      {{- if and (hasPrefix .name "grpc" ($.Values.ingester.appProtocol.grpc) )}}
+      {{- if and (hasPrefix .name "grpc") ($.Values.ingester.appProtocol.grpc) }}
       appProtocol: {{ $.Values.ingester.appProtocol.grpc }}
       {{- end }}
     {{- end }}

From 2d708492eaa0f9682e0974c116363b2022d5e31e Mon Sep 17 00:00:00 2001
From: xogoodnow <xo4ever9999@gmail.com>
Date: Sun, 22 Dec 2024 21:37:52 +0330
Subject: [PATCH 16/16] Bad arguments

Signed-off-by: xogoodnow <xo4ever9999@gmail.com>
---
 .../tempo-distributed/templates/ingester/service-ingester.yaml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/templates/ingester/service-ingester.yaml b/charts/tempo-distributed/templates/ingester/service-ingester.yaml
index b416d7ba83..7cf0ab0729 100644
--- a/charts/tempo-distributed/templates/ingester/service-ingester.yaml
+++ b/charts/tempo-distributed/templates/ingester/service-ingester.yaml
@@ -26,7 +26,7 @@ spec:
       port: {{ .port }}
       protocol: TCP
       targetPort: {{ .port }}
-      {{- if and (hasPrefix .name "grpc" ($.Values.ingester.appProtocol.grpc) )}}
+     {{- if and (hasPrefix .name "grpc") ($.Values.ingester.appProtocol.grpc) }}
       appProtocol: {{ $.Values.ingester.appProtocol.grpc }}
       {{- end }}
     {{- end }}