From a057b110a2987c45f682c63e654d344012c31bd9 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 2 Jun 2025 07:14:16 -0400 Subject: [PATCH 01/13] Update deployment-querier.yaml Signed-off-by: Arun Cherla --- .../templates/querier/deployment-querier.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index 220fb99a9f..972f501056 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -112,6 +112,9 @@ spec: {{- with .Values.querier.extraVolumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.querier.extraContainers }} + {{- toYaml . | nindent 8 }} + {{- end }} terminationGracePeriodSeconds: {{ .Values.querier.terminationGracePeriodSeconds }} {{- if semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version }} {{- with .Values.querier.topologySpreadConstraints }} From 14513559e66841c7e0d984c0941f97d09d098bc2 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 2 Jun 2025 07:19:16 -0400 Subject: [PATCH 02/13] Update statefulset-ingester.yaml Signed-off-by: Arun Cherla --- .../templates/ingester/statefulset-ingester.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 3d6ffa9e30..cf2afdfaae 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -164,6 +164,9 @@ spec: {{- with .Values.ingester.extraVolumes }} {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.ingester.extraContainers }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- if not .Values.ingester.persistence.enabled }} - name: data emptyDir: {} From 37ec5ba58707f2a1c5f74fa60efc0e4498203867 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 2 Jun 2025 07:22:02 -0400 Subject: [PATCH 03/13] Update deployment-query-frontend.yaml Signed-off-by: Arun Cherla --- .../templates/query-frontend/deployment-query-frontend.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml index cc4234c332..08ad2d2892 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -107,6 +107,9 @@ spec: {{- with .Values.queryFrontend.extraVolumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.queryFrontend.extraContainers }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.queryFrontend.query.enabled }} - args: - -config=/conf/tempo.yaml From 509149efab212b7f46defa316bdddec244d4420e Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 2 Jun 2025 19:24:50 -0400 Subject: [PATCH 04/13] Update Chart.yaml Signed-off-by: Arun Cherla --- 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 364b90754c..840c29d882 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.41.0 +version: 1.41.1 appVersion: 2.7.2 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 5cef2e9e1307ba4385e7d9c354fcce88eb830612 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 2 Jun 2025 19:25:28 -0400 Subject: [PATCH 05/13] Update README.md Signed-off-by: Arun Cherla --- 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 3d88e91cd0..d4977a952f 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.41.0](https://img.shields.io/badge/Version-1.41.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.2](https://img.shields.io/badge/AppVersion-2.7.2-informational?style=flat-square) +![Version: 1.41.1](https://img.shields.io/badge/Version-1.41.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.2](https://img.shields.io/badge/AppVersion-2.7.2-informational?style=flat-square) Grafana Tempo in MicroService mode From b5334e98832510003a5e6d7b309d79072624b59a Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 2 Jun 2025 19:30:01 -0400 Subject: [PATCH 06/13] Update README.md Signed-off-by: Arun Cherla --- charts/tempo-distributed/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index d4977a952f..086e7f59bd 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -574,6 +574,7 @@ The memcached default args are removed and should be provided manually. The sett | ingester.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the ingester pods | | ingester.extraVolumeMounts | list | `[]` | Extra volumes for ingester pods | | ingester.extraVolumes | list | `[]` | Extra volumes for ingester deployment | +| ingester.extraContainers | list | `[]` | Extra containers for ingester deployment | | ingester.hostAliases | list | `[]` | hostAliases to add | | ingester.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | | ingester.image.registry | string | `nil` | The Docker registry for the ingester image. Overrides `tempo.image.registry` | @@ -814,6 +815,7 @@ The memcached default args are removed and should be provided manually. The sett | querier.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the querier pods | | querier.extraVolumeMounts | list | `[]` | Extra volumes for querier pods | | querier.extraVolumes | list | `[]` | Extra volumes for querier deployment | +| querier.extraContainers | list | `[]` | Extra containers for querier deployment | | querier.hostAliases | list | `[]` | hostAliases to add | | querier.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | | querier.image.registry | string | `nil` | The Docker registry for the querier image. Overrides `tempo.image.registry` | @@ -884,6 +886,7 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.query.extraEnv | list | `[]` | Environment variables to add to the tempo-query pods | | queryFrontend.query.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the tempo-query pods | | queryFrontend.query.extraVolumeMounts | list | `[]` | Extra volumes for tempo-query pods | +| queryFrontend.query.extraContainers | list | `[]` | Extra containers for queryFrontend deployment | | queryFrontend.query.extraVolumes | list | `[]` | Extra volumes for tempo-query deployment | | queryFrontend.query.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | | queryFrontend.query.image.registry | string | `nil` | The Docker registry for the tempo-query image. Overrides `tempo.image.registry` | From 5cdfe98b8ab4ffde0199a00c1dd7db602ee9493e Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 2 Jun 2025 19:31:42 -0400 Subject: [PATCH 07/13] Update README.md Signed-off-by: Arun Cherla --- charts/tempo-distributed/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 086e7f59bd..4d11e74f2b 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -864,6 +864,7 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the query-frontend pods | | queryFrontend.extraVolumeMounts | list | `[]` | Extra volumes for query-frontend pods | | queryFrontend.extraVolumes | list | `[]` | Extra volumes for query-frontend deployment | +| queryFrontend.extraContainers | list | `[]` | Extra containers for query-frontend deployment | | queryFrontend.hostAliases | list | `[]` | hostAliases to add | | queryFrontend.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | | queryFrontend.image.registry | string | `nil` | The Docker registry for the query-frontend image. Overrides `tempo.image.registry` | From 7e34d00fe6f15d8a25f7b3567e9f818ea1cb80b2 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 2 Jun 2025 19:32:29 -0400 Subject: [PATCH 08/13] Update README.md Signed-off-by: Arun Cherla --- charts/tempo-distributed/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 4d11e74f2b..4dcbd2e7fd 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -887,7 +887,6 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.query.extraEnv | list | `[]` | Environment variables to add to the tempo-query pods | | queryFrontend.query.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the tempo-query pods | | queryFrontend.query.extraVolumeMounts | list | `[]` | Extra volumes for tempo-query pods | -| queryFrontend.query.extraContainers | list | `[]` | Extra containers for queryFrontend deployment | | queryFrontend.query.extraVolumes | list | `[]` | Extra volumes for tempo-query deployment | | queryFrontend.query.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | | queryFrontend.query.image.registry | string | `nil` | The Docker registry for the tempo-query image. Overrides `tempo.image.registry` | From 065985097de721a2e44e985c668bea632f5d7293 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Sun, 15 Jun 2025 20:33:32 -0400 Subject: [PATCH 09/13] Update Chart.yaml Signed-off-by: Arun Cherla --- 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 0f4831560a..76489e257a 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.42.1 +version: 1.42.2 appVersion: 2.8.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 7db43d63cfb0b48909fd996cc2b3ba1638621873 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Sun, 15 Jun 2025 20:33:47 -0400 Subject: [PATCH 10/13] Update README.md Signed-off-by: Arun Cherla --- 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 8c53b0f6f4..c24cdb4ac4 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.42.1](https://img.shields.io/badge/Version-1.42.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square) +![Version: 1.42.2](https://img.shields.io/badge/Version-1.42.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square) Grafana Tempo in MicroService mode From 081a6a4d5233e95592d14738f470be1b8494ef35 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 16 Jun 2025 20:36:16 -0400 Subject: [PATCH 11/13] Update deployment-querier.yaml Signed-off-by: Arun Cherla --- .../templates/querier/deployment-querier.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index 972f501056..ba56aab302 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -112,9 +112,9 @@ spec: {{- with .Values.querier.extraVolumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} - {{- with .Values.querier.extraContainers }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- with .Values.querier.extraContainers }} + {{- toYaml . | nindent 12 }} + {{- end }} terminationGracePeriodSeconds: {{ .Values.querier.terminationGracePeriodSeconds }} {{- if semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version }} {{- with .Values.querier.topologySpreadConstraints }} From d1cf3b786dc3c04ee0b6ad3aa21f16570c594274 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 16 Jun 2025 20:38:35 -0400 Subject: [PATCH 12/13] Update statefulset-ingester.yaml Signed-off-by: Arun Cherla --- .../templates/ingester/statefulset-ingester.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index cf2afdfaae..cb2660fab3 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -164,9 +164,9 @@ spec: {{- with .Values.ingester.extraVolumes }} {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.ingester.extraContainers }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- with .Values.ingester.extraContainers }} + {{- toYaml . | nindent 12 }} + {{- end }} {{- if not .Values.ingester.persistence.enabled }} - name: data emptyDir: {} From 29a29a8af20699664412c4c4eacff0f8d88fd126 Mon Sep 17 00:00:00 2001 From: Arun Cherla Date: Mon, 16 Jun 2025 20:39:13 -0400 Subject: [PATCH 13/13] Update deployment-query-frontend.yaml Signed-off-by: Arun Cherla --- .../templates/query-frontend/deployment-query-frontend.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml index 08ad2d2892..c8b941af46 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -107,9 +107,9 @@ spec: {{- with .Values.queryFrontend.extraVolumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} - {{- with .Values.queryFrontend.extraContainers }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- with .Values.queryFrontend.extraContainers }} + {{- toYaml . | nindent 12 }} + {{- end }} {{- if .Values.queryFrontend.query.enabled }} - args: - -config=/conf/tempo.yaml