From 63f5bcc4f74a52453860ffceca956dfb4abf0322 Mon Sep 17 00:00:00 2001 From: Alexej Disterhoft Date: Sun, 13 Jul 2025 21:55:43 +0200 Subject: [PATCH 1/2] [tempo-distributed] add service account labels support Signed-off-by: Alexej Disterhoft --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/templates/serviceaccount.yaml | 3 +++ charts/tempo-distributed/values.yaml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 49c2efb24f..c46f040393 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.45.0 +version: 1.45.1 appVersion: 2.8.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/templates/serviceaccount.yaml b/charts/tempo-distributed/templates/serviceaccount.yaml index a158d42c61..96e67d0fbf 100644 --- a/charts/tempo-distributed/templates/serviceaccount.yaml +++ b/charts/tempo-distributed/templates/serviceaccount.yaml @@ -6,6 +6,9 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "tempo.labels" (dict "ctx" .) | nindent 4 }} + {{- with .Values.serviceAccount.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 3f920219c3..a4e7b147a9 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -109,6 +109,8 @@ serviceAccount: name: null # -- Image pull secrets for the service account imagePullSecrets: [] + # -- Labels for the service account + labels: {} # -- Annotations for the service account annotations: {} automountServiceAccountToken: false From 68a59b58358874bbc873d91c04a35b00fc8ee1f4 Mon Sep 17 00:00:00 2001 From: Alexej Disterhoft Date: Sun, 13 Jul 2025 22:00:27 +0200 Subject: [PATCH 2/2] [tempo-distributed] update readme Signed-off-by: Alexej Disterhoft --- charts/tempo-distributed/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 9d9ec3b097..14c977e57c 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.45.0](https://img.shields.io/badge/Version-1.45.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.1](https://img.shields.io/badge/AppVersion-2.8.1-informational?style=flat-square) +![Version: 1.45.1](https://img.shields.io/badge/Version-1.45.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.1](https://img.shields.io/badge/AppVersion-2.8.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -933,6 +933,7 @@ The memcached default args are removed and should be provided manually. The sett | serviceAccount.automountServiceAccountToken | bool | `false` | | | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created | | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account | +| serviceAccount.labels | object | `{}` | Labels 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 | | storage.admin.backend | string | `"filesystem"` | The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/enterprise-traces/latest/configure/reference/#admin_client_config | | storage.trace.backend | string | `"local"` | The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/tempo/latest/configuration/#storage |