Merge branch 'main' into bugfix-zone-annotations

Author: sringel

charts/lgtm-distributed/Chart.yaml

@@ -3,8 +3,9 @@ apiVersion: v2
 name: lgtm-distributed
 description: Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack
 type: application
-version: 3.0.0
+version: 3.0.1
 appVersion: "^12.1.1"
+deprecated: true
 
 home: https://grafana.com/oss/
 icon: https://artifacthub.io/image/b4fed1a7-6c8f-4945-b99d-096efa3e4116

charts/lgtm-distributed/README.md

@@ -1,6 +1,8 @@
 # lgtm-distributed
 
-![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: ^12.1.1](https://img.shields.io/badge/AppVersion-^12.1.1-informational?style=flat-square)
+> **:exclamation: This Helm Chart is deprecated!**
+
+![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: ^12.1.1](https://img.shields.io/badge/AppVersion-^12.1.1-informational?style=flat-square)
 
 Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack
 

charts/tempo-distributed/README.md

@@ -603,6 +603,7 @@ The memcached default args are removed and should be provided manually. The sett
 | ingester.image.repository | string | `nil` | Docker image repository for the ingester image. Overrides `tempo.image.repository` |
 | ingester.image.tag | string | `nil` | Docker image tag for the ingester image. Overrides `tempo.image.tag` |
 | ingester.initContainers | list | `[]` |  |
+| ingester.labels | object | `{}` | Labels for the ingester StatefulSet |
 | ingester.nodeSelector | object | `{}` | Node selector for ingester pods |
 | ingester.persistence | object | `{"annotations":{},"enabled":false,"inMemory":false,"labels":{},"size":"10Gi","storageClass":null}` | Persistence configuration for ingester |
 | ingester.persistence.annotations | object | `{}` | Annotations for ingester's persist volume claim |

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

@@ -87,6 +87,9 @@ app.kubernetes.io/part-of: memberlist
 app.kubernetes.io/version: {{ .ctx.Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .ctx.Release.Service }}
+{{- with .ctx.Values.ingester.labels }}
+{{ toYaml . }}
+{{- end }}
 {{- end -}}
 {{/*
 Resource name template

charts/tempo-distributed/values.yaml

@@ -135,6 +135,8 @@ rbac:
 ingester:
   # -- Annotations for the ingester StatefulSet
   annotations: {}
+  # -- Labels for the ingester StatefulSet
+  labels: {}
   # -- Number of replicas for the ingester
   replicas: 3
   # -- hostAliases to add