From d48e722ee854376aace5184df74aa3fb842de18a Mon Sep 17 00:00:00 2001
From: Costis <ccostis@gmail.com>
Date: Tue, 17 Sep 2024 13:59:26 +0300
Subject: [PATCH 01/19] LoadBalancer cannot simultaneously support TCP and UDP
 protocols

Signed-off-by: Costis <ccostis@gmail.com>
---
 charts/tempo/Chart.yaml             |  2 +-
 charts/tempo/README.md              |  7 ++-
 charts/tempo/templates/_ports.tpl   | 88 +++++++++++++++++++++++++++++
 charts/tempo/templates/service.yaml | 65 +++++----------------
 charts/tempo/values.yaml            |  6 ++
 5 files changed, 115 insertions(+), 53 deletions(-)
 create mode 100644 charts/tempo/templates/_ports.tpl

diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml
index 352a07e83e..969a8112d9 100644
--- a/charts/tempo/Chart.yaml
+++ b/charts/tempo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo
 description: Grafana Tempo Single Binary Mode
 type: application
-version: 1.10.3
+version: 1.10.4
 appVersion: 2.5.0
 engine: gotpl
 home: https://grafana.net
diff --git a/charts/tempo/README.md b/charts/tempo/README.md
index e34b011ff1..f8913e0363 100644
--- a/charts/tempo/README.md
+++ b/charts/tempo/README.md
@@ -1,6 +1,6 @@
 # tempo
 
