From ee7e6538b958e0de3020504b50c7f8942f58578e Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 2 Sep 2024 18:06:13 +0200 Subject: [PATCH 1/4] Upgrade to v2.6.0-rc.1 Signed-off-by: Mario --- charts/tempo-distributed/Chart.yaml | 4 ++-- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/README.md.gotmpl | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 6299f150b9..d43d906665 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.17.0 -appVersion: 2.5.0 +version: 1.18.0 +appVersion: 2.6.0-rc.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index a88d1a48f1..c29813dc57 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.17.0](https://img.shields.io/badge/Version-1.17.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.18.0](https://img.shields.io/badge/Version-1.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0-rc.1](https://img.shields.io/badge/AppVersion-2.6.0--rc.1-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 5cdb777ad3..e6b2e33433 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -39,6 +39,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.18.0 + +Please be aware that we've updated the minor version to Tempo 2.6, which includes breaking changes. +We recommend reviewing the [release notes](https://github.com/grafana/tempo/releases/tag/v2.6.0/) before upgrading. + ### From Chart versions < 1.15.2 Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. From 5d8c961009c2ef8d970d35f5f2231e08fd66a149 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 2 Sep 2024 18:16:52 +0200 Subject: [PATCH 2/4] Ups Signed-off-by: Mario --- charts/tempo-distributed/README.md | 7 ++++++- charts/tempo-distributed/ci/parquet-dedicated-columns.yaml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index c29813dc57..dcd0ce6953 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.18.0](https://img.shields.io/badge/Version-1.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0-rc.1](https://img.shields.io/badge/AppVersion-2.6.0--rc.1-informational?style=flat-square) +![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0-rc.1](https://img.shields.io/badge/AppVersion-2.6.0--rc.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -46,6 +46,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.18.0 + +Please be aware that we've updated the minor version to Tempo 2.6, which includes breaking changes. +We recommend reviewing the [release notes](https://github.com/grafana/tempo/releases/tag/v2.6.0/) before upgrading. + ### From Chart versions < 1.15.2 Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. diff --git a/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml b/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml index 5878f37f0c..cf34703e60 100644 --- a/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml +++ b/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml @@ -1,7 +1,7 @@ storage: trace: block: - version: vParquet3 + version: vParquet4 dedicated_columns: - name: cluster type: string From 4d46718875b4022f3e37290e26865506324e904f Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 5 Sep 2024 12:24:11 +0200 Subject: [PATCH 3/4] Update to v2.6.0 Signed-off-by: Mario --- charts/tempo-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index d43d906665..0c31a9b274 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: tempo-distributed description: Grafana Tempo in MicroService mode type: application version: 1.18.0 -appVersion: 2.6.0-rc.1 +appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png From d9f6550b195366b4746f1fb516441e2832747419 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 5 Sep 2024 12:28:53 +0200 Subject: [PATCH 4/4] Re-generate docs Signed-off-by: Mario --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index dcd0ce6953..fbbcf5dd28 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0-rc.1](https://img.shields.io/badge/AppVersion-2.6.0--rc.1-informational?style=flat-square) +![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode