[tempo] Add commonLabels (#3319)

charts/tempo-distributed/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.20.0
+version: 1.20.1
 appVersion: 2.6.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

@@ -496,6 +496,7 @@ The memcached default args are removed and should be provided manually. The sett
 | gateway.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for gateway pods. Passed through `tpl` and, thus, to be configured as string |
 | gateway.verboseLogging | bool | `true` | Enable logging of 2xx and 3xx HTTP requests |
 | global.clusterDomain | string | `"cluster.local"` | configures cluster domain ("cluster.local" by default) |
+| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. scope: * |
 | global.dnsNamespace | string | `"kube-system"` | configures DNS service namespace |
 | global.dnsService | string | `"kube-dns"` | configures DNS service name |
 | global.extraEnv | list | `[]` | Common environment variables to add to all pods directly managed by this chart. scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen |

charts/tempo-distributed/templates/_helpers.tpl

@@ -90,6 +90,18 @@ app.kubernetes.io/part-of: memberlist
 app.kubernetes.io/version: {{ .ctx.Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .ctx.Release.Service }}
+{{ include "tempo.commonLabels" . }}
+{{- end -}}
+
+{{/*
+Common Labels
+Params:
+  ctx = . context
+*/}}
+{{- define "tempo.commonLabels" -}}
+{{- with .ctx.Values.global.commonLabels }}
+{{ toYaml .  }}
+{{- end }}
 {{- end -}}
 
 {{/*

charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl

@@ -89,6 +89,7 @@ app.kubernetes.io/part-of: memberlist
 app.kubernetes.io/version: {{ .ctx.Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .ctx.Release.Service }}
+{{ include "tempo.commonLabels" . }}
 {{- end -}}
 {{/*
 Resource name template

charts/tempo-distributed/values.yaml

@@ -19,6 +19,11 @@ global:
   # -- Common environment variables to add to all pods directly managed by this chart.
   # scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen
   extraEnv: []
+
+  # -- Common labels for all object directly managed by this chart.
+  # scope: *
+  commonLabels: {}
+
 fullnameOverride: ''
 # fullnameOverride: tempo
 

charts/tempo-vulture/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-vulture
 description: Grafana Tempo Vulture - A tool to monitor Tempo performance.
 type: application
-version: 0.5.0
+version: 0.5.1
 appVersion: 2.5.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

charts/tempo-vulture/README.md

@@ -54,6 +54,7 @@ tempoAddress:
 | extraEnv | list | `[]` | Environment variables to add to the vulture pods |
 | extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the vulture pods |
 | fullnameOverride | string | `""` | Overrides the chart's computed fullname |
+| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. scope: * |
 | hostAliases | list | `[]` | hostAliases to add |
 | image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | image.repository | string | `"docker.io/grafana/tempo-vulture"` | Docker image repository |

charts/tempo-vulture/templates/_helpers.tpl

@@ -40,6 +40,9 @@ helm.sh/chart: {{ include "tempo-vulture.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- with .Values.global.commonLabels }}
+{{ toYaml . }}
+{{- end }}
 {{- end }}
 
 {{/*

charts/tempo-vulture/values.yaml

@@ -1,3 +1,8 @@
+global:
+  # -- Common labels for all object directly managed by this chart.
+  # scope: *
+  commonLabels: {}
+
 # -- Overrides the chart's name
 nameOverride: ""
 # -- Overrides the chart's computed fullname

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

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` |  |

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 -}}
 
 {{/*

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