From e66f68af81f9eb069c13843dfc0bffdea9027aee Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Wed, 3 Apr 2024 09:39:46 -0600 Subject: [PATCH 1/3] [tempo] set unique cluster_label for tempo memberlist Signed-off-by: Wylie Hobbs --- charts/tempo/Chart.yaml | 2 +- charts/tempo/values.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index faebfdfb51..5e49b661ee 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.11.0 +version: 1.12.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index 48b76f58c2..7aaf93920b 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -126,6 +126,8 @@ tempo: # -- Tempo configuration file contents # @default -- Dynamically generated tempo configmap config: | + memberlist: + cluster_label: "{{ .Release.Name }}.{{ .Release.Namespace }}" multitenancy_enabled: {{ .Values.tempo.multitenancyEnabled }} usage_report: reporting_enabled: {{ .Values.tempo.reportingEnabled }} From f06d6ad1c7dbdc9d969d246aaef5f846191b8829 Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Wed, 3 Apr 2024 09:41:04 -0600 Subject: [PATCH 2/3] update docs Signed-off-by: Wylie Hobbs --- charts/tempo/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 3e3edb9b91..6bc2b281d4 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.12.0](https://img.shields.io/badge/Version-1.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo Single Binary Mode From a536dad746a86276b6646d1d011e039c7eae47d4 Mon Sep 17 00:00:00 2001 From: Joe Elliott Date: Wed, 6 Nov 2024 13:50:47 -0500 Subject: [PATCH 3/3] add warning Signed-off-by: Joe Elliott --- charts/tempo/README.md | 5 +++++ charts/tempo/README.md.gotmpl | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 6bc2b281d4..81629e43f4 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -134,6 +134,11 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. +### From Chart versions < 1.12.0 + +Upgrading to chart 1.12.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out. +This will interrupt reads and writes. This config option is set to prevent cross talk between Tempo and other memberlist clusters. + ### From Chart versions < 1.2.0 Please be aware that we've updated the minor version to Tempo 2.1, which includes breaking changes. diff --git a/charts/tempo/README.md.gotmpl b/charts/tempo/README.md.gotmpl index 92a4cefefd..9f466bb2a5 100644 --- a/charts/tempo/README.md.gotmpl +++ b/charts/tempo/README.md.gotmpl @@ -40,6 +40,11 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. +### From Chart versions < 1.12.0 + +Upgrading to chart 1.12.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out. +This will interrupt reads and writes. This config option is set to prevent cross talk between Tempo and other memberlist clusters. + ### From Chart versions < 1.2.0 Please be aware that we've updated the minor version to Tempo 2.1, which includes breaking changes.