Merge pull request #3236 from grafana/tempo-distributed-overrides-fix

[tempo-distributed] New overrides format bugfix
grafana · Jul 23, 2024 · 44e18a2 · 44e18a2
2 parents e6ed5e8 + 103a05d
commit 44e18a2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git 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.15.1
+version: 1.15.2
 appVersion: 2.5.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.15.1](https://img.shields.io/badge/Version-1.15.1-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.15.2](https://img.shields.io/badge/Version-1.15.2-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 in MicroService mode
 
@@ -46,14 +46,14 @@ 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.13.0
+### From Chart versions < 1.15.2
 
-EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset.
-Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones```
+Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides.
 
-### From Chart versions < 1.8.0
+### From Chart versions < 1.13.0
 
-Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides.
+EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset.
+Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones```
 
 ### From Chart versions < 1.6.0
 
@@ -661,7 +661,7 @@ The memcached default args are removed and should be provided manually. The sett
 | minio.rootPassword | string | `"supersecret"` |  |
 | minio.rootUser | string | `"grafana-tempo"` |  |
 | multitenancyEnabled | bool | `false` |  |
-| overrides | string | `"overrides: {}\n"` |  |
+| overrides | object | `{}` |  |
 | prometheusRule.annotations | object | `{}` | PrometheusRule annotations |
 | prometheusRule.enabled | bool | `false` | If enabled, a PrometheusRule resource for Prometheus Operator is created |
 | prometheusRule.groups | list | `[]` | Contents of Prometheus rules file |

diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl
@@ -39,14 +39,14 @@ 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.13.0
+### From Chart versions < 1.15.2
 
-EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset.
-Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones```
+Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides.
 
-### From Chart versions < 1.8.0
+### From Chart versions < 1.13.0
 
-Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides.
+EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset.
+Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones```
 
 ### From Chart versions < 1.6.0
 

diff --git a/charts/tempo-distributed/templates/_helpers.tpl b/charts/tempo-distributed/templates/_helpers.tpl
@@ -188,7 +188,8 @@ Calculate the config from structured and unstructured text input
 Renders the overrides config
 */}}
 {{- define "tempo.overridesConfig" -}}
-{{ tpl .Values.overrides . }}
+overrides:
+{{ toYaml .Values.overrides | indent 2 }}
 {{- end -}}
 
 {{/*

diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
@@ -1436,8 +1436,7 @@ global_overrides:
   per_tenant_override_config: /runtime-config/overrides.yaml
 
 # Per tenants overrides
-overrides: |
-  overrides: {}
+overrides: {}
 
 # memcached is for all of the Tempo pieces to coordinate with each other.
 # you can use your self memcacherd by set enable: false and host + service