From a106b061cba5215833875bf963c9e9a128f6df5e Mon Sep 17 00:00:00 2001 From: Dmitriy Okladin Date: Fri, 1 Dec 2023 13:16:00 +0300 Subject: [PATCH] jsonnet: add memberlist_ring_enabled check condition for consul_config_map (#11312) The jsonnet lib should not generate a ConfigMap for consul if you are using memberlist. Fixes #11311 --- CHANGELOG.md | 2 ++ production/ksonnet/loki/memberlist.libsonnet | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8d9bbb162f..e471a343c063 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -83,6 +83,8 @@ #### Jsonnet +* [11312](https://github.com/grafana/loki/pull/11312) **sentoz**: Loki ksonnet: Do not generate configMap for consul if you are using memberlist + * [11020](https://github.com/grafana/loki/pull/11020) **ashwanthgoli**: Loki ksonnet: Do not generate table-manager manifests if shipper store is in-use. * [10784](https://github.com/grafana/loki/pull/10894) **slim-bean** Update index gateway client to use a headless service. diff --git a/production/ksonnet/loki/memberlist.libsonnet b/production/ksonnet/loki/memberlist.libsonnet index 5bd95183c6be..636fd90e1f0c 100644 --- a/production/ksonnet/loki/memberlist.libsonnet +++ b/production/ksonnet/loki/memberlist.libsonnet @@ -159,4 +159,5 @@ // Disable the consul deployment if not migrating and using memberlist consul_deployment: if $._config.memberlist_ring_enabled && !$._config.multikv_migration_enabled && !$._config.multikv_migration_teardown then {} else super.consul_deployment, consul_service: if $._config.memberlist_ring_enabled && !$._config.multikv_migration_enabled && !$._config.multikv_migration_teardown then {} else super.consul_service, + consul_config_map: if $._config.memberlist_ring_enabled && !$._config.multikv_migration_enabled && !$._config.multikv_migration_teardown then {} else super.consul_config_map, }