From 8cc26908fbe2e6fdd1156d5bad28dd3ed9bd1359 Mon Sep 17 00:00:00 2001 From: portswigger-amason Date: Fri, 25 Jul 2025 14:53:32 +0100 Subject: [PATCH 1/3] Fixing Tempo Registry Colcase Order Problem: Component-specific registry overrides weren't working despite being documented as overriding global registry. Root Cause: Template helper function had incorrect priority order in coalesce: `{{- $registry := coalesce .global.registry .component.registry .tempo.registry -}}` Fix: Changed priority to put component registry first: `{{- $registry := coalesce .component.registry .tempo.registry .global.registry -}}`` Result: - Component registry now properly overrides global registry as documented - Fully backwards compatible - when component registry is null, falls back to global - Enables clean configuration like memcached.image.registry: public.ecr.aws Signed-off-by: portswigger-amason --- charts/tempo-distributed/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/_helpers.tpl b/charts/tempo-distributed/templates/_helpers.tpl index 71e3dbe0e1..393ea871d1 100644 --- a/charts/tempo-distributed/templates/_helpers.tpl +++ b/charts/tempo-distributed/templates/_helpers.tpl @@ -28,7 +28,7 @@ If release name contains chart name it will be used as a full name. Docker image selector for Tempo. Hierachy based on global, component, and tempo values. */}} {{- define "tempo.tempoImage" -}} -{{- $registry := coalesce .global.registry .component.registry .tempo.registry -}} +{{- $registry := coalesce .component.registry .tempo.registry .global.registry -}} {{- $repository := coalesce .component.repository .tempo.repository -}} {{- $tag := coalesce .component.tag .tempo.tag .defaultVersion | toString -}} {{- printf "%s/%s:%s" $registry $repository $tag -}} From 80c6f5c4f13364dfdaeaa49d4f71984cb44079a9 Mon Sep 17 00:00:00 2001 From: portswigger-amason Date: Tue, 29 Jul 2025 15:03:03 +0100 Subject: [PATCH 2/3] Increment Chart version Signed-off-by: portswigger-amason --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index f33956804d..b7877a6275 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.46.1 +version: 1.46.2 appVersion: 2.8.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index bb26b760dc..75e65b45ed 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.46.1](https://img.shields.io/badge/Version-1.46.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.1](https://img.shields.io/badge/AppVersion-2.8.1-informational?style=flat-square) +![Version: 1.46.2](https://img.shields.io/badge/Version-1.46.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.1](https://img.shields.io/badge/AppVersion-2.8.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 030a0563fe14f563549199df9ee66271e387c662 Mon Sep 17 00:00:00 2001 From: portswigger-amason Date: Thu, 31 Jul 2025 09:11:21 +0100 Subject: [PATCH 3/3] Increment Chart version to 1.46.3 Signed-off-by: portswigger-amason --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index b7877a6275..0080c38f20 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.46.2 +version: 1.46.3 appVersion: 2.8.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 75e65b45ed..fe2000a757 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.46.2](https://img.shields.io/badge/Version-1.46.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.1](https://img.shields.io/badge/AppVersion-2.8.1-informational?style=flat-square) +![Version: 1.46.3](https://img.shields.io/badge/Version-1.46.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.1](https://img.shields.io/badge/AppVersion-2.8.1-informational?style=flat-square) Grafana Tempo in MicroService mode