Adding commonLabels for tempo-distributed HC. With this we'll be able to add labels to all K8S resources the chart is creating.

Signed-off-by: Martin Burgos <[email protected]>

Author: tincho-burgos

charts/tempo-distributed/templates/_helpers.tpl

@@ -92,6 +92,13 @@ app.kubernetes.io/version: {{ .ctx.Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .ctx.Release.Service }}
 {{- end -}}
 
+{{/*
+Common labels to add to all resources
+*/}}
+{{ - define "tempo.commonLabels" -}}
+{{- toYaml .Values.commonLabels | nindent 0 }}
+{{- end -}}
+
 {{/*
 Simple service selector labels
 */}}

charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml

@@ -7,6 +7,7 @@ metadata:
     {{- toYaml .Values.adminApi.annotations | nindent 4 }}
   labels:
     {{- include "tempo.labels" $dict | nindent 4 }}
+    {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 4 }}
   name: {{ include "tempo.resourceName" $dict }}
   namespace: {{ .Release.Namespace | quote }}
 spec:
@@ -21,6 +22,7 @@ spec:
     metadata:
       labels:
         {{- include "tempo.podLabels" $dict | nindent 8 }}
+        {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 8 }}
         {{- with .Values.adminApi.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

charts/tempo-distributed/templates/admin-api/admin-api-svc.yaml

@@ -5,6 +5,7 @@ metadata:
   name: {{ include "tempo.resourceName" (dict "ctx" . "component" "admin-api") }}
   labels:
     {{- include "tempo.labels" (dict "ctx" . "component" "admin-api" "memberlist" true) | nindent 4 }}
+    {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 4 }}
     {{- with .Values.adminApi.service.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}

charts/tempo-distributed/templates/compactor/deployment-compactor.yaml

@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "tempo.labels" $dict | nindent 4 }}
+    {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 4 }}
   {{- with .Values.compactor.annotations }}
   annotations:
   {{- toYaml . | nindent 4 }}
@@ -27,6 +28,7 @@ spec:
     metadata:
       labels:
         {{- include "tempo.podLabels" $dict | nindent 8 }}
+        {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 8 }}
         {{- with .Values.tempo.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

charts/tempo-distributed/templates/compactor/hpa.yaml

@@ -7,6 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "tempo.labels" (dict "ctx" . "component" "compactor") | nindent 4 }}
+    {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1

charts/tempo-distributed/templates/compactor/keda-scaledObject.yaml

@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "tempo.labels" (dict "ctx" . "component" "compactor") | nindent 4 }}
+    {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 4 }}
 spec:
   minReplicaCount: {{ .Values.compactor.autoscaling.minReplicas }}
   maxReplicaCount: {{ .Values.compactor.autoscaling.maxReplicas }}

charts/tempo-distributed/templates/compactor/poddisruptionbudget-compactor.yaml

@@ -7,6 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "tempo.labels" $dict | nindent 4 }}
+    {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 4 }}
 spec:
   selector:
     matchLabels:

charts/tempo-distributed/templates/compactor/service-compactor.yaml

@@ -5,6 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "tempo.labels" (dict "ctx" . "component" "compactor") | nindent 4 }}
+    {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 4 }}
   {{- with .Values.compactor.service.annotations }}
   annotations:
     {{- tpl (toYaml . | nindent 4) $ }}

charts/tempo-distributed/templates/configmap-runtime.yaml

@@ -5,6 +5,7 @@ metadata:
   name: {{ tpl .Values.externalRuntimeConfigName . }}
   labels:
     {{- include "tempo.labels" (dict "ctx" .) | nindent 4 }}
+    {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 4 }}
   namespace: {{ .Release.Namespace | quote }}
 data:
   overrides.yaml: |

charts/tempo-distributed/templates/configmap-tempo.yaml

@@ -9,6 +9,7 @@ metadata:
   name: {{ tpl .Values.externalConfigSecretName . }}
   labels:
     {{- include "tempo.labels" (dict "ctx" .) | nindent 4 }}
+    {{- include "tempo.commonLabels" (dict "ctx" .) | nindent 4 }}
   namespace: {{ .Release.Namespace | quote }}
 {{- if eq .Values.configStorageType "Secret" }}
 data: