Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jsonnet/Helm: change default cluster domain to cluster.local. #6389

Merged
merged 2 commits into from
Oct 16, 2023
Merged

Jsonnet/Helm: change default cluster domain to cluster.local. #6389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa4f7f
Jsonnet: change default cluster domain to cluster.local.
pracucci Oct 16, 2023
5190662
Do it for Helm too
pracucci Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
### Jsonnet

* [CHANGE] Ingester: reduce `-server.grpc-max-concurrent-streams` to 500. #5666
* [CHANGE] Changed default `_config.cluster_domain` from `cluster.local` to `cluster.local.` to reduce the number of DNS lookups made by Mimir. #6389
* [FEATURE] Store-gateway: Allow automated zone-by-zone downscaling, that can be enabled via the `store_gateway_automated_downscale_enabled` flag. It is disabled by default. #6149
* [FEATURE] Ingester: Allow to configure TSDB Head early compaction using the following `_config` parameters: #6181
* `ingester_tsdb_head_early_compaction_enabled` (disabled by default)
Expand Down
1 change: 1 addition & 0 deletions operations/helm/charts/mimir-distributed/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion operations/helm/charts/mimir-distributed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...elm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions ...m/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down
28 changes: 14 additions & 14 deletions ...s/gateway-nginx-values-generated/mimir-distributed/templates/gateway/nginx-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions ...elm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
28 changes: 14 additions & 14 deletions .../helm/tests/large-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions .../helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading