From 0949d5264ba8c26fc0c2984db4a36fc91d953172 Mon Sep 17 00:00:00 2001
From: Koenraad Verheyden <koenraad.verheyden@posteo.net>
Date: Mon, 21 Jun 2021 19:47:44 +0200
Subject: [PATCH] Jsonnet: always use append (+:) when extending config (#784)

By not appending new config, the jsonnet library might overwrite custom user configuration. We should favour appending whenever extending an already existing object (in this case $.tempo_config).
---
 operations/jsonnet/microservices/configmap.libsonnet | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/operations/jsonnet/microservices/configmap.libsonnet b/operations/jsonnet/microservices/configmap.libsonnet
index 25431dafdb4..0086e7dd0f7 100644
--- a/operations/jsonnet/microservices/configmap.libsonnet
+++ b/operations/jsonnet/microservices/configmap.libsonnet
@@ -51,7 +51,7 @@
   },
 
   tempo_distributor_config:: $.tempo_config {
-    distributor: {
+    distributor+: {
       receivers: $._config.distributor.receivers,
     },
   },
@@ -59,13 +59,13 @@
   tempo_ingester_config:: $.tempo_config{},
 
   tempo_compactor_config:: $.tempo_config {
-    compactor: {
-      compaction: {
+    compactor+: {
+      compaction+: {
         chunk_size_bytes: 10485760,
         block_retention: '144h',
       },
-      ring: {
-        kvstore: {
+      ring+: {
+        kvstore+: {
           store: 'memberlist',
         },
       },