Skip to content

Commit 2648929

Browse files
Merge branch 'main' into bump-vulture
2 parents 338417d + 1c3f7b3 commit 2648929

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
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: 1.51.0
5+
version: 1.51.1
66
appVersion: 2.9.0
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

3-
![Version: 1.51.0](https://img.shields.io/badge/Version-1.51.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
3+
![Version: 1.51.1](https://img.shields.io/badge/Version-1.51.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
44

55
Grafana Tempo in MicroService mode
66

charts/tempo-distributed/templates/lib/service-monitor.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ spec:
5252
replacement: "{{ $.ctx.Release.Namespace }}/{{ $.component }}"
5353
targetLabel: job
5454
{{- if kindIs "string" .clusterLabel }}
55-
- replacement: "{{ .clusterLabel | default (include "tempo.clusterName" $.ctx) }}"
55+
- action: replace
56+
replacement: "{{ .clusterLabel | default (include "tempo.clusterName" $.ctx) }}"
5657
targetLabel: cluster
5758
{{- end }}
5859
{{- with .relabelings }}

charts/tempo/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: tempo
33
description: Grafana Tempo Single Binary Mode
44
type: application
5-
version: 1.23.3
6-
appVersion: 2.8.2
5+
version: 1.24.0
6+
appVersion: 2.9.0
77
engine: gotpl
88
home: https://grafana.net
99
icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png

charts/tempo/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo
22

3-
![Version: 1.23.3](https://img.shields.io/badge/Version-1.23.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
3+
![Version: 1.24.0](https://img.shields.io/badge/Version-1.24.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
44

55
Grafana Tempo Single Binary Mode
66

0 commit comments

Comments
 (0)