-![Version: 1.10.3](https://img.shields.io/badge/Version-1.10.3-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.10.4](https://img.shields.io/badge/Version-1.10.4-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 Single Binary Mode
 
@@ -41,6 +41,9 @@ Grafana Tempo Single Binary Mode
 | service.labels | object | `{}` |  |
 | service.targetPort | string | `""` |  |
 | service.type | string | `"ClusterIP"` |  |
+| service.clusterIP | string | `""` | |
+| service.loadBalancerIP | string | `""` | |
+| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can be "UDP", "TCP" or "UDP,TCP"  |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
 | serviceAccount.automountServiceAccountToken | bool | `true` |  |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
@@ -148,4 +151,4 @@ and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgra
 
 Upgrading from pre 0.7.0 will, by default, move your trace storage from `/tmp/tempo/traces` to `/var/tempo/traces`.
 This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the
-old folder to the new.
\ No newline at end of file
+old folder to the new.
diff --git a/charts/tempo/templates/_ports.tpl b/charts/tempo/templates/_ports.tpl
new file mode 100644
index 0000000000..e65378489d
--- /dev/null
+++ b/charts/tempo/templates/_ports.tpl
@@ -0,0 +1,88 @@
+{{/* ~=~=~ Partial Templates of exposed Ports ~=~=~ */}}
+
+{{/* UDP sockets */}}
+{{- define "tempo.udp"}}
+{{- $endpoint := .Values.tempo.receivers.jaeger.protocols.thrift_compact }}
+{{- with $endpoint.endpoint }}
+{{- $port := regexSplit ":" . -1 | last }}
+- name: tempo-jaeger-thrift-compact
+  port: {{ $port }}
+  protocol: UDP
+  targetPort: 6831
+{{- end }}
+{{- $endpoint := .Values.tempo.receivers.jaeger.protocols.thrift_binary }}
+{{- with $endpoint.endpoint }}
+{{- $port := regexSplit ":" . -1 | last }}
+- name: tempo-jaeger-thrift-binary
+  port: {{ $port }}
+  protocol: UDP
+  targetPort: 6832
+{{- end }}
+{{- /* end of define */}}
+{{- end }}
+
+{{/* TCP sockets */}}
+{{- define "tempo.tcp"}}
+- name: tempo-prom-metrics
+  port: 3100
+  protocol: TCP
+  targetPort: 3100
+{{- if .Values.tempoQuery.enabled }}
+- name: jaeger-metrics
+  port: 16687
+  protocol: TCP
+  targetPort: 16687
+- name: tempo-query-jaeger-ui
+  port: {{ .Values.tempoQuery.service.port }}
+  targetPort: {{ .Values.tempoQuery.service.port }}
+{{- end }}
+{{- $endpoint := .Values.tempo.receivers.jaeger.protocols.thrift_http }}
+{{- with $endpoint.endpoint }}
+{{- $port := regexSplit ":" . -1 | last }}
+- name: tempo-jaeger-thrift-http
+  port: {{ $port }}
+  protocol: TCP
+  targetPort: 14268
+{{- end }}
+{{- $endpoint := .Values.tempo.receivers.jaeger.protocols.grpc }}
+{{- with $endpoint.endpoint }}
+{{- $port := regexSplit ":" . -1 | last }}
+- name: grpc-tempo-jaeger
+  port: {{ $port }}
+  protocol: TCP
+  targetPort: 14250
+{{- end }}
+- name: tempo-zipkin
+  port: 9411
+  protocol: TCP
+  targetPort: 9411
+- name: tempo-otlp-legacy
+  port: 55680
+  protocol: TCP
+  targetPort: 55680
+- name: tempo-otlp-http-legacy
+  port: 55681
+  protocol: TCP
+  targetPort: 55681
+{{- $endpoint := .Values.tempo.receivers.otlp.protocols.grpc }}
+{{- with $endpoint.endpoint }}
+{{- $port := regexSplit ":" . -1 | last }}
+- name: grpc-tempo-otlp
+  port: {{ $port }}
+  protocol: TCP
+  targetPort: 4317
+{{- end }}
+{{- $endpoint := .Values.tempo.receivers.otlp.protocols.http }}
+{{- with $endpoint.endpoint }}
+{{- $port := regexSplit ":" . -1 | last }}
+- name: tempo-otlp-http
+  port: {{ $port }}
+  protocol: TCP
+  targetPort: 4318
+{{- end }}
+- name: tempo-opencensus
+  port: 55678
+  protocol: TCP
+  targetPort: 55678
+{{- /* end of define */}}
+{{- end  }}
\ No newline at end of file
diff --git a/charts/tempo/templates/service.yaml b/charts/tempo/templates/service.yaml
index 4e23e336d4..9c607d9354 100644
--- a/charts/tempo/templates/service.yaml
+++ b/charts/tempo/templates/service.yaml
@@ -1,3 +1,4 @@
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -32,56 +33,20 @@ spec:
   {{- end }}
 {{- end }}
   ports:
-  - name: tempo-prom-metrics
-    port: 3100
-    targetPort: 3100
-  {{- if .Values.tempoQuery.enabled }}
-  - name: jaeger-metrics
-    port: 16687
-    targetPort: 16687
-  - name: tempo-query-jaeger-ui
-    port: {{ .Values.tempoQuery.service.port }}
-    targetPort: {{ .Values.tempoQuery.service.port }}
+  {{- if (eq .Values.service.type "LoadBalancer") }}
+    {{- $protocol := .Values.service.protocol | default "TCP" }}
+    {{- if contains "UDP" $protocol }}
+      {{- include "tempo.udp" . | indent 2 }}
+    {{- end }}
+    {{- if contains "TCP" $protocol }}
+      {{- include "tempo.tcp" . | indent 2 }}
+    {{- end }}
+  {{- else }}
+    {{- include "tempo.udp" . | indent 2 }}
+    {{- include "tempo.tcp" . | indent 2 }}
   {{- end }}
-  - name: tempo-jaeger-thrift-compact
-    port: 6831
-    protocol: UDP
-    targetPort: 6831
-  - name: tempo-jaeger-thrift-binary
-    port: 6832
-    protocol: UDP
-    targetPort: 6832
-  - name: tempo-jaeger-thrift-http
-    port: 14268
-    protocol: TCP
-    targetPort: 14268
-  - name: grpc-tempo-jaeger
-    port: 14250
-    protocol: TCP
-    targetPort: 14250
-  - name: tempo-zipkin
-    port: 9411
-    protocol: TCP
-    targetPort: 9411
-  - name: tempo-otlp-legacy
-    port: 55680
-    protocol: TCP
-    targetPort: 55680
-  - name: tempo-otlp-http-legacy
-    port: 55681
-    protocol: TCP
-    targetPort: 4318
-  - name: grpc-tempo-otlp
-    port: 4317
-    protocol: TCP
-    targetPort: 4317
-  - name: tempo-otlp-http
-    port: 4318
-    protocol: TCP
-    targetPort: 4318
-  - name: tempo-opencensus
-    port: 55678
-    protocol: TCP
-    targetPort: 55678
   selector:
     {{- include "tempo.selectorLabels" . | nindent 4 }}
+
+
+
diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml
index 91bebb1685..c828b24f2b 100644
--- a/charts/tempo/values.yaml
+++ b/charts/tempo/values.yaml
@@ -257,6 +257,12 @@ serviceAccount:
 
 service:
   type: ClusterIP
+  # type: LoadBalancer
+  # clusterIP: ""
+  # loadBalancerIP: ""
+  # -- If service type is LoadBalancer, the exposed protocol can either be UDP or TCP
+  # protocol: "TCP"
+
   annotations: {}
   labels: {}
   targetPort: ""

From 8c379b0eae42d34850aa6fe9c08a292efa0ee022 Mon Sep 17 00:00:00 2001
From: Costis <ccostis@gmail.com>
Date: Sun, 22 Sep 2024 15:38:41 +0300
Subject: [PATCH 02/19] README.md should be generated by helm-docs

Signed-off-by: Costis <ccostis@gmail.com>
---
 charts/tempo/README.md   |  8 ++++----
 charts/tempo/values.yaml | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/tempo/README.md b/charts/tempo/README.md
index f8913e0363..ff5c75772e 100644
--- a/charts/tempo/README.md
+++ b/charts/tempo/README.md
@@ -38,12 +38,12 @@ Grafana Tempo Single Binary Mode
 | replicas | int | `1` | Define the amount of instances |
 | securityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsNonRoot":true,"runAsUser":10001}` | securityContext for container |
 | service.annotations | object | `{}` |  |
+| service.clusterIP | string | `""` |  |
 | service.labels | object | `{}` |  |
+| service.loadBalancerIP | string | `nil` | IP address, in case of 'type: LoadBalancer' |
+| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can either be 'UDP', 'TCP' or 'UDP,TCP' |
 | service.targetPort | string | `""` |  |
 | service.type | string | `"ClusterIP"` |  |
-| service.clusterIP | string | `""` | |
-| service.loadBalancerIP | string | `""` | |
-| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can be "UDP", "TCP" or "UDP,TCP"  |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
 | serviceAccount.automountServiceAccountToken | bool | `true` |  |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
@@ -151,4 +151,4 @@ and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgra
 
 Upgrading from pre 0.7.0 will, by default, move your trace storage from `/tmp/tempo/traces` to `/var/tempo/traces`.
 This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the
-old folder to the new.
+old folder to the new.
\ No newline at end of file
diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml
index c828b24f2b..41724a7565 100644
--- a/charts/tempo/values.yaml
+++ b/charts/tempo/values.yaml
@@ -257,11 +257,11 @@ serviceAccount:
 
 service:
   type: ClusterIP
-  # type: LoadBalancer
-  # clusterIP: ""
-  # loadBalancerIP: ""
-  # -- If service type is LoadBalancer, the exposed protocol can either be UDP or TCP
-  # protocol: "TCP"
+  clusterIP: ""
+  # -- (string) IP address, in case of 'type: LoadBalancer'
+  loadBalancerIP: 
+  # -- If service type is LoadBalancer, the exposed protocol can either be "UDP", "TCP" or "UDP,TCP"
+  protocol: "TCP"
 
   annotations: {}
   labels: {}

From dc0a375a0ec52073974c86c76c584ce945cc7122 Mon Sep 17 00:00:00 2001
From: Costis <ccostis@gmail.com>
Date: Wed, 2 Oct 2024 22:26:42 +0300
Subject: [PATCH 03/19] README.md should be generated by helm-docs

Signed-off-by: Costis <ccostis@gmail.com>
---
 charts/tempo/README.md   | 2 +-
 charts/tempo/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo/README.md b/charts/tempo/README.md
index ff5c75772e..2830fe8ba8 100644
--- a/charts/tempo/README.md
+++ b/charts/tempo/README.md
@@ -41,7 +41,7 @@ Grafana Tempo Single Binary Mode
 | service.clusterIP | string | `""` |  |
 | service.labels | object | `{}` |  |
 | service.loadBalancerIP | string | `nil` | IP address, in case of 'type: LoadBalancer' |
-| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can either be 'UDP', 'TCP' or 'UDP,TCP' |
+| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can either be "UDP", "TCP" or "UDP,TCP" |
 | service.targetPort | string | `""` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml
index 41724a7565..30d5b758f8 100644
--- a/charts/tempo/values.yaml
+++ b/charts/tempo/values.yaml
@@ -259,7 +259,7 @@ service:
   type: ClusterIP
   clusterIP: ""
   # -- (string) IP address, in case of 'type: LoadBalancer'
-  loadBalancerIP: 
+  loadBalancerIP:
   # -- If service type is LoadBalancer, the exposed protocol can either be "UDP", "TCP" or "UDP,TCP"
   protocol: "TCP"
 

From be86486abe9e4108d5796532ca67fbef1f3d4902 Mon Sep 17 00:00:00 2001
From: Costis <ccostis@gmail.com>
Date: Sat, 7 Dec 2024 21:24:33 +0200
Subject: [PATCH 04/19] README.md update

Signed-off-by: Costis <ccostis@gmail.com>
---
 charts/tempo/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo/README.md b/charts/tempo/README.md
index 717cf70c24..a8f2596d98 100644
--- a/charts/tempo/README.md
+++ b/charts/tempo/README.md
@@ -158,4 +158,4 @@ and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgra
 
 Upgrading from pre 0.7.0 will, by default, move your trace storage from `/tmp/tempo/traces` to `/var/tempo/traces`.
 This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the
-old folder to the new.
+old folder to the new.
\ No newline at end of file

From 369ef0108cccf3b2886e708f2794dd6b6b7ec449 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Wed, 10 Jul 2024 18:01:59 +0300
Subject: [PATCH 05/19] add option to deploy podmonitor and add option to
 remove svc

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/README.md                | 14 ++++++--
 .../tempo-vulture/templates/podmonitor.yaml   | 36 +++++++++++++++++++
 charts/tempo-vulture/templates/service.yaml   |  2 ++
 charts/tempo-vulture/values.yaml              | 23 ++++++++++--
 4 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 charts/tempo-vulture/templates/podmonitor.yaml

diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index def08a3b5d..00a4e0453b 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -64,9 +64,17 @@ tempoAddress:
 | nodeSelector | object | `{}` | Node selector for vulture pods |
 | podAnnotations | object | `{}` | Common annotations for all pods |
 | podLabels | object | `{}` | Common labels for all pods |
+| podMonitor.annotations | object | `{}` | PodMonitor annotations |
+| podMonitor.enabled | bool | `false` | If enabled, PodMonitor resources for Prometheus Operator are created |
+| podMonitor.interval | string | `nil` | PodMonitor scrape interval |
+| podMonitor.labels | object | `{}` | Additional PodMonitor labels |
+| podMonitor.namespace | string | `nil` | Alternative namespace for PodMonitor resources |
+| podMonitor.namespaceSelector | object | `{}` | Namespace selector for PodMonitor resources |
+| podMonitor.scrapeTimeout | string | `nil` | PodMonitor scrape timeout in Go duration format (e.g. 15s) |
 | replicas | int | `1` | Number of replicas of Tempo Vulture |
 | resources | object | `{}` | Resource requests and limits for the vulture |
 | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback |
+| service.enabled | bool | `true` |  |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
 | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account |
@@ -78,6 +86,6 @@ tempoAddress:
 | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources |
 | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources |
 | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
-| tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor |
-| tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
-| tolerations | list | `[]` | Tolerations for vulture pods |
\ No newline at end of file
+| tempoAddress.push | string | `"loo"` | the url towards your Tempo distributor, e.g. http://distributor |
+| tempoAddress.query | string | `";ll"` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
+| tolerations | list | `[]` | Tolerations for vulture pods |
diff --git a/charts/tempo-vulture/templates/podmonitor.yaml b/charts/tempo-vulture/templates/podmonitor.yaml
new file mode 100644
index 0000000000..96bca1c2c8
--- /dev/null
+++ b/charts/tempo-vulture/templates/podmonitor.yaml
@@ -0,0 +1,36 @@
+{{- with .Values.podMonitor}}
+{{- if .enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ include "tempo-vulture.fullname" $ }}
+  {{- with .namespace }}
+  namespace: {{ . }}
+  {{- end }}
+  {{- with .annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "tempo-vulture.labels" $ | nindent 4 }}
+    {{- with .labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- with .namespaceSelector }}
+  namespaceSelector:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "tempo-vulture.selectorLabels" $ | nindent 6 }}
+  podMetricsEndpoints:
+    - port: prom-metrics
+      {{- with .interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/tempo-vulture/templates/service.yaml b/charts/tempo-vulture/templates/service.yaml
index 706ca0b8be..e481f0a600 100644
--- a/charts/tempo-vulture/templates/service.yaml
+++ b/charts/tempo-vulture/templates/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.service.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,3 +18,4 @@ spec:
       name: prom-metrics
   selector:
     {{- include "tempo-vulture.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index def34f9d1c..5fb0d63f52 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -46,6 +46,8 @@ nodeSelector: {}
 # -- Tolerations for vulture pods
 tolerations: []
 
+service:
+  enabled: true
 
 serviceAccount:
   # -- Specifies whether a ServiceAccount should be created
@@ -75,8 +77,25 @@ serviceMonitor:
   # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s)
   scrapeTimeout: null
 
+# ServiceMonitor configuration
+podMonitor:
+  # -- If enabled, PodMonitor resources for Prometheus Operator are created
+  enabled: false
+  # -- Alternative namespace for PodMonitor resources
+  namespace: null
+  # -- Namespace selector for PodMonitor resources
+  namespaceSelector: {}
+  # -- PodMonitor annotations
+  annotations: {}
+  # -- Additional PodMonitor labels
+  labels: {}
+  # -- PodMonitor scrape interval
+  interval: null
+  # -- PodMonitor scrape timeout in Go duration format (e.g. 15s)
+  scrapeTimeout: null
+
 tempoAddress:
   # -- the url towards your Tempo distributor, e.g. http://distributor
-  push:
+  push: "loo"
   # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100
-  query:
+  query: ";ll"

From 5e7ed2ea61c966ff7df690d4bc91a86790345172 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Thu, 11 Jul 2024 20:43:58 +0300
Subject: [PATCH 06/19] fix values.yaml

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index 5fb0d63f52..0e0a26b0f0 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -96,6 +96,6 @@ podMonitor:
 
 tempoAddress:
   # -- the url towards your Tempo distributor, e.g. http://distributor
-  push: "loo"
+  push: ""
   # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100
-  query: ";ll"
+  query: ""

From 0572e217cf29dcc4e4bf0e17854983521dffa024 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Thu, 11 Jul 2024 20:46:07 +0300
Subject: [PATCH 07/19] fix docs

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index 00a4e0453b..b0c5a825ee 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -86,6 +86,6 @@ tempoAddress:
 | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources |
 | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources |
 | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
-| tempoAddress.push | string | `"loo"` | the url towards your Tempo distributor, e.g. http://distributor |
-| tempoAddress.query | string | `";ll"` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
+| tempoAddress.push | string | `""` | the url towards your Tempo distributor, e.g. http://distributor |
+| tempoAddress.query | string | `""` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
 | tolerations | list | `[]` | Tolerations for vulture pods |

From ba3dd271fb429092b32c0e8e406c4d1b9d464385 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Thu, 11 Jul 2024 21:09:48 +0300
Subject: [PATCH 08/19] fix docs and values

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/README.md   | 6 +++---
 charts/tempo-vulture/values.yaml | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index b0c5a825ee..fdb428f5b8 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -74,7 +74,7 @@ tempoAddress:
 | replicas | int | `1` | Number of replicas of Tempo Vulture |
 | resources | object | `{}` | Resource requests and limits for the vulture |
 | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback |
-| service.enabled | bool | `true` |  |
+| service.enabled | bool | `true` | Specifies whether a Service should be created |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
 | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account |
@@ -86,6 +86,6 @@ tempoAddress:
 | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources |
 | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources |
 | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
-| tempoAddress.push | string | `""` | the url towards your Tempo distributor, e.g. http://distributor |
-| tempoAddress.query | string | `""` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
+| tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor |
+| tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
 | tolerations | list | `[]` | Tolerations for vulture pods |
diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index 0e0a26b0f0..4838d14198 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -46,7 +46,9 @@ nodeSelector: {}
 # -- Tolerations for vulture pods
 tolerations: []
 
+
 service:
+  # -- Specifies whether a Service should be created
   enabled: true
 
 serviceAccount:
@@ -96,6 +98,6 @@ podMonitor:
 
 tempoAddress:
   # -- the url towards your Tempo distributor, e.g. http://distributor
-  push: ""
+  push:
   # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100
-  query: ""
+  query:

From efd62534c876350a6cc62626bcdb77da175300d4 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Sun, 14 Jul 2024 09:50:22 +0300
Subject: [PATCH 09/19] fix values.yaml

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index 4838d14198..3a38f4187d 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -79,7 +79,7 @@ serviceMonitor:
   # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s)
   scrapeTimeout: null
 
-# ServiceMonitor configuration
+# PodMonitor configuration
 podMonitor:
   # -- If enabled, PodMonitor resources for Prometheus Operator are created
   enabled: false

From 09b6f3344bf2a3efaa16e2e7143b8285a1759ffe Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Mon, 11 Nov 2024 19:37:55 +0200
Subject: [PATCH 10/19] bump chart version

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/Chart.yaml | 2 +-
 charts/tempo-vulture/README.md  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml
index d17e98aa08..b63938015d 100644
--- a/charts/tempo-vulture/Chart.yaml
+++ b/charts/tempo-vulture/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-vulture
 description: Grafana Tempo Vulture - A tool to monitor Tempo performance.
 type: application
-version: 0.7.0
+version: 0.7.1
 appVersion: 2.6.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index fdb428f5b8..484c0ba454 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -1,6 +1,6 @@
 # tempo-vulture
 
-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
+![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
 
 Grafana Tempo Vulture - A tool to monitor Tempo performance.
 
@@ -88,4 +88,4 @@ tempoAddress:
 | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
 | tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor |
 | tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
-| tolerations | list | `[]` | Tolerations for vulture pods |
+| tolerations | list | `[]` | Tolerations for vulture pods |
\ No newline at end of file

From bc26a753da1ca943d6803dbccf3610178b5e3aaa Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Tue, 3 Dec 2024 15:14:40 +0200
Subject: [PATCH 11/19] remove service

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/templates/service.yaml   | 21 -----------
 .../templates/servicemonitor.yaml             | 36 -------------------
 charts/tempo-vulture/values.yaml              | 21 -----------
 3 files changed, 78 deletions(-)
 delete mode 100644 charts/tempo-vulture/templates/service.yaml
 delete mode 100644 charts/tempo-vulture/templates/servicemonitor.yaml

diff --git a/charts/tempo-vulture/templates/service.yaml b/charts/tempo-vulture/templates/service.yaml
deleted file mode 100644
index e481f0a600..0000000000
--- a/charts/tempo-vulture/templates/service.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- if .Values.service.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "tempo-vulture.fullname" . }}
-  labels:
-    {{- include "tempo-vulture.labels" . | nindent 4 }}
-  {{- with .Values.annotations }}
-  annotations:
-    {{- toYaml . | indent 4 }}
-  {{- end }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: 8080
-      targetPort: prom-metrics
-      protocol: TCP
-      name: prom-metrics
-  selector:
-    {{- include "tempo-vulture.selectorLabels" . | nindent 4 }}
-{{- end }}
diff --git a/charts/tempo-vulture/templates/servicemonitor.yaml b/charts/tempo-vulture/templates/servicemonitor.yaml
deleted file mode 100644
index 2a4dfe20e7..0000000000
--- a/charts/tempo-vulture/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-{{- with .Values.serviceMonitor }}
-{{- if .enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "tempo-vulture.fullname" $ }}
-  {{- with .namespace }}
-  namespace: {{ . }}
-  {{- end }}
-  {{- with .annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "tempo-vulture.labels" $ | nindent 4 }}
-    {{- with .labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  {{- with .namespaceSelector }}
-  namespaceSelector:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "tempo-vulture.selectorLabels" $ | nindent 6 }}
-  endpoints:
-    - port: prom-metrics
-      {{- with .interval }}
-      interval: {{ . }}
-      {{- end }}
-      {{- with .scrapeTimeout }}
-      scrapeTimeout: {{ . }}
-      {{- end }}
-{{- end }}
-{{- end }}
diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml
index 3a38f4187d..cf9904ad9b 100644
--- a/charts/tempo-vulture/values.yaml
+++ b/charts/tempo-vulture/values.yaml
@@ -47,10 +47,6 @@ nodeSelector: {}
 tolerations: []
 
 
-service:
-  # -- Specifies whether a Service should be created
-  enabled: true
-
 serviceAccount:
   # -- Specifies whether a ServiceAccount should be created
   create: true
@@ -62,23 +58,6 @@ serviceAccount:
   # -- Annotations for the service account
   annotations: {}
 
-# ServiceMonitor configuration
-serviceMonitor:
-  # -- If enabled, ServiceMonitor resources for Prometheus Operator are created
-  enabled: false
-  # -- Alternative namespace for ServiceMonitor resources
-  namespace: null
-  # -- Namespace selector for ServiceMonitor resources
-  namespaceSelector: {}
-  # -- ServiceMonitor annotations
-  annotations: {}
-  # -- Additional ServiceMonitor labels
-  labels: {}
-  # -- ServiceMonitor scrape interval
-  interval: null
-  # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s)
-  scrapeTimeout: null
-
 # PodMonitor configuration
 podMonitor:
   # -- If enabled, PodMonitor resources for Prometheus Operator are created

From 169b6cc73e93015684a0356312965d5e876a5dde Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Tue, 3 Dec 2024 15:17:00 +0200
Subject: [PATCH 12/19] update readme

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-vulture/README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
index 484c0ba454..d685f1eff4 100644
--- a/charts/tempo-vulture/README.md
+++ b/charts/tempo-vulture/README.md
@@ -74,18 +74,10 @@ tempoAddress:
 | replicas | int | `1` | Number of replicas of Tempo Vulture |
 | resources | object | `{}` | Resource requests and limits for the vulture |
 | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback |
-| service.enabled | bool | `true` | Specifies whether a Service should be created |
 | serviceAccount.annotations | object | `{}` | Annotations for the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
 | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account |
 | serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template |
-| serviceMonitor.annotations | object | `{}` | ServiceMonitor annotations |
-| serviceMonitor.enabled | bool | `false` | If enabled, ServiceMonitor resources for Prometheus Operator are created |
-| serviceMonitor.interval | string | `nil` | ServiceMonitor scrape interval |
-| serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels |
-| serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources |
-| serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources |
-| serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) |
 | tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor |
 | tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 |
 | tolerations | list | `[]` | Tolerations for vulture pods |
\ No newline at end of file

From c64470b2c01ee5876f31fd1efc7653f7c13342f9 Mon Sep 17 00:00:00 2001
From: javiermolinar <javiermolinar@live.com>
Date: Tue, 3 Dec 2024 10:17:01 +0100
Subject: [PATCH 13/19] fix multiline template for
 ingester.zoneAwareReplicationMap helper

Signed-off-by: javiermolinar <javiermolinar@live.com>
---
 .../templates/ingester/_helpers-ingester.tpl           | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl
index 4d417ada2c..f7018f507c 100644
--- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl
+++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl
@@ -13,12 +13,10 @@
 {{- $requestedReplicas := .ctx.Values.ingester.replicas -}}
 {{- $replicaPerZone := div (add $requestedReplicas $numberOfZones -1) $numberOfZones -}}
 {{- range $idx, $rolloutZone := .ctx.Values.ingester.zoneAwareReplication.zones -}}
-{{- $_ := set $zonesMap $rolloutZone.name (dict
-"affinity" (($rolloutZone.extraAffinity | default (dict)) | mergeOverwrite (include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml))
-"nodeSelector" ($rolloutZone.nodeSelector | default (dict) )
-"replicas" $replicaPerZone
-"storageClass" $rolloutZone.storageClass
-) -}}
+{{- $extraAffinity := $rolloutZone.extraAffinity | default (dict) -}}
+{{- $zoneAntiAffinity := include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml -}}
+{{- $mergedAffinity := mergeOverwrite $extraAffinity $zoneAntiAffinity -}}
+{{- $_ := set $zonesMap $rolloutZone.name (dict "affinity" $mergedAffinity "nodeSelector" ($rolloutZone.nodeSelector | default (dict)) "replicas" $replicaPerZone  "storageClass" $rolloutZone.storageClass) -}}
 {{- end -}}
 {{- else -}}
 {{- $_ := set $zonesMap "" $defaultZone -}}

From d469c5d33dd15ecc41feda0204e7687e752a2ed3 Mon Sep 17 00:00:00 2001
From: javiermolinar <javiermolinar@live.com>
Date: Tue, 3 Dec 2024 10:25:59 +0100
Subject: [PATCH 14/19] bump version

Signed-off-by: javiermolinar <javiermolinar@live.com>
---
 charts/tempo-distributed/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 0243393e28..af2a1860b6 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.23.1
+version: 1.23.2
 appVersion: 2.6.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

From 147f2f96b5bd0c856160c0496856c1827dc61467 Mon Sep 17 00:00:00 2001
From: Charles Korn <charles.korn@grafana.com>
Date: Fri, 29 Nov 2024 15:32:07 +1100
Subject: [PATCH 15/19] Update rollout-operator chart with latest version

Signed-off-by: Charles Korn <charles.korn@grafana.com>
---
 charts/rollout-operator/Chart.yaml | 4 ++--
 charts/rollout-operator/README.md  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml
index a10b1fda30..cca369dbff 100644
--- a/charts/rollout-operator/Chart.yaml
+++ b/charts/rollout-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: rollout-operator
 description: "Grafana rollout-operator"
 type: application
-version: 0.20.0
-appVersion: v0.20.0
+version: 0.21.0
+appVersion: v0.21.0
 home: https://github.com/grafana/rollout-operator
 kubeVersion: ^1.10.0-0
diff --git a/charts/rollout-operator/README.md b/charts/rollout-operator/README.md
index ddf1d17235..372e793841 100644
--- a/charts/rollout-operator/README.md
+++ b/charts/rollout-operator/README.md
@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r
 
 # rollout-operator
 
-![Version: 0.20.0](https://img.shields.io/badge/Version-0.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.20.0](https://img.shields.io/badge/AppVersion-v0.20.0-informational?style=flat-square)
+![Version: 0.21.0](https://img.shields.io/badge/Version-0.21.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.21.0](https://img.shields.io/badge/AppVersion-v0.21.0-informational?style=flat-square)
 
 Grafana rollout-operator
 

From cb2811fac9dda1fbce79bc2a953de46d7879a922 Mon Sep 17 00:00:00 2001
From: javiermolinar <javiermolinar@live.com>
Date: Tue, 3 Dec 2024 10:31:28 +0100
Subject: [PATCH 16/19] docs

Signed-off-by: javiermolinar <javiermolinar@live.com>
---
 charts/tempo-distributed/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index ef5fb9f82b..9e88500824 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.23.1](https://img.shields.io/badge/Version-1.23.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)
+![Version: 1.23.2](https://img.shields.io/badge/Version-1.23.2-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
 

From f03281406517b15b0ee9e33c5424f0569a4e7629 Mon Sep 17 00:00:00 2001
From: Costis <ccostis@gmail.com>
Date: Tue, 10 Dec 2024 01:47:01 +0200
Subject: [PATCH 17/19] bump version in Chart.yaml

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

diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml
index b12a1c9757..6fe3bb9f57 100644
--- a/charts/tempo/Chart.yaml
+++ b/charts/tempo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo
 description: Grafana Tempo Single Binary Mode
 type: application
-version: 1.14.0
+version: 1.15.0
 appVersion: 2.6.1
 engine: gotpl
 home: https://grafana.net
diff --git a/charts/tempo/README.md b/charts/tempo/README.md
index a8f2596d98..5c99822194 100644
--- a/charts/tempo/README.md
+++ b/charts/tempo/README.md
@@ -1,6 +1,6 @@
 # tempo
 
-![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
+![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.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
 
 Grafana Tempo Single Binary Mode
 

From fd9dc696f35e1caee142c9f97dcfa277be952095 Mon Sep 17 00:00:00 2001
From: Costis <ccostis@gmail.com>
Date: Tue, 10 Dec 2024 02:24:09 +0200
Subject: [PATCH 18/19] Resolve version conflict

Signed-off-by: Costis <ccostis@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 af2a1860b6..47af96cb38 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.23.2
+version: 1.24.0
 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 9e88500824..d0982791db 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.23.2](https://img.shields.io/badge/Version-1.23.2-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.24.0](https://img.shields.io/badge/Version-1.23.2-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
 

From 181e3aaa8543db305d89ac5aa46c8112cfb5be47 Mon Sep 17 00:00:00 2001
From: Costis <ccostis@gmail.com>
Date: Tue, 10 Dec 2024 02:30:30 +0200
Subject: [PATCH 19/19] Resolve version conflict

Signed-off-by: Costis <ccostis@gmail.com>
---
 charts/tempo-distributed/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index d0982791db..91fc70bc2d 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.24.0](https://img.shields.io/badge/Version-1.23.2-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.24.0](https://img.shields.io/badge/Version-1.24.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)
 
 Grafana Tempo in MicroService mode