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).
grafana · Jun 21, 2021 · 0949d52 · 0949d52
1 parent 8783474
commit 0949d52
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/operations/jsonnet/microservices/configmap.libsonnet b/operations/jsonnet/microservices/configmap.libsonnet
@@ -51,21 +51,21 @@
   },
 
   tempo_distributor_config:: $.tempo_config {
-    distributor: {
+    distributor+: {
       receivers: $._config.distributor.receivers,
     },
   },
 
   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',
         },
       },