From 37c4c10fe041da7037cf911a3ccaf5481b6eacf1 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:39:09 +0800 Subject: [PATCH 01/19] Update annotations in deployment-compactor.yaml Replace compactor annotations with pod annotations. Signed-off-by: Lu Shueh Chou --- .../templates/compactor/deployment-compactor.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index f49def948f..b0f5d100d3 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -6,10 +6,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "tempo.labels" $dict | nindent 4 }} - {{- with .Values.compactor.annotations }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "compactor") | nindent 4 }} spec: minReadySeconds: {{ .Values.compactor.minReadySeconds }} {{- if not .Values.compactor.autoscaling.enabled }} From c80a5c27d58bf6e6eb44b11ba885213fd65098c1 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:41:06 +0800 Subject: [PATCH 02/19] Refactor pod annotations in deployment template Signed-off-by: Lu Shueh Chou --- .../templates/distributor/deployment-distributor.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml index dc266c2870..8c18b08959 100644 --- a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml @@ -34,13 +34,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} - {{- with .Values.tempo.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.distributor.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "compactor") | nindent 8 }} spec: {{- if or (.Values.distributor.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.distributor.priorityClassName .Values.global.priorityClassName }} From 9dc5c740f0f8136b242e9d71fe00c0a2cf4b0c84 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:41:53 +0800 Subject: [PATCH 03/19] Refactor annotations in compactor deployment Signed-off-by: Lu Shueh Chou --- .../templates/compactor/deployment-compactor.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index b0f5d100d3..f58c873f5c 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -6,8 +6,10 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "tempo.labels" $dict | nindent 4 }} + {{- with .Values.distributor.annotations }} annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "compactor") | nindent 4 }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: minReadySeconds: {{ .Values.compactor.minReadySeconds }} {{- if not .Values.compactor.autoscaling.enabled }} @@ -32,13 +34,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} - {{- with .Values.tempo.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.compactor.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "compactor") | nindent 8 }} spec: {{- if or (.Values.compactor.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.compactor.priorityClassName .Values.global.priorityClassName }} From f51bbe30009075af66b89a32d719d8dd3c65ed39 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:42:12 +0800 Subject: [PATCH 04/19] Update pod annotations for distributor component Signed-off-by: Lu Shueh Chou --- .../templates/distributor/deployment-distributor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml index 8c18b08959..1388d5c119 100644 --- a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml @@ -34,7 +34,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "compactor") | nindent 8 }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "distributor") | nindent 8 }} spec: {{- if or (.Values.distributor.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.distributor.priorityClassName .Values.global.priorityClassName }} From c89e3277d07d61197863a3edbab46bf3842cfdc2 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:43:05 +0800 Subject: [PATCH 05/19] Refactor pod annotations in deployment-gateway.yaml Signed-off-by: Lu Shueh Chou --- .../templates/gateway/deployment-gateway.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml index 4adc541c18..c7dd33158f 100644 --- a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml @@ -23,13 +23,7 @@ spec: template: metadata: annotations: - checksum/config: {{ include (print .Template.BasePath "/gateway/configmap-gateway.yaml") . | sha256sum }} - {{- with .Values.tempo.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.gateway.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "gateway") | nindent 8 }} labels: {{- include "tempo.selectorLabels" $dict | nindent 8 }} {{- with .Values.tempo.podLabels }} From 884b40bbfc951dbeadf2a3d166b9462d049f9703 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:43:42 +0800 Subject: [PATCH 06/19] Update statefulset-ingester.yaml Signed-off-by: Lu Shueh Chou --- .../templates/ingester/statefulset-ingester.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index d89950e8e2..0849b8f9af 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -44,13 +44,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} - {{- with .Values.tempo.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.ingester.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "ingester") | nindent 8 }} spec: {{- if or (.Values.ingester.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.ingester.priorityClassName .Values.global.priorityClassName }} From 4108b3ee3d0cf094fd602d2442c83ec029c57287 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:44:35 +0800 Subject: [PATCH 07/19] Simplify pod annotations in deployment metrics generator Signed-off-by: Lu Shueh Chou --- .../metrics-generator/deployment-metrics-generator.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml index 94b70f0220..b56afe1988 100644 --- a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml @@ -29,13 +29,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} - {{- with .Values.tempo.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.metricsGenerator.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "metricsGenerator") | nindent 8 }} spec: {{- if or (.Values.metricsGenerator.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.metricsGenerator.priorityClassName .Values.global.priorityClassName }} From 7eee2257a7c8fda9ac50e2e2d6522f2c31c8684d Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:45:06 +0800 Subject: [PATCH 08/19] Simplify pod annotations in metrics generator Signed-off-by: Lu Shueh Chou --- .../metrics-generator/statefulset-metrics-generator.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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 bec1efcf0d..94920cb086 100644 --- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml @@ -35,13 +35,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} - {{- with .Values.tempo.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.metricsGenerator.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "metricsGenerator") | nindent 8 }} spec: {{- if or (.Values.metricsGenerator.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.metricsGenerator.priorityClassName .Values.global.priorityClassName }} From 23cae5cb12b8d249d52df004381984c15c10d5a1 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:45:47 +0800 Subject: [PATCH 09/19] Update deployment-querier.yaml Signed-off-by: Lu Shueh Chou --- .../templates/querier/deployment-querier.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index e804402397..750941380c 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -34,13 +34,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} - {{- with .Values.tempo.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.querier.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "querier") | nindent 8 }} spec: {{- if or (.Values.querier.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.querier.priorityClassName .Values.global.priorityClassName }} From 6196cea6d4aae468551deedebc0a0be1779188a0 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:46:21 +0800 Subject: [PATCH 10/19] Refactor pod annotations in deployment-query-frontend Signed-off-by: Lu Shueh Chou --- .../query-frontend/deployment-query-frontend.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 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 1b92d6560b..8a6b74b826 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -34,13 +34,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} - {{- with .Values.tempo.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.queryFrontend.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "tempo.podAnnotations" (dict "ctx" . "component" "queryFrontend") | nindent 8 }} spec: {{- if or (.Values.queryFrontend.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.queryFrontend.priorityClassName .Values.global.priorityClassName }} From 00a098cbeff6b4341d554b06d4bb17fd824288f8 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:48:13 +0800 Subject: [PATCH 11/19] Update annotations to use compactor values Signed-off-by: Lu Shueh Chou --- .../templates/compactor/deployment-compactor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index f58c873f5c..b4143114d6 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "tempo.labels" $dict | nindent 4 }} - {{- with .Values.distributor.annotations }} + {{- with .Values.compactor.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} From 90c25c9b5776361281e334f229ad473761396c8a Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:56:24 +0800 Subject: [PATCH 12/19] Update deployment-query-frontend.yaml Signed-off-by: Lu Shueh Chou --- .../templates/query-frontend/deployment-query-frontend.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8a6b74b826..0237e1aba6 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -34,7 +34,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "queryFrontend") | nindent 8 }} + {{- include "tempo.podAnnotations" $dict | nindent 8 }} spec: {{- if or (.Values.queryFrontend.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.queryFrontend.priorityClassName .Values.global.priorityClassName }} From 06101ddd7a9dbb12861c19dbf945ad7d785bc108 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:57:02 +0800 Subject: [PATCH 13/19] Fix pod annotations inclusion in deployment-querier.yaml Signed-off-by: Lu Shueh Chou --- .../tempo-distributed/templates/querier/deployment-querier.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index 750941380c..2eee937f2c 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -34,7 +34,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "querier") | nindent 8 }} + {{- include "tempo.podAnnotations" $dict | nindent 8 }} spec: {{- if or (.Values.querier.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.querier.priorityClassName .Values.global.priorityClassName }} From 485d963d85c83bdb9d8d264bc0267df169fcc66e Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:57:27 +0800 Subject: [PATCH 14/19] Update deployment-metrics-generator.yaml Signed-off-by: Lu Shueh Chou --- .../metrics-generator/deployment-metrics-generator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml index b56afe1988..94264b5654 100644 --- a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "metricsGenerator") | nindent 8 }} + {{- include "tempo.podAnnotations" $dict | nindent 8 }} spec: {{- if or (.Values.metricsGenerator.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.metricsGenerator.priorityClassName .Values.global.priorityClassName }} From c97613df7cf2c370d2907603a1d26eb7de239388 Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:57:50 +0800 Subject: [PATCH 15/19] Fix pod annotations inclusion in metrics generator Signed-off-by: Lu Shueh Chou --- .../metrics-generator/statefulset-metrics-generator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 94920cb086..08d53fc57b 100644 --- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml @@ -35,7 +35,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "metricsGenerator") | nindent 8 }} + {{- include "tempo.podAnnotations" $dict | nindent 8 }} spec: {{- if or (.Values.metricsGenerator.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.metricsGenerator.priorityClassName .Values.global.priorityClassName }} From 0a1dd29809bff20040f090ba16bce868d465770c Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:58:14 +0800 Subject: [PATCH 16/19] Fix podAnnotations inclusion in statefulset-ingester Signed-off-by: Lu Shueh Chou --- .../templates/ingester/statefulset-ingester.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 0849b8f9af..a8cf39615f 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -44,7 +44,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "ingester") | nindent 8 }} + {{- include "tempo.podAnnotations" $dict | nindent 8 }} spec: {{- if or (.Values.ingester.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.ingester.priorityClassName .Values.global.priorityClassName }} From 5557889807733f17ef996e2f32596c2fc548c75d Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:58:46 +0800 Subject: [PATCH 17/19] Update pod annotations in deployment-gateway.yaml Signed-off-by: Lu Shueh Chou --- .../tempo-distributed/templates/gateway/deployment-gateway.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml index c7dd33158f..a268f6a20b 100644 --- a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml @@ -23,7 +23,7 @@ spec: template: metadata: annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "gateway") | nindent 8 }} + {{- include "tempo.podAnnotations" $dict | nindent 8 }} labels: {{- include "tempo.selectorLabels" $dict | nindent 8 }} {{- with .Values.tempo.podLabels }} From b08dfe09f7f866101d07819c52646201e5f6c0ac Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:59:06 +0800 Subject: [PATCH 18/19] Fix pod annotations inclusion in distributor deployment Signed-off-by: Lu Shueh Chou --- .../templates/distributor/deployment-distributor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml index 1388d5c119..9fdd187a02 100644 --- a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml @@ -34,7 +34,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "distributor") | nindent 8 }} + {{- include "tempo.podAnnotations" $dict | nindent 8 }} spec: {{- if or (.Values.distributor.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.distributor.priorityClassName .Values.global.priorityClassName }} From 66c9dc37d40d106554a5573c07a3891757e1727e Mon Sep 17 00:00:00 2001 From: Lu Shueh Chou Date: Wed, 3 Sep 2025 12:59:21 +0800 Subject: [PATCH 19/19] Fix pod annotations inclusion in compactor deployment Signed-off-by: Lu Shueh Chou --- .../templates/compactor/deployment-compactor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index b4143114d6..2679d47a97 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -34,7 +34,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - {{- include "tempo.podAnnotations" (dict "ctx" . "component" "compactor") | nindent 8 }} + {{- include "tempo.podAnnotations" $dict | nindent 8 }} spec: {{- if or (.Values.compactor.priorityClassName) (.Values.global.priorityClassName) }} priorityClassName: {{ default .Values.compactor.priorityClassName .Values.global.priorityClassName }}