From 6d17b3fccc459f3f0490d046981a7b7528c266ca Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Tue, 26 Mar 2024 17:32:11 +0200
Subject: [PATCH 01/24] [tempo-distributed]: add action to to relable

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
---
 charts/tempo-distributed/templates/lib/service-monitor.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/templates/lib/service-monitor.tpl b/charts/tempo-distributed/templates/lib/service-monitor.tpl
index a068dff4a4..896110f61b 100644
--- a/charts/tempo-distributed/templates/lib/service-monitor.tpl
+++ b/charts/tempo-distributed/templates/lib/service-monitor.tpl
@@ -47,7 +47,8 @@ spec:
       scrapeTimeout: {{ . }}
       {{- end }}
       relabelings:
-        - sourceLabels: [job]
+        - action: replace
+          sourceLabels: [job]
           replacement: "{{ $.ctx.Release.Namespace }}/{{ $.component }}"
           targetLabel: job
         {{- if kindIs "string" .clusterLabel }}

From 9f4977690ec32a652182352c45773279c4f3c499 Mon Sep 17 00:00:00 2001
From: AvivGuiser <avivguiser@gmail.com>
Date: Tue, 26 Mar 2024 17:35:21 +0200
Subject: [PATCH 02/24] [tempo-distributed]: bump chart version

Signed-off-by: AvivGuiser <avivguiser@gmail.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 1e0da083bd..e9936a850e 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.9.0
+version: 1.9.1
 appVersion: 2.4.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

From eb62f384704453389d96d5758563b65289515291 Mon Sep 17 00:00:00 2001
From: Gritzko Daniel Kleiner <ext.gritzko.kleiner@dafiti.com.br>
Date: Sun, 31 Mar 2024 16:32:02 +0200
Subject: [PATCH 03/24] chore: related issues:

- #2558
- #2493
- #1391
- #2126

Signed-off-by: Gritzko Daniel Kleiner <ext.gritzko.kleiner@dafiti.com.br>
---
 charts/grafana/Chart.yaml             |  2 +-
 charts/grafana/templates/_helpers.tpl | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index ab3f6a3636..7127c28b43 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 7.3.7
+version: 7.3.8
 appVersion: 10.4.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/charts/grafana/templates/_helpers.tpl b/charts/grafana/templates/_helpers.tpl
index 790d5a293a..570b92742c 100644
--- a/charts/grafana/templates/_helpers.tpl
+++ b/charts/grafana/templates/_helpers.tpl
@@ -145,13 +145,11 @@ Return the appropriate apiVersion for ingress.
 Return the appropriate apiVersion for Horizontal Pod Autoscaler.
 */}}
 {{- define "grafana.hpa.apiVersion" -}}
