Skip to content

Commit 91b6703

Browse files
committed
[tempo-distributed] fix: missing newline between zone label and common labels in ingester
When zone-aware replication is enabled, the ingester.labels helper renders zone-specific labels (name, rollout-group, zone) followed by common labels via {{- include "tempo.labels" ... }}. The leading {{- on the include trims the newline produced after {{- end }}, causing the zone value and the first common label to be concatenated on a single line (e.g. "zone: us-central1-ahelm.sh/chart: ..."), which is invalid YAML. Fix: remove the leading dash from {{- include so the separating newline is preserved, matching the behaviour of the inline labels in v2.13.0 and earlier. Fixes: rendering failure introduced in v2.14.0 (#345) Signed-off-by: Ilia <ilia.lazebnik@gmail.com>
1 parent 07ef3de commit 91b6703

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

charts/tempo-distributed/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 2.14.1
5+
version: 2.14.2
66
# renovate: docker=docker.io/grafana/tempo
77
appVersion: 2.10.3
88
kubeVersion: "^1.25.0-0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ name: {{ printf "%s-%s" .component .rolloutZoneName }}
7070
rollout-group: {{ .component }}
7171
zone: {{ .rolloutZoneName }}
7272
{{- end }}
73-
{{- include "tempo.labels" (dict "ctx" .ctx "component" .component) }}
73+
{{ include "tempo.labels" (dict "ctx" .ctx "component" .component) }}
7474
{{- with .ctx.Values.ingester.labels }}
7575
{{ toYaml . }}
7676
{{- end }}

0 commit comments

Comments
 (0)