Merge branch 'main' into feat/loki-gateway-api

Author: QuentinBisson

charts/tempo-distributed/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 2.14.1
+version: 2.14.2
 # renovate: docker=docker.io/grafana/tempo
 appVersion: 2.10.3
 kubeVersion: "^1.25.0-0"

charts/tempo-distributed/ci/zone-aware-replication-values.yaml

@@ -0,0 +1,18 @@
+rollout_operator:
+  enabled: true
+
+ingester:
+  replicas: 2
+  zoneAwareReplication:
+    enabled: true
+    topologyKey: kubernetes.io/hostname
+    zones:
+      - name: zone-a
+        nodeSelector:
+          topology.kubernetes.io/zone: zone-a
+      - name: zone-b
+        nodeSelector:
+          topology.kubernetes.io/zone: zone-b
+      - name: zone-c
+        nodeSelector:
+          topology.kubernetes.io/zone: zone-c

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

@@ -70,7 +70,7 @@ name: {{ printf "%s-%s" .component .rolloutZoneName }}
 rollout-group: {{ .component }}
 zone: {{ .rolloutZoneName }}
 {{- end }}
-{{- include "tempo.labels" (dict "ctx" .ctx "component" .component) }}
+{{ include "tempo.labels" (dict "ctx" .ctx "component" .component) }}
 {{- with .ctx.Values.ingester.labels }}
 {{ toYaml . }}
 {{- end }}