-{{- if $.Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
-{{- print "autoscaling/v2" }}
-{{- else if $.Capabilities.APIVersions.Has "autoscaling/v2beta2/HorizontalPodAutoscaler" }}
-{{- print "autoscaling/v2beta2" }}
-{{- else }}
-{{- print "autoscaling/v2beta1" }}
-{{- end }}
+ {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+    {{- "autoscaling/v2" }}
+  {{- else }}
+    {{- "autoscaling/v2beta2" }}
+  {{- end }}
 {{- end }}
 
 {{/*

From 32ac08b9dd50f16d0a544f754f739089bac398fc Mon Sep 17 00:00:00 2001
From: Gritzko Daniel Kleiner <ext.gritzko.kleiner@dafiti.com.br>
Date: Tue, 9 Apr 2024 08:33:06 -0300
Subject: [PATCH 04/24] include review suggested by @zanhsieh

Signed-off-by: Gritzko Daniel Kleiner <ext.gritzko.kleiner@dafiti.com.br>
---
 charts/grafana/templates/_helpers.tpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/grafana/templates/_helpers.tpl b/charts/grafana/templates/_helpers.tpl
index 570b92742c..f3ebc37c93 100644
--- a/charts/grafana/templates/_helpers.tpl
+++ b/charts/grafana/templates/_helpers.tpl
@@ -145,11 +145,11 @@ Return the appropriate apiVersion for ingress.
 Return the appropriate apiVersion for Horizontal Pod Autoscaler.
 */}}
 {{- define "grafana.hpa.apiVersion" -}}
- {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}
-    {{- "autoscaling/v2" }}
-  {{- else }}
-    {{- "autoscaling/v2beta2" }}
-  {{- end }}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}  
+{{- print "autoscaling/v2" }}  
+{{- else }}  
+{{- print "autoscaling/v2beta2" }}  
+{{- end }} 
 {{- end }}
 
 {{/*

From 5b6794a6647f8714155c9e22829d78feff7dfc32 Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Tue, 2 Apr 2024 12:13:54 +1100
Subject: [PATCH 05/24] fixing imagePullSecrets for enterprise components

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.com>
---
 .../templates/admin-api/_helpers.tpl          |  7 +++++++
 .../templates/admin-api/admin-api-dep.yaml    |  7 +------
 .../templates/enterprise-gateway/_helpers.tpl |  8 ++++++++
 .../enterprise-gateway/gateway-dep.yaml       |  7 +------
 charts/tempo-distributed/values.yaml          | 20 +++++++++++++++++++
 5 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 charts/tempo-distributed/templates/admin-api/_helpers.tpl

diff --git a/charts/tempo-distributed/templates/admin-api/_helpers.tpl b/charts/tempo-distributed/templates/admin-api/_helpers.tpl
new file mode 100644
index 0000000000..0400e2aabd
--- /dev/null
+++ b/charts/tempo-distributed/templates/admin-api/_helpers.tpl
@@ -0,0 +1,7 @@
+{{/*
+adminApi imagePullSecrets
+*/}}
+{{- define "tempo.adminApiImagePullSecrets" -}}
+{{- $dict := dict "tempo" .Values.tempo.image "component" .Values.adminApi.image "global" .Values.global.image -}}
+{{- include "tempo.adminApiImagePullSecrets" $dict -}}
+{{- end }}
diff --git a/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml b/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml
index 469417a506..ae0d733c33 100644
--- a/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml
+++ b/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml
@@ -37,12 +37,7 @@ spec:
         {{- with .Values.adminApi.initContainers }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-      {{- if .Values.tempo.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
+      {{- include "tempo.adminApiImagePullSecrets" . | nindent 6 -}}
       {{- with .Values.adminApi.hostAliases }}
       hostAliases:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl b/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl
index 2b25560845..8205976c09 100644
--- a/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl
+++ b/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl
@@ -31,3 +31,11 @@ Return if ingress supports pathType.
 {{- define "tempo.ingress.supportsPathType" -}}
   {{- or (eq (include "tempo.ingress.isStable" .) "true") (and (eq (include "tempo.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) -}}
 {{- end -}}
+
+{{/*
+enterpriseGateway imagePullSecrets
+*/}}
+{{- define "tempo.enterpriseGatewayImagePullSecrets" -}}
+{{- $dict := dict "tempo" .Values.tempo.image "component" .Values.enterpriseGateway.image "global" .Values.global.image -}}
+{{- include "tempo.enterpriseGatewayImagePullSecrets" $dict -}}
+{{- end }}
diff --git a/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml b/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml
index 011322ddfc..0da57a1548 100644
--- a/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml
+++ b/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml
@@ -35,12 +35,7 @@ spec:
         {{- toYaml .Values.enterpriseGateway.securityContext | nindent 8 }}
       initContainers:
         {{- toYaml .Values.enterpriseGateway.initContainers | nindent 8 }}
-      {{- if .Values.tempo.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
+      {{- include "tempo.enterpriseGatewayImagePullSecrets" . | nindent 6 -}}
       {{- with .Values.enterpriseGateway.hostAliases }}
       hostAliases:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 1a5c825f50..f3b080decd 100644
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -1920,6 +1920,16 @@ adminApi:
     annotations: {}
     labels: {}
 
+  image:
+    # -- The Docker registry for the adminApi image. Overrides `tempo.image.registry`
+    registry: null
+    # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets`
+    pullSecrets: []
+    # -- Docker image repository for the adminApi image. Overrides `tempo.image.repository`
+    repository: null
+    # -- Docker image tag for the adminApi image. Overrides `tempo.image.tag`
+    tag: null
+
   initContainers: []
 
   strategy:
@@ -2007,6 +2017,16 @@ enterpriseGateway:
   #    hostnames:
   #      - domain.tld
 
+  image:
+    # -- The Docker registry for the enterpriseGateway image. Overrides `tempo.image.registry`
+    registry: null
+    # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets`
+    pullSecrets: []
+    # -- Docker image repository for the enterpriseGateway image. Overrides `tempo.image.repository`
+    repository: null
+    # -- Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag`
+    tag: null
+
   annotations: {}
   service:
     annotations: {}

From 0d12d217a9cd55c51d75b7aa17c6a193f15655ca Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Wed, 3 Apr 2024 11:36:52 +1100
Subject: [PATCH 06/24] Ran helm-docs on tempo-distributed

The config overrides from the values.yml need to be added to the README.md to ensure up-to-date documentation for charts.

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.com>
---
 charts/tempo-distributed/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 02f86079f6..66360c152b 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -223,6 +223,10 @@ The memcached default args are removed and should be provided manually. The sett
 | adminApi.extraVolumeMounts | list | `[]` |  |
 | adminApi.extraVolumes | list | `[]` |  |
 | adminApi.hostAliases | list | `[]` | hostAliases to add |
+| adminApi.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` |
+| adminApi.image.registry | string | `nil` | The Docker registry for the adminApi image. Overrides `tempo.image.registry` |
+| adminApi.image.repository | string | `nil` | Docker image repository for the adminApi image. Overrides `tempo.image.repository` |
+| adminApi.image.tag | string | `nil` | Docker image tag for the adminApi image. Overrides `tempo.image.tag` |
 | adminApi.initContainers | list | `[]` |  |
 | adminApi.nodeSelector | object | `{}` |  |
 | adminApi.persistence.subPath | string | `nil` |  |
@@ -369,6 +373,10 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseGateway.extraVolumeMounts | list | `[]` |  |
 | enterpriseGateway.extraVolumes | list | `[]` |  |
 | enterpriseGateway.hostAliases | list | `[]` | hostAliases to add |
+| enterpriseGateway.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` |
+| enterpriseGateway.image.registry | string | `nil` | The Docker registry for the enterpriseGateway image. Overrides `tempo.image.registry` |
+| enterpriseGateway.image.repository | string | `nil` | Docker image repository for the enterpriseGateway image. Overrides `tempo.image.repository` |
+| enterpriseGateway.image.tag | string | `nil` | Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag` |
 | enterpriseGateway.ingress.annotations | object | `{}` | Annotations for the gateway ingress |
 | enterpriseGateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the gateway should be created |
 | enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.gem.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress |

From c24f8cb67a6c25945bf339e5eb007bd7d934cac0 Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Wed, 3 Apr 2024 11:40:34 +1100
Subject: [PATCH 07/24] updating version in chart.yaml

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.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 ebf70e588a..41429d7631 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.9.1
+version: 1.9.2
 appVersion: 2.4.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

From d739d7e412d7da26eb4039353fb6fc9e0fc1dfd7 Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Wed, 17 Apr 2024 19:34:56 +1000
Subject: [PATCH 08/24] Update README and chart to match recent patch bump

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.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 41429d7631..4153f810d7 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.9.2
+version: 1.9.3
 appVersion: 2.4.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 66360c152b..d04e83c501 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.1](https://img.shields.io/badge/Version-1.9.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.2](https://img.shields.io/badge/Version-1.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

From 24b1b912982860cf1de241cbb53776647db9d02d Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Fri, 19 Apr 2024 12:24:59 +1000
Subject: [PATCH 09/24] Adding image pull secrets support to tokengenJob

Adding standardised imagepullsecrets support to tokengenJob

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.com>
---
 charts/tempo-distributed/README.md                       | 6 +++++-
 .../tempo-distributed/templates/admin-api/_helpers.tpl   | 2 +-
 .../templates/enterprise-gateway/_helpers.tpl            | 2 +-
 .../tempo-distributed/templates/tokengen/__helpers.tpl   | 7 +++++++
 .../templates/tokengen/tokengen-job.yaml                 | 7 +------
 charts/tempo-distributed/values.yaml                     | 9 +++++++++
 6 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 charts/tempo-distributed/templates/tokengen/__helpers.tpl

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index d04e83c501..876059ccfe 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.2](https://img.shields.io/badge/Version-1.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.3](https://img.shields.io/badge/Version-1.9.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -780,6 +780,10 @@ The memcached default args are removed and should be provided manually. The sett
 | tokengenJob.extraArgs | object | `{}` |  |
 | tokengenJob.extraEnvFrom | list | `[]` |  |
 | tokengenJob.hostAliases | list | `[]` | hostAliases to add |
+| tokengenJob.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` |
+| tokengenJob.image.registry | string | `nil` | The Docker registry for the tokengenJob image. Overrides `tempo.image.registry` |
+| tokengenJob.image.repository | string | `nil` | Docker image repository for the tokengenJob image. Overrides `tempo.image.repository` |
+| tokengenJob.image.tag | string | `nil` | Docker image tag for the tokengenJob image. Overrides `tempo.image.tag` |
 | tokengenJob.initContainers | list | `[]` |  |
 | traces.jaeger.grpc.enabled | bool | `false` | Enable Tempo to ingest Jaeger GRPC traces |
 | traces.jaeger.grpc.receiverConfig | object | `{}` | Jaeger GRPC receiver config |
diff --git a/charts/tempo-distributed/templates/admin-api/_helpers.tpl b/charts/tempo-distributed/templates/admin-api/_helpers.tpl
index 0400e2aabd..3b72a6633d 100644
--- a/charts/tempo-distributed/templates/admin-api/_helpers.tpl
+++ b/charts/tempo-distributed/templates/admin-api/_helpers.tpl
@@ -3,5 +3,5 @@ adminApi imagePullSecrets
 */}}
 {{- define "tempo.adminApiImagePullSecrets" -}}
 {{- $dict := dict "tempo" .Values.tempo.image "component" .Values.adminApi.image "global" .Values.global.image -}}
-{{- include "tempo.adminApiImagePullSecrets" $dict -}}
+{{- include "tempo.imagePullSecrets" $dict -}}
 {{- end }}
diff --git a/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl b/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl
index 8205976c09..cb030eee62 100644
--- a/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl
+++ b/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl
@@ -37,5 +37,5 @@ enterpriseGateway imagePullSecrets
 */}}
 {{- define "tempo.enterpriseGatewayImagePullSecrets" -}}
 {{- $dict := dict "tempo" .Values.tempo.image "component" .Values.enterpriseGateway.image "global" .Values.global.image -}}
-{{- include "tempo.enterpriseGatewayImagePullSecrets" $dict -}}
+{{- include "tempo.imagePullSecrets" $dict -}}
 {{- end }}
diff --git a/charts/tempo-distributed/templates/tokengen/__helpers.tpl b/charts/tempo-distributed/templates/tokengen/__helpers.tpl
new file mode 100644
index 0000000000..f23d971c38
--- /dev/null
+++ b/charts/tempo-distributed/templates/tokengen/__helpers.tpl
@@ -0,0 +1,7 @@
+{{/*
+tokengen-job imagePullSecrets
+*/}}
+{{- define "tempo.tokengenJobImagePullSecrets" -}}
+{{- $dict := dict "tempo" .Values.tempo.image "component" .Values.tokengenJob.image "global" .Values.global.image -}}
+{{- include "tempo.imagePullSecrets" $dict -}}
+{{- end }}
diff --git a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
index b73c699031..c516237ab5 100644
--- a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
+++ b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
@@ -33,12 +33,7 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.tokengenJob.securityContext | nindent 8 }}
-      {{- if .Values.tempo.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.tempo.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
+      {{- include "tempo.tokengenJobImagePullSecrets" . | nindent 6 -}}
       {{- with .Values.tokengenJob.hostAliases }}
       hostAliases:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index f3b080decd..5ad5a5faa8 100644
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -1900,6 +1900,15 @@ tokengenJob:
   env: []
   extraEnvFrom: []
   annotations: {}
+  image:
+    # -- The Docker registry for the tokengenJob image. Overrides `tempo.image.registry`
+    registry: null
+    # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets`
+    pullSecrets: []
+    # -- Docker image repository for the tokengenJob image. Overrides `tempo.image.repository`
+    repository: null
+    # -- Docker image tag for the tokengenJob image. Overrides `tempo.image.tag`
+    tag: null
   initContainers: []
   # -- The SecurityContext for tokenjobgen containers
   containerSecurityContext:

From 3acbc5d03830bf750808d58966f9a38656fcb978 Mon Sep 17 00:00:00 2001
From: Gritzko Daniel Kleiner <ext.gritzko.kleiner@dafiti.com.br>
Date: Fri, 19 Apr 2024 10:30:46 -0300
Subject: [PATCH 10/24] bumb chart version

Signed-off-by: Gritzko Daniel Kleiner <ext.gritzko.kleiner@dafiti.com.br>
---
 charts/grafana/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index efd3bd081c..167bdf17a8 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 7.3.9
+version: 7.3.8
 appVersion: 10.4.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

From 6db205c65da69139b3740a215394f8c98e1b4eb5 Mon Sep 17 00:00:00 2001
From: Gritzko Daniel Kleiner <ext.gritzko.kleiner@dafiti.com.br>
Date: Fri, 19 Apr 2024 10:31:29 -0300
Subject: [PATCH 11/24] fix: chart bumb

Signed-off-by: Gritzko Daniel Kleiner <ext.gritzko.kleiner@dafiti.com.br>
---
 charts/grafana/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index 167bdf17a8..3e9fcac6f2 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 7.3.8
+version: 7.3.10
 appVersion: 10.4.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

From c38312a69a8b891638c796965a96b015a5936f45 Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Sun, 21 Apr 2024 12:48:14 +1000
Subject: [PATCH 12/24] version bump to 1.9.4

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.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 4153f810d7..f80191dac5 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.9.3
+version: 1.9.4
 appVersion: 2.4.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 5feec2a1e5..a4bbdc85b7 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.3](https://img.shields.io/badge/Version-1.9.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.4](https://img.shields.io/badge/Version-1.9.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

From ff0df54487dd598e9b3b9735f5afe7a887f10d8f Mon Sep 17 00:00:00 2001
From: Zach Leslie <zach.leslie@grafana.com>
Date: Thu, 11 Apr 2024 13:31:41 +0000
Subject: [PATCH 13/24] [tempo-distributed] add initContainers to generator and
 ingester sts for future UID change

Signed-off-by: Zach Leslie <zach.leslie@grafana.com>
---
 charts/tempo-distributed/README.md                            | 4 +++-
 .../templates/ingester/statefulset-ingester.yaml              | 2 ++
 .../metrics-generator/statefulset-metrics-generator.yaml      | 2 ++
 charts/tempo-distributed/values.yaml                          | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index a4bbdc85b7..e06a21e4a7 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.4](https://img.shields.io/badge/Version-1.9.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.3](https://img.shields.io/badge/Version-1.9.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -502,6 +502,7 @@ The memcached default args are removed and should be provided manually. The sett
 | ingester.image.registry | string | `nil` | The Docker registry for the ingester image. Overrides `tempo.image.registry` |
 | ingester.image.repository | string | `nil` | Docker image repository for the ingester image. Overrides `tempo.image.repository` |
 | ingester.image.tag | string | `nil` | Docker image tag for the ingester image. Overrides `tempo.image.tag` |
+| ingester.initContainers | list | `[]` |  |
 | ingester.nodeSelector | object | `{}` | Node selector for ingester pods |
 | ingester.persistence.annotations | object | `{}` | Annotations for ingester's persist volume claim |
 | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper |
@@ -599,6 +600,7 @@ The memcached default args are removed and should be provided manually. The sett
 | metricsGenerator.image.registry | string | `nil` | The Docker registry for the metrics-generator image. Overrides `tempo.image.registry` |
 | metricsGenerator.image.repository | string | `nil` | Docker image repository for the metrics-generator image. Overrides `tempo.image.repository` |
 | metricsGenerator.image.tag | string | `nil` | Docker image tag for the metrics-generator image. Overrides `tempo.image.tag` |
+| metricsGenerator.initContainers | list | `[]` |  |
 | metricsGenerator.kind | string | `"Deployment"` | Kind of deployment [StatefulSet/Deployment] |
 | metricsGenerator.nodeSelector | object | `{}` | Node selector for metrics-generator pods |
 | metricsGenerator.persistence | object | `{"annotations":{},"enabled":false,"size":"10Gi","storageClass":null}` | Persistence configuration for metrics-generator |
diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
index 79abf99e9c..de84ca588b 100644
--- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
+++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
@@ -55,6 +55,8 @@ spec:
       hostAliases:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      initContainers:
+        {{- toYaml .Values.ingester.initContainers | nindent 8 }}
       containers:
         - args:
             - -target=ingester
diff --git a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml
index 286e68c37e..02e330eda6 100644
--- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml
+++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml
@@ -55,6 +55,8 @@ spec:
       hostAliases:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      initContainers:
+        {{- toYaml .Values.metricsGenerator.initContainers | nindent 8 }}
       containers:
         - args:
             - -target=metrics-generator
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 5fb7e4290d..f3126609c2 100644
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -112,6 +112,7 @@ ingester:
   #  - ip: 1.2.3.4
   #    hostnames:
   #      - domain.tld
+  initContainers: []
   autoscaling:
     # -- Enable autoscaling for the ingester. WARNING: Autoscaling ingesters can result in lost data. Only do this if you know what you're doing.
     enabled: false
@@ -239,6 +240,7 @@ metricsGenerator:
   #  - ip: 1.2.3.4
   #    hostnames:
   #      - domain.tld
+  initContainers: []
   image:
     # -- The Docker registry for the metrics-generator image. Overrides `tempo.image.registry`
     registry: null

From 70ee8298947aa0b18027fac302ecbcbe8f822db4 Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Wed, 17 Apr 2024 19:34:56 +1000
Subject: [PATCH 14/24] Update README and chart to match recent patch bump

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.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 e06a21e4a7..73cfa4ae95 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.3](https://img.shields.io/badge/Version-1.9.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.2](https://img.shields.io/badge/Version-1.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

From b190f33a8cb2fe84bb84e3b266b92008e52497c9 Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Tue, 23 Apr 2024 07:44:59 +1000
Subject: [PATCH 15/24] fixed up README version

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.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 e06a21e4a7..ad6947fced 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.3](https://img.shields.io/badge/Version-1.9.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.4](https://img.shields.io/badge/Version-1.94-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

From 3387fc538bf75cbf0c353f8c5969048db596d858 Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Tue, 23 Apr 2024 08:28:42 +1000
Subject: [PATCH 16/24] fixed up README version

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.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 ad6947fced..7418d0a137 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.4](https://img.shields.io/badge/Version-1.94-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.4](https://img.shields.io/badge/Version-1.9.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

From 3f4a3d5efe50be832fa7c14ce132ab3b4cd0cf36 Mon Sep 17 00:00:00 2001
From: MH <zanhsieh@gmail.com>
Date: Wed, 1 May 2024 20:50:05 +0800
Subject: [PATCH 17/24] Update README.md

---
 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 7418d0a137..c74b45a53f 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.4](https://img.shields.io/badge/Version-1.9.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.5](https://img.shields.io/badge/Version-1.9.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

From bcc6ecfdd933b4801bae6beff1568097c87f6fcf Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Fri, 3 May 2024 15:35:34 +1000
Subject: [PATCH 18/24] fix invalid selector configuration for tokengenjob

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.com>
---
 charts/tempo-distributed/Chart.yaml                           | 2 +-
 charts/tempo-distributed/README.md                            | 2 +-
 charts/tempo-distributed/templates/tokengen/tokengen-job.yaml | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 81d86e75fc..92117a4c59 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.9.5
+version: 1.9.6
 appVersion: 2.4.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index c74b45a53f..395f3f5d8c 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.5](https://img.shields.io/badge/Version-1.9.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.6](https://img.shields.io/badge/Version-1.9.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
diff --git a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
index c516237ab5..8e727e9d57 100644
--- a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
+++ b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
@@ -18,6 +18,8 @@ spec:
   completions: 1
   parallelism: 1
   selector:
+    matchLabels:
+      {{- include "tempo.selectorLabels" $dict | nindent 6 }}
   template:
     metadata:
       labels:

From 90ed5301175ff0714070587d1e6c8d91eb166ad4 Mon Sep 17 00:00:00 2001
From: Joe Elliott <number101010@gmail.com>
Date: Fri, 3 May 2024 14:38:22 -0400
Subject: [PATCH 19/24] remove example name

Signed-off-by: Joe Elliott <number101010@gmail.com>
---
 charts/tempo-distributed/README.md        | 2 +-
 charts/tempo-distributed/README.md.gotmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 395f3f5d8c..05928f27b1 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -924,7 +924,7 @@ config: |
       backend: s3
       s3:
         access_key: tempo
-        bucket: tempo
+        bucket: <your s3 bucket>
         endpoint: minio:9000
         insecure: true
         secret_key: supersecret
diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl
index 72219e0359..446c654362 100644
--- a/charts/tempo-distributed/README.md.gotmpl
+++ b/charts/tempo-distributed/README.md.gotmpl
@@ -323,7 +323,7 @@ config: |
       backend: s3
       s3:
         access_key: tempo
-        bucket: tempo
+        bucket: <your s3 bucket>
         endpoint: minio:9000
         insecure: true
         secret_key: supersecret

From 2f5503153ec965c2a5796f4e41e17e4f672e153b Mon Sep 17 00:00:00 2001
From: Joe Elliott <number101010@gmail.com>
Date: Fri, 3 May 2024 14:39:22 -0400
Subject: [PATCH 20/24] remove bucket from comment

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

diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml
index e0a521d8e3..f19418fb52 100644
--- a/charts/tempo/values.yaml
+++ b/charts/tempo/values.yaml
@@ -66,7 +66,7 @@ tempo:
       # backend: s3
       # store traces in s3
       # s3:
-      #   bucket: tempo                                   # store traces in this bucket
+      #   bucket: <your s3 bucket>                        # store traces in this bucket
       #   endpoint: s3.dualstack.us-east-2.amazonaws.com  # api endpoint
       #   access_key: ...                                 # optional. access key when using static credentials.
       #   secret_key: ...                                 # optional. secret key when using static credentials.

From 8fe010ce1b5a9eabfb0c9e8a133eb604aa581a24 Mon Sep 17 00:00:00 2001
From: Joe Elliott <number101010@gmail.com>
Date: Mon, 6 May 2024 08:07:12 -0400
Subject: [PATCH 21/24] bump version

Signed-off-by: Joe Elliott <number101010@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 104e2126c5..5dfa24f2e6 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.7.2
+version: 1.7.3
 appVersion: 2.3.1
 engine: gotpl
 home: https://grafana.net
diff --git a/charts/tempo/README.md b/charts/tempo/README.md
index 9e61f7a23b..07321130fd 100644
--- a/charts/tempo/README.md
+++ b/charts/tempo/README.md
@@ -1,6 +1,6 @@
 # tempo
 
-![Version: 1.7.2](https://img.shields.io/badge/Version-1.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
+![Version: 1.7.3](https://img.shields.io/badge/Version-1.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
 
 Grafana Tempo Single Binary Mode
 

From 8fb506d31a56f1fcc1435f48853629e790782cd8 Mon Sep 17 00:00:00 2001
From: Joe Elliott <number101010@gmail.com>
Date: Mon, 6 May 2024 08:10:21 -0400
Subject: [PATCH 22/24] bump version

Signed-off-by: Joe Elliott <number101010@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 92117a4c59..8d1c64ddf0 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.9.6
+version: 1.9.7
 appVersion: 2.4.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 05928f27b1..6c1a911e22 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.6](https://img.shields.io/badge/Version-1.9.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.7](https://img.shields.io/badge/Version-1.9.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

From 462862e137b7799034421cf1fcd87fd616ed3346 Mon Sep 17 00:00:00 2001
From: Benjamin Martensson <benjamin.martensson@nrk.no>
Date: Tue, 7 May 2024 10:07:22 -0300
Subject: [PATCH 23/24] [tempo-distributed] fixed broken gateway path

Fixes braking change introduced in PR #2729.

Signed-off-by: Benjamin Martensson <benjamin.martensson@nrk.no>
---
 charts/tempo-distributed/Chart.yaml  | 2 +-
 charts/tempo-distributed/README.md   | 2 +-
 charts/tempo-distributed/values.yaml | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 8d1c64ddf0..832b0de0c1 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.9.7
+version: 1.9.8
 appVersion: 2.4.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 6c1a911e22..1c998ee940 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.7](https://img.shields.io/badge/Version-1.9.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.8](https://img.shields.io/badge/Version-1.9.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index f3126609c2..d47c76db75 100644
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -1836,6 +1836,10 @@ gateway:
             proxy_pass       http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces;
           }
 
+          location = /otlp/v1/traces {
+            proxy_pass       http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces;
+          }
+
           location ^~ /api {
             proxy_pass       http://{{ include "tempo.resourceName" (dict "ctx" . "component" "query-frontend") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:3100$request_uri;
           }

From 8cb815afa9ff9b9ab21b9789cbae23ec88704eb1 Mon Sep 17 00:00:00 2001
From: Jordan Simonovski <jsimonovski@atlassian.com>
Date: Mon, 6 May 2024 11:38:05 +1000
Subject: [PATCH 24/24] The Selector should not be manually specified unless
 otherwise configured in spec. Removing the selector altogether ensures the
 job configuration is valid, while also allowing for templating without null
 values causing errors

Signed-off-by: Jordan Simonovski <jsimonovski@atlassian.com>
---
 charts/tempo-distributed/Chart.yaml                           | 2 +-
 charts/tempo-distributed/README.md                            | 2 +-
 charts/tempo-distributed/templates/tokengen/tokengen-job.yaml | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 832b0de0c1..4cd2f6cd74 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.9.8
+version: 1.9.9
 appVersion: 2.4.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index 1c998ee940..7e3f743496 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.9.8](https://img.shields.io/badge/Version-1.9.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
+![Version: 1.9.9](https://img.shields.io/badge/Version-1.9.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
diff --git a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
index 8e727e9d57..0af68007c7 100644
--- a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
+++ b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
@@ -17,9 +17,6 @@ spec:
   backoffLimit: 6
   completions: 1
   parallelism: 1
-  selector:
-    matchLabels:
-      {{- include "tempo.selectorLabels" $dict | nindent 6 }}
   template:
     metadata:
       labels: