Update -memberlist.join flag to use DNS-SD format (#2549)

* Update -memberlist.join flag to use DNS-SD format Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Update -memberlist.join flag format in helm Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Update CHANGELOGs Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Update helm and jsonnet tests Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Reorder CHANGELOG.md Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
grafana · Jul 26, 2022 · a943542 · a943542
1 parent 8ca3ed6
commit a943542
Show file tree

Hide file tree

Showing 32 changed files with 191 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -72,6 +72,7 @@
   * `autoscaling_ruler_querier_min_replicas`: minimum number of ruler-querier replicas.
   * `autoscaling_ruler_querier_max_replicas`: maximum number of ruler-querier replicas.
   * `autoscaling_prometheus_url`: Prometheus base URL from which to scrape Mimir metrics (e.g. `http://prometheus.default:9090/prometheus`).
+* [ENHANCEMENT] Memberlist now uses DNS service-discovery by default. #2549
 
 ### Mimirtool
 

diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -14,6 +14,7 @@ Entries should include a reference to the Pull Request that introduced the chang
 ## main / unreleased
 
 * [ENHANCEMENT] Add backfill endpoints to Nginx configuration. #2478
+* [ENHANCEMENT] Memberlist now uses DNS service-discovery by default. #2549
 * [BUGFIX] `nginx.extraArgs` are now actually passed to the nginx container. #2336
 * [BUGFIX] Add missing `containerSecurityContext` to alertmanager and tokengen job. #2416
 

diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
@@ -229,7 +229,7 @@ mimir:
       abort_if_cluster_join_fails: false
       compression_enabled: false
       join_members:
-      - {{ include "mimir.fullname" . }}-gossip-ring
+      - dns+{{ include "mimir.fullname" . }}-gossip-ring
 
     ruler:
       alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.{{ template "mimir.fullname" . }}-alertmanager-headless.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}/alertmanager

diff --git a/.../test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml b/.../test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -104,7 +104,7 @@ data:
       abort_if_cluster_join_fails: false
       compression_enabled: false
       join_members:
-      - test-enterprise-configmap-values-mimir-gossip-ring
+      - dns+test-enterprise-configmap-values-mimir-gossip-ring
     ruler:
       alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-enterprise-configmap-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager
       enable_api: true

diff --git a/...helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml b/...helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -11,4 +11,4 @@ metadata:
     app.kubernetes.io/managed-by: Helm
   namespace: "citestns"
 data:
-  mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2RhdGEvbWV0cmljcy1hY3Rpdml0eS5sb2cKYWRtaW5fYXBpOgogIGxlYWRlcl9lbGVjdGlvbjoKICAgIGVuYWJsZWQ6IHRydWUKICAgIHJpbmc6CiAgICAgIGt2c3RvcmU6CiAgICAgICAgc3RvcmU6IG1lbWJlcmxpc3QKYWRtaW5fY2xpZW50OgogIHN0b3JhZ2U6CiAgICBzMzoKICAgICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgICBidWNrZXRfbmFtZTogZW50ZXJwcmlzZS1tZXRyaWNzLWFkbWluCiAgICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICAgIGluc2VjdXJlOiB0cnVlCiAgICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgdHlwZTogczMKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAvZGF0YQogIGVuYWJsZV9hcGk6IHRydWUKICBleHRlcm5hbF91cmw6IC9hbGVydG1hbmFnZXIKYWxlcnRtYW5hZ2VyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci1ydWxlcgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IG1pbWlyLXRzZGIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgdHNkYjoKICAgIGRpcjogL2RhdGEvdHNkYgpjbHVzdGVyX25hbWU6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMKY29tcGFjdG9yOgogIGRhdGFfZGlyOiAvZGF0YQpmcm9udGVuZDoKICBhbGlnbl9xdWVyaWVzX3dpdGhfc3RlcDogdHJ1ZQogIGxvZ19xdWVyaWVzX2xvbmdlcl90aGFuOiAxMHMKZnJvbnRlbmRfd29ya2VyOgogIGZyb250ZW5kX2FkZHJlc3M6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItcXVlcnktZnJvbnRlbmQtaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZ2F0ZXdheToKICBwcm94eToKICAgIGFkbWluX2FwaToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXIuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGRlZmF1bHQ6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1kaXN0cmlidXRvci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbDo5MDk1CiAgICBpbmdlc3RlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1pbmdlc3Rlci5jaXRlc3Rucy5zdmM6ODA4MAogICAgcXVlcnlfZnJvbnRlbmQ6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItcXVlcnktZnJvbnRlbmQuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHJ1bGVyOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXJ1bGVyLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBzdG9yZV9nYXRld2F5OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXN0b3JlLWdhdGV3YXkuY2l0ZXN0bnMuc3ZjOjgwODAKaW5nZXN0ZXI6CiAgcmluZzoKICAgIGZpbmFsX3NsZWVwOiAwcwogICAgbnVtX3Rva2VuczogNTEyCiAgICB1bnJlZ2lzdGVyX29uX3NodXRkb3duOiBmYWxzZQppbmdlc3Rlcl9jbGllbnQ6CiAgZ3JwY19jbGllbnRfY29uZmlnOgogICAgbWF4X3JlY3ZfbXNnX3NpemU6IDEwNDg1NzYwMAogICAgbWF4X3NlbmRfbXNnX3NpemU6IDEwNDg1NzYwMAppbnN0cnVtZW50YXRpb246CiAgZGlzdHJpYnV0b3JfY2xpZW50OgogICAgYWRkcmVzczogZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZGlzdHJpYnV0b3ItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWw6OTA5NQogIGVuYWJsZWQ6IHRydWUKbGljZW5zZToKICBwYXRoOiAvbGljZW5zZS9saWNlbnNlLmp3dApsaW1pdHM6IHt9Cm1lbWJlcmxpc3Q6CiAgYWJvcnRfaWZfY2x1c3Rlcl9qb2luX2ZhaWxzOiBmYWxzZQogIGNvbXByZXNzaW9uX2VuYWJsZWQ6IGZhbHNlCiAgam9pbl9tZW1iZXJzOgogIC0gdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1nb3NzaXAtcmluZwpydWxlcjoKICBhbGVydG1hbmFnZXJfdXJsOiBkbnNzcnZub2EraHR0cDovL19odHRwLW1ldHJpY3MuX3RjcC50ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbC9hbGVydG1hbmFnZXIKICBlbmFibGVfYXBpOiB0cnVlCiAgcnVsZV9wYXRoOiAvZGF0YQpydWxlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CnJ1bnRpbWVfY29uZmlnOgogIGZpbGU6IC92YXIvbWltaXIvcnVudGltZS55YW1sCnNlcnZlcjoKICBncnBjX3NlcnZlcl9tYXhfY29uY3VycmVudF9zdHJlYW1zOiAxMDAw
+  mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2RhdGEvbWV0cmljcy1hY3Rpdml0eS5sb2cKYWRtaW5fYXBpOgogIGxlYWRlcl9lbGVjdGlvbjoKICAgIGVuYWJsZWQ6IHRydWUKICAgIHJpbmc6CiAgICAgIGt2c3RvcmU6CiAgICAgICAgc3RvcmU6IG1lbWJlcmxpc3QKYWRtaW5fY2xpZW50OgogIHN0b3JhZ2U6CiAgICBzMzoKICAgICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgICBidWNrZXRfbmFtZTogZW50ZXJwcmlzZS1tZXRyaWNzLWFkbWluCiAgICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICAgIGluc2VjdXJlOiB0cnVlCiAgICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgdHlwZTogczMKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAvZGF0YQogIGVuYWJsZV9hcGk6IHRydWUKICBleHRlcm5hbF91cmw6IC9hbGVydG1hbmFnZXIKYWxlcnRtYW5hZ2VyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci1ydWxlcgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IG1pbWlyLXRzZGIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgdHNkYjoKICAgIGRpcjogL2RhdGEvdHNkYgpjbHVzdGVyX25hbWU6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMKY29tcGFjdG9yOgogIGRhdGFfZGlyOiAvZGF0YQpmcm9udGVuZDoKICBhbGlnbl9xdWVyaWVzX3dpdGhfc3RlcDogdHJ1ZQogIGxvZ19xdWVyaWVzX2xvbmdlcl90aGFuOiAxMHMKZnJvbnRlbmRfd29ya2VyOgogIGZyb250ZW5kX2FkZHJlc3M6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItcXVlcnktZnJvbnRlbmQtaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZ2F0ZXdheToKICBwcm94eToKICAgIGFkbWluX2FwaToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXIuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGRlZmF1bHQ6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1kaXN0cmlidXRvci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbDo5MDk1CiAgICBpbmdlc3RlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1pbmdlc3Rlci5jaXRlc3Rucy5zdmM6ODA4MAogICAgcXVlcnlfZnJvbnRlbmQ6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItcXVlcnktZnJvbnRlbmQuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHJ1bGVyOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXJ1bGVyLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBzdG9yZV9nYXRld2F5OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXN0b3JlLWdhdGV3YXkuY2l0ZXN0bnMuc3ZjOjgwODAKaW5nZXN0ZXI6CiAgcmluZzoKICAgIGZpbmFsX3NsZWVwOiAwcwogICAgbnVtX3Rva2VuczogNTEyCiAgICB1bnJlZ2lzdGVyX29uX3NodXRkb3duOiBmYWxzZQppbmdlc3Rlcl9jbGllbnQ6CiAgZ3JwY19jbGllbnRfY29uZmlnOgogICAgbWF4X3JlY3ZfbXNnX3NpemU6IDEwNDg1NzYwMAogICAgbWF4X3NlbmRfbXNnX3NpemU6IDEwNDg1NzYwMAppbnN0cnVtZW50YXRpb246CiAgZGlzdHJpYnV0b3JfY2xpZW50OgogICAgYWRkcmVzczogZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZGlzdHJpYnV0b3ItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWw6OTA5NQogIGVuYWJsZWQ6IHRydWUKbGljZW5zZToKICBwYXRoOiAvbGljZW5zZS9saWNlbnNlLmp3dApsaW1pdHM6IHt9Cm1lbWJlcmxpc3Q6CiAgYWJvcnRfaWZfY2x1c3Rlcl9qb2luX2ZhaWxzOiBmYWxzZQogIGNvbXByZXNzaW9uX2VuYWJsZWQ6IGZhbHNlCiAgam9pbl9tZW1iZXJzOgogIC0gZG5zK3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZ29zc2lwLXJpbmcKcnVsZXI6CiAgYWxlcnRtYW5hZ2VyX3VybDogZG5zc3J2bm9hK2h0dHA6Ly9faHR0cC1tZXRyaWNzLl90Y3AudGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWwvYWxlcnRtYW5hZ2VyCiAgZW5hYmxlX2FwaTogdHJ1ZQogIHJ1bGVfcGF0aDogL2RhdGEKcnVsZXJfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IG1pbWlyLXJ1bGVyCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW5pby5jaXRlc3Rucy5zdmM6OTAwMAogICAgaW5zZWN1cmU6IHRydWUKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldApydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbApzZXJ2ZXI6CiAgZ3JwY19zZXJ2ZXJfbWF4X2NvbmN1cnJlbnRfc3RyZWFtczogMTAwMA==
diff --git a/...ations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml b/...ations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -82,7 +82,7 @@ data:
       abort_if_cluster_join_fails: false
       compression_enabled: false
       join_members:
-      - test-oss-values-mimir-gossip-ring
+      - dns+test-oss-values-mimir-gossip-ring
     ruler:
       alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-oss-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager
       enable_api: true

diff --git a/operations/mimir-tests/test-autoscaling-generated.yaml b/operations/mimir-tests/test-autoscaling-generated.yaml
@@ -483,7 +483,7 @@ spec:
         - -ingester.ring.store=memberlist
         - -mem-ballast-size-bytes=1073741824
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+gossip-ring.default.svc.cluster.local:7946
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.max-connection-age=2m
         - -server.grpc.keepalive.max-connection-age-grace=5m
@@ -567,7 +567,7 @@ spec:
         - -ingester.ring.store=memberlist
         - -mem-ballast-size-bytes=268435456
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+gossip-ring.default.svc.cluster.local:7946
         - -querier.frontend-client.grpc-max-send-msg-size=104857600
         - -querier.max-concurrent=8
         - -querier.scheduler-address=query-scheduler-discovery.default.svc.cluster.local:9095
@@ -794,7 +794,7 @@ spec:
         - -ingester.ring.replication-factor=3
         - -ingester.ring.store=memberlist
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+gossip-ring.default.svc.cluster.local:7946
         - -ruler-storage.backend=gcs
         - -ruler-storage.gcs.bucket-name=rules-bucket
         - -ruler.alertmanager-url=http://alertmanager.default.svc.cluster.local/alertmanager
@@ -886,7 +886,7 @@ spec:
         - -ingester.ring.store=memberlist
         - -mem-ballast-size-bytes=268435456
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+gossip-ring.default.svc.cluster.local:7946
         - -querier.frontend-client.grpc-max-send-msg-size=104857600
         - -querier.max-concurrent=8
         - -querier.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local:9095
@@ -1100,7 +1100,7 @@ spec:
         - -alertmanager.storage.path=/data
         - -alertmanager.web.external-url=http://test/alertmanager
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+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
@@ -1200,7 +1200,7 @@ spec:
         - -compactor.split-groups=1
         - -compactor.symbols-flushers-concurrency=4
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+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
@@ -1304,7 +1304,7 @@ spec:
         - -ingester.ring.tokens-file-path=/data/tokens
         - -ingester.ring.unregister-on-shutdown=true
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+gossip-ring.default.svc.cluster.local:7946
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc-max-concurrent-streams=10000
         - -server.grpc.keepalive.min-time-between-pings=10s
@@ -1628,7 +1628,7 @@ spec:
         - -blocks-storage.bucket-store.sync-interval=15m
         - -blocks-storage.gcs.bucket-name=blocks-bucket
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+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

diff --git a/operations/mimir-tests/test-defaults-generated.yaml b/operations/mimir-tests/test-defaults-generated.yaml
@@ -352,7 +352,7 @@ spec:
         - -ingester.ring.store=memberlist
         - -mem-ballast-size-bytes=1073741824
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+gossip-ring.default.svc.cluster.local:7946
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc.keepalive.max-connection-age=2m
         - -server.grpc.keepalive.max-connection-age-grace=5m
@@ -437,7 +437,7 @@ spec:
         - -ingester.ring.store=memberlist
         - -mem-ballast-size-bytes=268435456
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+gossip-ring.default.svc.cluster.local:7946
         - -querier.frontend-client.grpc-max-send-msg-size=104857600
         - -querier.max-concurrent=8
         - -querier.scheduler-address=query-scheduler-discovery.default.svc.cluster.local:9095
@@ -667,7 +667,7 @@ spec:
         - -compactor.split-groups=1
         - -compactor.symbols-flushers-concurrency=4
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+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
@@ -771,7 +771,7 @@ spec:
         - -ingester.ring.tokens-file-path=/data/tokens
         - -ingester.ring.unregister-on-shutdown=true
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+gossip-ring.default.svc.cluster.local:7946
         - -runtime-config.file=/etc/mimir/overrides.yaml
         - -server.grpc-max-concurrent-streams=10000
         - -server.grpc.keepalive.min-time-between-pings=10s
@@ -1095,7 +1095,7 @@ spec:
         - -blocks-storage.bucket-store.sync-interval=15m
         - -blocks-storage.gcs.bucket-name=blocks-bucket
         - -memberlist.bind-port=7946
-        - -memberlist.join=gossip-ring.default.svc.cluster.local:7946
+        - -memberlist.join=dns+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