Cleanup ringConfig and fix gossip.libsonnet to modify all rings.

CHANGELOG.md

@@ -633,7 +633,8 @@
 * [CHANGE] Enabled attributes in-memory cache in store-gateway. #905
 * [CHANGE] Configured store-gateway to not load blocks containing samples more recent than 10h (because such samples are queried from ingesters). #905
 * [CHANGE] Dynamically compute `-compactor.deletion-delay` based on other settings, in order to reduce the deletion delay as much as possible and lower the number of live blocks in the storage. #907
-* [CHANGE] The config field `distributorConfig` has been renamed to `ingesterRingClientConfig`. #997
+* [CHANGE] The config field `distributorConfig` has been renamed to `ingesterRingClientConfig`. Config field `ringClient` has been removed in favor of `ingesterRingClientConfig`. #997 #1057
+* [CHANGE] Gossip.libsonnet has been fixed to modify all ring configurations, not only ingester ring. Furthermore it now support migration via multi KV store. #1057
 * [CHANGE] Changed the default of `bucket_index_enabled` to `true`. #924
 * [FEATURE] Added query sharding support. It can be enabled setting `cortex_query_sharding_enabled: true` in the `_config` object. #653
 * [FEATURE] Added shuffle-sharding support. It can be enabled and configured using the following config: #902

operations/mimir-tests/test-gossip-generated.yaml

@@ -762,7 +762,6 @@ spec:
             topologyKey: kubernetes.io/hostname
       containers:
       - args:
-        - -consul.hostname=consul.default.svc.cluster.local:8500
         - -distributor.extend-writes=true
         - -distributor.ha-tracker.enable=true
         - -distributor.ha-tracker.enable-for-all-users=true
@@ -775,7 +774,7 @@ spec:
         - -distributor.replication-factor=3
         - -distributor.ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -distributor.ring.prefix=
-        - -distributor.ring.store=consul
+        - -distributor.ring.store=memberlist
         - -mem-ballast-size-bytes=1073741824
         - -memberlist.abort-if-join-fails=false
         - -memberlist.bind-port=7946
@@ -861,7 +860,6 @@ spec:
         - -blocks-storage.bucket-store.sync-dir=/data/tsdb
         - -blocks-storage.bucket-store.sync-interval=15m
         - -blocks-storage.gcs.bucket-name=blocks-bucket
-        - -consul.hostname=consul.default.svc.cluster.local:8500
         - -distributor.health-check-ingesters=true
         - -distributor.replication-factor=3
         - -mem-ballast-size-bytes=268435456
@@ -886,7 +884,7 @@ spec:
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
         - -store-gateway.sharding-ring.replication-factor=3
-        - -store-gateway.sharding-ring.store=consul
+        - -store-gateway.sharding-ring.store=memberlist
         - -store.max-query-length=768h
         - -target=querier
         env:
@@ -1097,7 +1095,6 @@ spec:
         - -blocks-storage.bucket-store.sync-dir=/data/tsdb
         - -blocks-storage.bucket-store.sync-interval=15m
         - -blocks-storage.gcs.bucket-name=blocks-bucket
-        - -consul.hostname=consul.default.svc.cluster.local:8500
         - -distributor.extend-writes=true
         - -distributor.health-check-ingesters=true
         - -distributor.replication-factor=3
@@ -1117,7 +1114,7 @@ spec:
         - -ruler.max-rule-groups-per-tenant=35
         - -ruler.max-rules-per-rule-group=20
         - -ruler.ring.consul.hostname=consul.default.svc.cluster.local:8500
-        - -ruler.ring.store=consul
+        - -ruler.ring.store=memberlist
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc-max-recv-msg-size-bytes=10485760
         - -server.grpc-max-send-msg-size-bytes=10485760
@@ -1127,7 +1124,7 @@ spec:
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
         - -store-gateway.sharding-ring.replication-factor=3
-        - -store-gateway.sharding-ring.store=consul
+        - -store-gateway.sharding-ring.store=memberlist
         - -store.max-query-length=768h
         - -target=ruler
         image: cortexproject/cortex:v1.9.0
@@ -1278,11 +1275,14 @@ spec:
         - -compactor.max-opening-blocks-concurrency=4
         - -compactor.ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -compactor.ring.prefix=
-        - -compactor.ring.store=consul
+        - -compactor.ring.store=memberlist
         - -compactor.ring.wait-stability-min-duration=1m
         - -compactor.split-and-merge-shards=0
         - -compactor.split-groups=1
         - -compactor.symbols-flushers-concurrency=4
+        - -memberlist.abort-if-join-fails=false
+        - -memberlist.bind-port=7946
+        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
@@ -1371,7 +1371,6 @@ spec:
         - -blocks-storage.tsdb.dir=/data/tsdb
         - -blocks-storage.tsdb.isolation-enabled=false
         - -blocks-storage.tsdb.ship-interval=1m
-        - -consul.hostname=consul.default.svc.cluster.local:8500
         - -distributor.health-check-ingesters=true
         - -distributor.replication-factor=3
         - -ingester.heartbeat-period=5s
@@ -1704,14 +1703,17 @@ spec:
         - -blocks-storage.bucket-store.sync-dir=/data/tsdb
         - -blocks-storage.bucket-store.sync-interval=15m
         - -blocks-storage.gcs.bucket-name=blocks-bucket
+        - -memberlist.abort-if-join-fails=false
+        - -memberlist.bind-port=7946
+        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.min-time-between-pings=10s
         - -server.grpc.keepalive.ping-without-stream-allowed=true
         - -server.http-listen-port=8080
         - -store-gateway.sharding-ring.consul.hostname=consul.default.svc.cluster.local:8500
         - -store-gateway.sharding-ring.prefix=
         - -store-gateway.sharding-ring.replication-factor=3
-        - -store-gateway.sharding-ring.store=consul
+        - -store-gateway.sharding-ring.store=memberlist
         - -store-gateway.sharding-ring.tokens-file-path=/data/tokens
         - -store-gateway.sharding-ring.wait-stability-min-duration=1m
         - -target=store-gateway