Do it for Helm too

Signed-off-by: Marco Pracucci <[email protected]>
grafana · Oct 16, 2023 · 5190662 · 5190662
1 parent 6aa4f7f
commit 5190662
Show file tree

Hide file tree

Showing 31 changed files with 191 additions and 190 deletions.
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -29,6 +29,7 @@ Entries should include a reference to the Pull Request that introduced the chang
 ## main / unreleased
 
 * [CHANGE] Reduce `-server.grpc-max-concurrent-streams` from 1000 to 500 for ingester and to 100 for all components. #5666
+* [CHANGE] Changed default `clusterDomain` from `cluster.local` to `cluster.local.` to reduce the number of DNS lookups made by Mimir. #6389
 * [ENHANCEMENT] Update the `rollout-operator` subchart to `0.9.1`. #6022 #6110
 * [BUGFIX] Let the unified gatway/nginx config listen on IPv6 as well. Followup to #5948. #6204
 

diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
@@ -47,7 +47,7 @@ global:
   # -- Definitions to set up nginx resolver
   dnsService: kube-dns
   dnsNamespace: kube-system
-  clusterDomain: cluster.local
+  clusterDomain: cluster.local.
 
   # -- Common environment variables to add to all pods directly managed by this chart.
   # scope: admin-api, alertmanager, compactor, distributor, gateway, ingester, memcached, nginx, overrides-exporter, querier, query-frontend, query-scheduler, ruler, store-gateway, smoke-test, tokengen

diff --git a/...elm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml b/...elm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -208,7 +208,7 @@ data:
         tls_server_name: gem.grafana.com
     instrumentation:
       distributor_client:
-        address: dns:///enterprise-https-values-mimir-distributor-headless.citestns.svc.cluster.local:9095
+        address: dns:///enterprise-https-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095
         tls_cert_path: /certs/tls.crt
         tls_enabled: true
         tls_insecure_skip_verify: false
@@ -225,7 +225,7 @@ data:
       abort_if_cluster_join_fails: false
       compression_enabled: false
       join_members:
-      - dns+enterprise-https-values-mimir-gossip-ring.citestns.svc.cluster.local:7946
+      - dns+enterprise-https-values-mimir-gossip-ring.citestns.svc.cluster.local.:7946
       tls_cert_path: /certs/tls.crt
       tls_enabled: true
       tls_insecure_skip_verify: false
@@ -254,7 +254,7 @@ data:
         tls_insecure_skip_verify: false
         tls_key_path: /certs/tls.key
         tls_server_name: gem.grafana.com
-      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.enterprise-https-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager
+      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.enterprise-https-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager
       enable_api: true
       rule_path: /data
       ruler_client:

diff --git a/...m/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml b/...m/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -87,7 +87,7 @@ data:
         default:
           url: http://gateway-enterprise-values-mimir-admin-api.citestns.svc:8080
         distributor:
-          url: dns:///gateway-enterprise-values-mimir-distributor-headless.citestns.svc.cluster.local:9095
+          url: dns:///gateway-enterprise-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095
         ingester:
           url: http://gateway-enterprise-values-mimir-ingester-headless.citestns.svc:8080
         query_frontend:
@@ -109,7 +109,7 @@ data:
         max_send_msg_size: 104857600
     instrumentation:
       distributor_client:
-        address: dns:///gateway-enterprise-values-mimir-distributor-headless.citestns.svc.cluster.local:9095
+        address: dns:///gateway-enterprise-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095
       enabled: true
     license:
       path: /license/license.jwt
@@ -121,13 +121,13 @@ data:
       abort_if_cluster_join_fails: false
       compression_enabled: false
       join_members:
-      - dns+gateway-enterprise-values-mimir-gossip-ring.citestns.svc.cluster.local:7946
+      - dns+gateway-enterprise-values-mimir-gossip-ring.citestns.svc.cluster.local.:7946
     querier:
       max_concurrent: 16
     query_scheduler:
       max_outstanding_requests_per_tenant: 800
     ruler:
-      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.gateway-enterprise-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager
+      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.gateway-enterprise-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager
       enable_api: true
       rule_path: /data
     ruler_storage:

diff --git a/...s/gateway-nginx-values-generated/mimir-distributed/templates/gateway/nginx-configmap.yaml b/...s/gateway-nginx-values-generated/mimir-distributed/templates/gateway/nginx-configmap.yaml
@@ -36,7 +36,7 @@ data:
     
       sendfile     on;
       tcp_nopush   on;
-      resolver kube-dns.kube-system.svc.cluster.local;
+      resolver kube-dns.kube-system.svc.cluster.local.;
     
       # Ensure that X-Scope-OrgID is always present, default to the no_auth_tenant for backwards compatibility when multi-tenancy was turned off.
       map $http_x_scope_orgid $ensured_x_scope_orgid {
@@ -63,66 +63,66 @@ data:
     
         # Distributor endpoints
         location /distributor {
-          set $distributor gateway-nginx-values-mimir-distributor-headless.citestns.svc.cluster.local;
+          set $distributor gateway-nginx-values-mimir-distributor-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$distributor:8080$request_uri;
         }
         location = /api/v1/push {
-          set $distributor gateway-nginx-values-mimir-distributor-headless.citestns.svc.cluster.local;
+          set $distributor gateway-nginx-values-mimir-distributor-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$distributor:8080$request_uri;
         }
         location /otlp/v1/metrics {
-          set $distributor gateway-nginx-values-mimir-distributor-headless.citestns.svc.cluster.local;
+          set $distributor gateway-nginx-values-mimir-distributor-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$distributor:8080$request_uri;
         }
     
         # Alertmanager endpoints
         location /alertmanager {
-          set $alertmanager gateway-nginx-values-mimir-alertmanager-headless.citestns.svc.cluster.local;
+          set $alertmanager gateway-nginx-values-mimir-alertmanager-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$alertmanager:8080$request_uri;
         }
         location = /multitenant_alertmanager/status {
-          set $alertmanager gateway-nginx-values-mimir-alertmanager-headless.citestns.svc.cluster.local;
+          set $alertmanager gateway-nginx-values-mimir-alertmanager-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$alertmanager:8080$request_uri;
         }
         location = /api/v1/alerts {
-          set $alertmanager gateway-nginx-values-mimir-alertmanager-headless.citestns.svc.cluster.local;
+          set $alertmanager gateway-nginx-values-mimir-alertmanager-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$alertmanager:8080$request_uri;
         }
     
         # Ruler endpoints
         location /prometheus/config/v1/rules {
-          set $ruler gateway-nginx-values-mimir-ruler.citestns.svc.cluster.local;
+          set $ruler gateway-nginx-values-mimir-ruler.citestns.svc.cluster.local.;
           proxy_pass      http://$ruler:8080$request_uri;
         }
         location /prometheus/api/v1/rules {
-          set $ruler gateway-nginx-values-mimir-ruler.citestns.svc.cluster.local;
+          set $ruler gateway-nginx-values-mimir-ruler.citestns.svc.cluster.local.;
           proxy_pass      http://$ruler:8080$request_uri;
         }
     
         location /prometheus/api/v1/alerts {
-          set $ruler gateway-nginx-values-mimir-ruler.citestns.svc.cluster.local;
+          set $ruler gateway-nginx-values-mimir-ruler.citestns.svc.cluster.local.;
           proxy_pass      http://$ruler:8080$request_uri;
         }
         location = /ruler/ring {
-          set $ruler gateway-nginx-values-mimir-ruler.citestns.svc.cluster.local;
+          set $ruler gateway-nginx-values-mimir-ruler.citestns.svc.cluster.local.;
           proxy_pass      http://$ruler:8080$request_uri;
         }
     
         # Rest of /prometheus goes to the query frontend
         location /prometheus {
-          set $query_frontend gateway-nginx-values-mimir-query-frontend.citestns.svc.cluster.local;
+          set $query_frontend gateway-nginx-values-mimir-query-frontend.citestns.svc.cluster.local.;
           proxy_pass      http://$query_frontend:8080$request_uri;
         }
     
         # Buildinfo endpoint can go to any component
         location = /api/v1/status/buildinfo {
-          set $query_frontend gateway-nginx-values-mimir-query-frontend.citestns.svc.cluster.local;
+          set $query_frontend gateway-nginx-values-mimir-query-frontend.citestns.svc.cluster.local.;
           proxy_pass      http://$query_frontend:8080$request_uri;
         }
     
         # Compactor endpoint for uploading blocks
         location /api/v1/upload/block/ {
-          set $compactor gateway-nginx-values-mimir-compactor.citestns.svc.cluster.local;
+          set $compactor gateway-nginx-values-mimir-compactor.citestns.svc.cluster.local.;
           proxy_pass      http://$compactor:8080$request_uri;
         }
       }

