From b16e58954487465365b98471d7d359663f91128f Mon Sep 17 00:00:00 2001 From: Kaviraj Date: Thu, 26 Aug 2021 11:27:38 +0200 Subject: [PATCH] Make original configmap mount name static (#914) * Make original configmap mount name static * Changelog --- CHANGELOG.md | 2 ++ operations/jsonnet/microservices/compactor.libsonnet | 2 +- operations/jsonnet/microservices/distributor.libsonnet | 2 +- operations/jsonnet/microservices/ingester.libsonnet | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c2d671c001..c564fe21d72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ * [ENHANCEMENT] Added traceid to `trace too large message`. [#888](https://github.com/grafana/tempo/pull/888) (@mritunjaysharma394) * [ENHANCEMENT] Add support to tempo workloads to `overrides` from single configmap in microservice mode. [#896](https://github.com/grafana/tempo/pull/896) (@kavirajk) * [ENHANCEMENT] Make `overrides_config` block name consistent with Loki and Cortex in microservice mode. [#906](https://github.com/grafana/tempo/pull/906) (@kavirajk) +* [ENHANCEMENT] Make `overrides_config` mount name static `tempo-overrides` in the tempo workloads in microservice mode. [#906](https://github.com/grafana/tempo/pull/914) (@kavirajk) + ## v1.1.0-rc.0 / 2021-08-11 diff --git a/operations/jsonnet/microservices/compactor.libsonnet b/operations/jsonnet/microservices/compactor.libsonnet index 3c8c489dc6e..7ddcd5afb53 100644 --- a/operations/jsonnet/microservices/compactor.libsonnet +++ b/operations/jsonnet/microservices/compactor.libsonnet @@ -44,7 +44,7 @@ }) + deployment.mixin.spec.template.spec.withVolumes([ volume.fromConfigMap(tempo_config_volume, $.tempo_compactor_configmap.metadata.name), - volume.fromConfigMap(tempo_overrides_config_volume, $.overrides_config.metadata.name), + volume.fromConfigMap(tempo_overrides_config_volume, $._config.overrides_configmap_name), ]), tempo_compactor_service: diff --git a/operations/jsonnet/microservices/distributor.libsonnet b/operations/jsonnet/microservices/distributor.libsonnet index e0cc7e3c108..443b441077a 100644 --- a/operations/jsonnet/microservices/distributor.libsonnet +++ b/operations/jsonnet/microservices/distributor.libsonnet @@ -48,7 +48,7 @@ }) + deployment.mixin.spec.template.spec.withVolumes([ volume.fromConfigMap(tempo_config_volume, $.tempo_distributor_configmap.metadata.name), - volume.fromConfigMap(tempo_overrides_config_volume, $.overrides_config.metadata.name), + volume.fromConfigMap(tempo_overrides_config_volume, $._config.overrides_configmap_name), ]), tempo_distributor_service: diff --git a/operations/jsonnet/microservices/ingester.libsonnet b/operations/jsonnet/microservices/ingester.libsonnet index b6813bc7971..da009381fcf 100644 --- a/operations/jsonnet/microservices/ingester.libsonnet +++ b/operations/jsonnet/microservices/ingester.libsonnet @@ -59,7 +59,7 @@ }) + statefulset.mixin.spec.template.spec.withVolumes([ volume.fromConfigMap(tempo_config_volume, $.tempo_ingester_configmap.metadata.name), - volume.fromConfigMap(tempo_overrides_config_volume, $.overrides_config.metadata.name), + volume.fromConfigMap(tempo_overrides_config_volume, $._config.overrides_configmap_name), ]), tempo_ingester_service: