[tempo] Add commonLabels (grafana#3319)

Signed-off-by: fabio trigari <[email protected]>
ftrigari · Nov 1, 2024 · e6d8d64 · e6d8d64
1 parent 1102acd
commit e6d8d64
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git 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.1
 appVersion: 2.5.0
 engine: gotpl
 home: https://grafana.net

diff --git a/charts/tempo/README.md b/charts/tempo/README.md
@@ -18,6 +18,7 @@ Grafana Tempo Single Binary Mode
 | extraLabels | object | `{}` |  |
 | extraVolumes | list | `[]` | Volumes to add |
 | fullnameOverride | string | `""` | Overrides the chart's computed fullname |
+| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. |
 | labels | object | `{}` | labels for tempo |
 | nameOverride | string | `""` | Overrides the chart's name |
 | networkPolicy.allowExternal | bool | `true` |  |

diff --git a/charts/tempo/templates/_helpers.tpl b/charts/tempo/templates/_helpers.tpl
@@ -55,6 +55,9 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- with .Values.extraLabels }}
 {{ toYaml . }}
 {{- end }}
+{{- with .Values.global.commonLabels }}
+{{ toYaml . }}
+{{- end }}
 {{- end -}}
 
 {{/*

diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml
@@ -1,3 +1,7 @@
+global:
+  # -- Common labels for all object directly managed by this chart.
+  commonLabels: {}
+
 # -- Overrides the chart's name
 nameOverride: ""
 
@@ -282,6 +286,7 @@ podAnnotations: {}
 podLabels: {}
 
 # Apply extra labels to common labels.
+# DEPRECATED: use global.commonLabels
 extraLabels: {}
 
 # -- Volumes to add