diff --git a/...s/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml b/...s/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -77,13 +77,13 @@ data:
       abort_if_cluster_join_fails: false
       compression_enabled: false
       join_members:
-      - dns+gateway-nginx-values-mimir-gossip-ring.citestns.svc.cluster.local:7946
+      - dns+gateway-nginx-values-mimir-gossip-ring.citestns.svc.cluster.local.:7946
     querier:
       max_concurrent: 16
     query_scheduler:
       max_outstanding_requests_per_tenant: 800
     ruler:
-      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.gateway-nginx-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager
+      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.gateway-nginx-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager
       enable_api: true
       rule_path: /data
     ruler_storage:

diff --git a/...elm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml b/...elm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -87,7 +87,7 @@ data:
         default:
           url: http://graphite-enabled-values-mimir-admin-api.citestns.svc:8080
         distributor:
-          url: dns:///graphite-enabled-values-mimir-distributor-headless.citestns.svc.cluster.local:9095
+          url: dns:///graphite-enabled-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095
         graphite_querier:
           url: http://graphite-enabled-values-mimir-graphite-querier.citestns.svc:8080
         graphite_write_proxy:
@@ -132,7 +132,7 @@ data:
         max_send_msg_size: 104857600
     instrumentation:
       distributor_client:
-        address: dns:///graphite-enabled-values-mimir-distributor-headless.citestns.svc.cluster.local:9095
+        address: dns:///graphite-enabled-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095
       enabled: true
     license:
       path: /license/license.jwt
@@ -144,13 +144,13 @@ data:
       abort_if_cluster_join_fails: false
       compression_enabled: false
       join_members:
-      - dns+graphite-enabled-values-mimir-gossip-ring.citestns.svc.cluster.local:7946
+      - dns+graphite-enabled-values-mimir-gossip-ring.citestns.svc.cluster.local.:7946
     querier:
       max_concurrent: 16
     query_scheduler:
       max_outstanding_requests_per_tenant: 800
     ruler:
-      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.graphite-enabled-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager
+      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.graphite-enabled-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager
       enable_api: true
       rule_path: /data
     ruler_storage:

diff --git a/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -90,13 +90,13 @@ data:
       abort_if_cluster_join_fails: false
       compression_enabled: false
       join_members:
-      - dns+large-values-mimir-gossip-ring.citestns.svc.cluster.local:7946
+      - dns+large-values-mimir-gossip-ring.citestns.svc.cluster.local.:7946
     querier:
       max_concurrent: 16
     query_scheduler:
       max_outstanding_requests_per_tenant: 800
     ruler:
-      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.large-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager
+      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.large-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager
       enable_api: true
       rule_path: /data
     ruler_storage:

diff --git a/.../helm/tests/large-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/.../helm/tests/large-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml
@@ -36,7 +36,7 @@ data:
     
       sendfile     on;
       tcp_nopush   on;
-      resolver kube-dns.kube-system.svc.cluster.local;
+      resolver kube-dns.kube-system.svc.cluster.local.;
     
       # Ensure that X-Scope-OrgID is always present, default to the no_auth_tenant for backwards compatibility when multi-tenancy was turned off.
       map $http_x_scope_orgid $ensured_x_scope_orgid {
@@ -58,66 +58,66 @@ data:
     
         # Distributor endpoints
         location /distributor {
-          set $distributor large-values-mimir-distributor-headless.citestns.svc.cluster.local;
+          set $distributor large-values-mimir-distributor-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$distributor:8080$request_uri;
         }
         location = /api/v1/push {
-          set $distributor large-values-mimir-distributor-headless.citestns.svc.cluster.local;
+          set $distributor large-values-mimir-distributor-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$distributor:8080$request_uri;
         }
         location /otlp/v1/metrics {
-          set $distributor large-values-mimir-distributor-headless.citestns.svc.cluster.local;
+          set $distributor large-values-mimir-distributor-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$distributor:8080$request_uri;
         }
     
         # Alertmanager endpoints
         location /alertmanager {
-          set $alertmanager large-values-mimir-alertmanager-headless.citestns.svc.cluster.local;
+          set $alertmanager large-values-mimir-alertmanager-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$alertmanager:8080$request_uri;
         }
         location = /multitenant_alertmanager/status {
-          set $alertmanager large-values-mimir-alertmanager-headless.citestns.svc.cluster.local;
+          set $alertmanager large-values-mimir-alertmanager-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$alertmanager:8080$request_uri;
         }
         location = /api/v1/alerts {
-          set $alertmanager large-values-mimir-alertmanager-headless.citestns.svc.cluster.local;
+          set $alertmanager large-values-mimir-alertmanager-headless.citestns.svc.cluster.local.;
           proxy_pass      http://$alertmanager:8080$request_uri;
         }
     
         # Ruler endpoints
         location /prometheus/config/v1/rules {
-          set $ruler large-values-mimir-ruler.citestns.svc.cluster.local;
+          set $ruler large-values-mimir-ruler.citestns.svc.cluster.local.;
           proxy_pass      http://$ruler:8080$request_uri;
         }
         location /prometheus/api/v1/rules {
-          set $ruler large-values-mimir-ruler.citestns.svc.cluster.local;
+          set $ruler large-values-mimir-ruler.citestns.svc.cluster.local.;
           proxy_pass      http://$ruler:8080$request_uri;
         }
     
         location /prometheus/api/v1/alerts {
-          set $ruler large-values-mimir-ruler.citestns.svc.cluster.local;
+          set $ruler large-values-mimir-ruler.citestns.svc.cluster.local.;
           proxy_pass      http://$ruler:8080$request_uri;
         }
         location = /ruler/ring {
-          set $ruler large-values-mimir-ruler.citestns.svc.cluster.local;
+          set $ruler large-values-mimir-ruler.citestns.svc.cluster.local.;
           proxy_pass      http://$ruler:8080$request_uri;
         }
     
         # Rest of /prometheus goes to the query frontend
         location /prometheus {
-          set $query_frontend large-values-mimir-query-frontend.citestns.svc.cluster.local;
+          set $query_frontend large-values-mimir-query-frontend.citestns.svc.cluster.local.;
           proxy_pass      http://$query_frontend:8080$request_uri;
         }
     
         # Buildinfo endpoint can go to any component
         location = /api/v1/status/buildinfo {
-          set $query_frontend large-values-mimir-query-frontend.citestns.svc.cluster.local;
+          set $query_frontend large-values-mimir-query-frontend.citestns.svc.cluster.local.;
           proxy_pass      http://$query_frontend:8080$request_uri;
         }
     
         # Compactor endpoint for uploading blocks
         location /api/v1/upload/block/ {
-          set $compactor large-values-mimir-compactor.citestns.svc.cluster.local;
+          set $compactor large-values-mimir-compactor.citestns.svc.cluster.local.;
           proxy_pass      http://$compactor:8080$request_uri;
         }
       }

diff --git a/.../helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml b/.../helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -76,13 +76,13 @@ data:
       abort_if_cluster_join_fails: false
       compression_enabled: false
       join_members:
-      - dns+metamonitoring-values-mimir-gossip-ring.citestns.svc.cluster.local:7946
+      - dns+metamonitoring-values-mimir-gossip-ring.citestns.svc.cluster.local.:7946
     querier:
       max_concurrent: 16
     query_scheduler:
       max_outstanding_requests_per_tenant: 800
     ruler:
-      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.metamonitoring-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager
+      alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.metamonitoring-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager
       enable_api: true
       rule_path: /data
     ruler_storage: