From 51906629f183425595a17073783329b075dc03ba Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Mon, 16 Oct 2023 09:44:25 +0200 Subject: [PATCH] Do it for Helm too Signed-off-by: Marco Pracucci --- .../charts/mimir-distributed/CHANGELOG.md | 1 + .../helm/charts/mimir-distributed/values.yaml | 2 +- .../templates/mimir-config.yaml | 6 ++-- .../templates/mimir-config.yaml | 8 +++--- .../templates/gateway/nginx-configmap.yaml | 28 +++++++++---------- .../templates/mimir-config.yaml | 4 +-- .../templates/mimir-config.yaml | 8 +++--- .../templates/mimir-config.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- .../templates/mimir-config.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- .../templates/mimir-config.yaml | 8 +++--- .../templates/mimir-config.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- .../templates/mimir-config.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- .../templates/mimir-config.yaml | 8 +++--- .../templates/mimir-config.yaml | 8 +++--- .../templates/mimir-config.yaml | 2 +- .../templates/mimir-config.yaml | 2 +- .../templates/mimir-config.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- .../templates/mimir-config.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- .../templates/mimir-config.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- .../templates/mimir-config.yaml | 8 +++--- .../templates/mimir-config.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- .../templates/mimir-config.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- 31 files changed, 191 insertions(+), 190 deletions(-) diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md index e9b9ebe2511..c201e8c1864 100644 --- 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 index a26f520a968..ce259bc3080 100644 --- 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/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml index 1575385534b..5f65466e2c3 100644 --- a/operations/helm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/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/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml index 3baf2d1e843..e7eb7aee648 100644 --- a/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/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/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/gateway/nginx-configmap.yaml b/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/gateway/nginx-configmap.yaml index 0a95e7ad956..6dad4c88bb3 100644 --- a/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/gateway/nginx-configmap.yaml +++ b/operations/helm/tests/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/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml index 34e4112a2ef..90377d3eb72 100644 --- a/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/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/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml index 3a782fc02d4..219db3035e8 100644 --- a/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/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 index 4b580b563c3..6be34281a2f 100644 --- 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/operations/helm/tests/large-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/large-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index dabdfc60f24..94fa772142d 100644 --- a/operations/helm/tests/large-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/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/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml index d5aeed45f30..fcb743bef8e 100644 --- a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/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: diff --git a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index 66eef326d45..285b6b0e335 100644 --- a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/metamonitoring-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 metamonitoring-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor metamonitoring-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location = /api/v1/push { - set $distributor metamonitoring-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor metamonitoring-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location /otlp/v1/metrics { - set $distributor metamonitoring-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor metamonitoring-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - set $alertmanager metamonitoring-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager metamonitoring-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /multitenant_alertmanager/status { - set $alertmanager metamonitoring-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager metamonitoring-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /api/v1/alerts { - set $alertmanager metamonitoring-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager metamonitoring-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - set $ruler metamonitoring-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler metamonitoring-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/rules { - set $ruler metamonitoring-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler metamonitoring-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/alerts { - set $ruler metamonitoring-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler metamonitoring-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location = /ruler/ring { - set $ruler metamonitoring-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler metamonitoring-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 metamonitoring-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend metamonitoring-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 metamonitoring-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend metamonitoring-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 metamonitoring-values-mimir-compactor.citestns.svc.cluster.local; + set $compactor metamonitoring-values-mimir-compactor.citestns.svc.cluster.local.; proxy_pass http://$compactor:8080$request_uri; } } diff --git a/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml index 65fa13baf44..0843a9e034c 100644 --- a/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -66,7 +66,7 @@ data: default: url: http://openshift-values-mimir-admin-api.citestns.svc:8080 distributor: - url: dns:///openshift-values-mimir-distributor-headless.citestns.svc.cluster.local:9095 + url: dns:///openshift-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095 ingester: url: http://openshift-values-mimir-ingester-headless.citestns.svc:8080 query_frontend: @@ -88,7 +88,7 @@ data: max_send_msg_size: 104857600 instrumentation: distributor_client: - address: dns:///openshift-values-mimir-distributor-headless.citestns.svc.cluster.local:9095 + address: dns:///openshift-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095 enabled: true license: path: /license/license.jwt @@ -100,13 +100,13 @@ data: abort_if_cluster_join_fails: false compression_enabled: false join_members: - - dns+openshift-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+openshift-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.openshift-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.openshift-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data runtime_config: diff --git a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml index a7d6b14629b..538f2e96d33 100644 --- a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -63,13 +63,13 @@ data: abort_if_cluster_join_fails: false compression_enabled: false join_members: - - dns+scheduler-name-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+scheduler-name-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.scheduler-name-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.scheduler-name-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data runtime_config: diff --git a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index af5f5e106a1..0cf2aba8a0f 100644 --- a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/scheduler-name-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 scheduler-name-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor scheduler-name-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location = /api/v1/push { - set $distributor scheduler-name-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor scheduler-name-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location /otlp/v1/metrics { - set $distributor scheduler-name-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor scheduler-name-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - set $alertmanager scheduler-name-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager scheduler-name-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /multitenant_alertmanager/status { - set $alertmanager scheduler-name-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager scheduler-name-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /api/v1/alerts { - set $alertmanager scheduler-name-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager scheduler-name-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - set $ruler scheduler-name-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler scheduler-name-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/rules { - set $ruler scheduler-name-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler scheduler-name-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/alerts { - set $ruler scheduler-name-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler scheduler-name-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location = /ruler/ring { - set $ruler scheduler-name-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler scheduler-name-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 scheduler-name-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend scheduler-name-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 scheduler-name-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend scheduler-name-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 scheduler-name-values-mimir-compactor.citestns.svc.cluster.local; + set $compactor scheduler-name-values-mimir-compactor.citestns.svc.cluster.local.; proxy_pass http://$compactor:8080$request_uri; } } diff --git a/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml index 43b8964a08d..c667c5288b4 100644 --- a/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/small-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+small-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+small-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.small-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.small-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data ruler_storage: diff --git a/operations/helm/tests/small-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/small-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index 03c34a5469c..4853190b425 100644 --- a/operations/helm/tests/small-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/small-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 small-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor small-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location = /api/v1/push { - set $distributor small-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor small-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location /otlp/v1/metrics { - set $distributor small-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor small-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - set $alertmanager small-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager small-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /multitenant_alertmanager/status { - set $alertmanager small-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager small-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /api/v1/alerts { - set $alertmanager small-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager small-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - set $ruler small-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler small-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/rules { - set $ruler small-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler small-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/alerts { - set $ruler small-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler small-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location = /ruler/ring { - set $ruler small-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler small-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 small-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend small-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 small-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend small-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 small-values-mimir-compactor.citestns.svc.cluster.local; + set $compactor small-values-mimir-compactor.citestns.svc.cluster.local.; proxy_pass http://$compactor:8080$request_uri; } } diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml index 4888f66eda1..a62b0d25a8c 100644 --- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -87,7 +87,7 @@ data: default: url: http://test-enterprise-configmap-values-mimir-admin-api.citestns.svc:8080 distributor: - url: dns:///test-enterprise-configmap-values-mimir-distributor-headless.citestns.svc.cluster.local:9095 + url: dns:///test-enterprise-configmap-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095 ingester: url: http://test-enterprise-configmap-values-mimir-ingester-headless.citestns.svc:8080 query_frontend: @@ -108,7 +108,7 @@ data: max_send_msg_size: 104857600 instrumentation: distributor_client: - address: dns:///test-enterprise-configmap-values-mimir-distributor-headless.citestns.svc.cluster.local:9095 + address: dns:///test-enterprise-configmap-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095 enabled: true license: path: /license/license.jwt @@ -120,13 +120,13 @@ data: abort_if_cluster_join_fails: false compression_enabled: false join_members: - - dns+test-enterprise-configmap-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+test-enterprise-configmap-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.test-enterprise-configmap-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-enterprise-configmap-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data ruler_storage: diff --git a/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml index b509900854e..69cd7e07e35 100644 --- a/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -87,7 +87,7 @@ data: default: url: http://test-enterprise-k8s-1.25-values-mimir-admin-api.citestns.svc:8080 distributor: - url: dns:///test-enterprise-k8s-1.25-values-mimir-distributor-headless.citestns.svc.cluster.local:9095 + url: dns:///test-enterprise-k8s-1.25-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095 ingester: url: http://test-enterprise-k8s-1.25-values-mimir-ingester-headless.citestns.svc:8080 query_frontend: @@ -109,7 +109,7 @@ data: max_send_msg_size: 104857600 instrumentation: distributor_client: - address: dns:///test-enterprise-k8s-1.25-values-mimir-distributor-headless.citestns.svc.cluster.local:9095 + address: dns:///test-enterprise-k8s-1.25-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+test-enterprise-k8s-1.25-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+test-enterprise-k8s-1.25-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.test-enterprise-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-enterprise-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data ruler_storage: diff --git a/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/mimir-config.yaml index 23e491c6ecb..db994d7c11e 100644 --- a/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -10,4 +10,4 @@ metadata: release: test-enterprise-legacy-label-values namespace: "citestns" data: - mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2FjdGl2ZS1xdWVyeS10cmFja2VyL2FjdGl2aXR5LmxvZwphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogbWVtYmVybGlzdAphZG1pbl9jbGllbnQ6CiAgc3RvcmFnZToKICAgIHMzOgogICAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICAgIGluc2VjdXJlOiB0cnVlCiAgICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgdHlwZTogczMKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAvZGF0YQogIGVuYWJsZV9hcGk6IHRydWUKICBleHRlcm5hbF91cmw6IC9hbGVydG1hbmFnZXIKICBmYWxsYmFja19jb25maWdfZmlsZTogL2NvbmZpZ3MvYWxlcnRtYW5hZ2VyX2ZhbGxiYWNrX2NvbmZpZy55YW1sCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBidWNrZXRfbmFtZTogZW50ZXJwcmlzZS1tZXRyaWNzLXJ1bGVyCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IGVudGVycHJpc2UtbWV0cmljcy10c2RiCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICB0c2RiOgogICAgZGlyOiAvZGF0YS90c2RiCiAgICBoZWFkX2NvbXBhY3Rpb25faW50ZXJ2YWw6IDE1bQogICAgd2FsX3JlcGxheV9jb25jdXJyZW5jeTogMwpjbHVzdGVyX25hbWU6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzCmNvbXBhY3RvcjoKICBjb21wYWN0aW9uX2ludGVydmFsOiAzMG0KICBkYXRhX2RpcjogL2RhdGEKICBkZWxldGlvbl9kZWxheTogMmgKICBmaXJzdF9sZXZlbF9jb21wYWN0aW9uX3dhaXRfcGVyaW9kOiAyNW0KICBtYXhfY2xvc2luZ19ibG9ja3NfY29uY3VycmVuY3k6IDIKICBtYXhfb3BlbmluZ19ibG9ja3NfY29uY3VycmVuY3k6IDQKICBzaGFyZGluZ19yaW5nOgogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogIHN5bWJvbHNfZmx1c2hlcnNfY29uY3VycmVuY3k6IDQKZnJvbnRlbmQ6CiAgcGFyYWxsZWxpemVfc2hhcmRhYmxlX3F1ZXJpZXM6IHRydWUKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXF1ZXJ5LXNjaGVkdWxlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6OTA5NQpmcm9udGVuZF93b3JrZXI6CiAgZ3JwY19jbGllbnRfY29uZmlnOgogICAgbWF4X3NlbmRfbXNnX3NpemU6IDQxOTQzMDQwMAogIHNjaGVkdWxlcl9hZGRyZXNzOiB0ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtcXVlcnktc2NoZWR1bGVyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo5MDk1CmdhdGV3YXk6CiAgcHJveHk6CiAgICBhZG1pbl9hcGk6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLWVudGVycHJpc2UtbWV0cmljcy1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6ODA4MAogICAgY29tcGFjdG9yOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtY29tcGFjdG9yLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkZWZhdWx0OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsOjkwOTUKICAgIGluZ2VzdGVyOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtaW5nZXN0ZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHF1ZXJ5X2Zyb250ZW5kOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtcXVlcnktZnJvbnRlbmQuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHJ1bGVyOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtcnVsZXIuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHN0b3JlX2dhdGV3YXk6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLWVudGVycHJpc2UtbWV0cmljcy1zdG9yZS1nYXRld2F5LWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo4MDgwCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdG9rZW5zX2ZpbGVfcGF0aDogL2RhdGEvdG9rZW5zCiAgICB1bnJlZ2lzdGVyX29uX3NodXRkb3duOiBmYWxzZQogICAgem9uZV9hd2FyZW5lc3NfZW5hYmxlZDogdHJ1ZQppbmdlc3Rlcl9jbGllbnQ6CiAgZ3JwY19jbGllbnRfY29uZmlnOgogICAgbWF4X3JlY3ZfbXNnX3NpemU6IDEwNDg1NzYwMAogICAgbWF4X3NlbmRfbXNnX3NpemU6IDEwNDg1NzYwMAppbnN0cnVtZW50YXRpb246CiAgZGlzdHJpYnV0b3JfY2xpZW50OgogICAgYWRkcmVzczogZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLWVudGVycHJpc2UtbWV0cmljcy1kaXN0cmlidXRvci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbDo5MDk1CiAgZW5hYmxlZDogdHJ1ZQpsaWNlbnNlOgogIHBhdGg6IC9saWNlbnNlL2xpY2Vuc2Uuand0CmxpbWl0czoKICBtYXhfY2FjaGVfZnJlc2huZXNzOiAxMG0KICBtYXhfcXVlcnlfcGFyYWxsZWxpc206IDI0MAogIG1heF90b3RhbF9xdWVyeV9sZW5ndGg6IDEyMDAwaAptZW1iZXJsaXN0OgogIGFib3J0X2lmX2NsdXN0ZXJfam9pbl9mYWlsczogZmFsc2UKICBjb21wcmVzc2lvbl9lbmFibGVkOiBmYWxzZQogIGpvaW5fbWVtYmVyczoKICAtIGRucyt0ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtZ29zc2lwLXJpbmcuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWw6Nzk0NgpxdWVyaWVyOgogIG1heF9jb25jdXJyZW50OiAxNgpxdWVyeV9zY2hlZHVsZXI6CiAgbWF4X291dHN0YW5kaW5nX3JlcXVlc3RzX3Blcl90ZW5hbnQ6IDgwMApydWxlcjoKICBhbGVydG1hbmFnZXJfdXJsOiBkbnNzcnZub2EraHR0cDovL19odHRwLW1ldHJpY3MuX3RjcC50ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtYWxlcnRtYW5hZ2VyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsL2FsZXJ0bWFuYWdlcgogIGVuYWJsZV9hcGk6IHRydWUKICBydWxlX3BhdGg6IC9kYXRhCnJ1bGVyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtcnVsZXIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1taW5pby5jaXRlc3Rucy5zdmM6OTAwMAogICAgaW5zZWN1cmU6IHRydWUKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldApydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL2VudGVycHJpc2UtbWV0cmljcy9ydW50aW1lLnlhbWwKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9jb25uZWN0aW9uX2FnZTogMm0KICBncnBjX3NlcnZlcl9tYXhfY29ubmVjdGlvbl9hZ2VfZ3JhY2U6IDVtCiAgZ3JwY19zZXJ2ZXJfbWF4X2Nvbm5lY3Rpb25faWRsZTogMW0Kc3RvcmVfZ2F0ZXdheToKICBzaGFyZGluZ19yaW5nOgogICAga3ZzdG9yZToKICAgICAgcHJlZml4OiBtdWx0aS16b25lLwogICAgdG9rZW5zX2ZpbGVfcGF0aDogL2RhdGEvdG9rZW5zCiAgICB1bnJlZ2lzdGVyX29uX3NodXRkb3duOiBmYWxzZQogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogICAgem9uZV9hd2FyZW5lc3NfZW5hYmxlZDogdHJ1ZQp1c2FnZV9zdGF0czoKICBpbnN0YWxsYXRpb25fbW9kZTogaGVsbQ== + mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2FjdGl2ZS1xdWVyeS10cmFja2VyL2FjdGl2aXR5LmxvZwphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogbWVtYmVybGlzdAphZG1pbl9jbGllbnQ6CiAgc3RvcmFnZToKICAgIHMzOgogICAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICAgIGluc2VjdXJlOiB0cnVlCiAgICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgdHlwZTogczMKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAvZGF0YQogIGVuYWJsZV9hcGk6IHRydWUKICBleHRlcm5hbF91cmw6IC9hbGVydG1hbmFnZXIKICBmYWxsYmFja19jb25maWdfZmlsZTogL2NvbmZpZ3MvYWxlcnRtYW5hZ2VyX2ZhbGxiYWNrX2NvbmZpZy55YW1sCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBidWNrZXRfbmFtZTogZW50ZXJwcmlzZS1tZXRyaWNzLXJ1bGVyCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IGVudGVycHJpc2UtbWV0cmljcy10c2RiCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICB0c2RiOgogICAgZGlyOiAvZGF0YS90c2RiCiAgICBoZWFkX2NvbXBhY3Rpb25faW50ZXJ2YWw6IDE1bQogICAgd2FsX3JlcGxheV9jb25jdXJyZW5jeTogMwpjbHVzdGVyX25hbWU6IHRlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzCmNvbXBhY3RvcjoKICBjb21wYWN0aW9uX2ludGVydmFsOiAzMG0KICBkYXRhX2RpcjogL2RhdGEKICBkZWxldGlvbl9kZWxheTogMmgKICBmaXJzdF9sZXZlbF9jb21wYWN0aW9uX3dhaXRfcGVyaW9kOiAyNW0KICBtYXhfY2xvc2luZ19ibG9ja3NfY29uY3VycmVuY3k6IDIKICBtYXhfb3BlbmluZ19ibG9ja3NfY29uY3VycmVuY3k6IDQKICBzaGFyZGluZ19yaW5nOgogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogIHN5bWJvbHNfZmx1c2hlcnNfY29uY3VycmVuY3k6IDQKZnJvbnRlbmQ6CiAgcGFyYWxsZWxpemVfc2hhcmRhYmxlX3F1ZXJpZXM6IHRydWUKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXF1ZXJ5LXNjaGVkdWxlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6OTA5NQpmcm9udGVuZF93b3JrZXI6CiAgZ3JwY19jbGllbnRfY29uZmlnOgogICAgbWF4X3NlbmRfbXNnX3NpemU6IDQxOTQzMDQwMAogIHNjaGVkdWxlcl9hZGRyZXNzOiB0ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtcXVlcnktc2NoZWR1bGVyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo5MDk1CmdhdGV3YXk6CiAgcHJveHk6CiAgICBhZG1pbl9hcGk6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLWVudGVycHJpc2UtbWV0cmljcy1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6ODA4MAogICAgY29tcGFjdG9yOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtY29tcGFjdG9yLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkZWZhdWx0OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLjo5MDk1CiAgICBpbmdlc3RlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLWluZ2VzdGVyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBxdWVyeV9mcm9udGVuZDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXF1ZXJ5LWZyb250ZW5kLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBydWxlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtZW50ZXJwcmlzZS1tZXRyaWNzLXJ1bGVyLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBzdG9yZV9nYXRld2F5OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3Mtc3RvcmUtZ2F0ZXdheS1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6ODA4MAppbmdlc3RlcjoKICByaW5nOgogICAgZmluYWxfc2xlZXA6IDBzCiAgICBudW1fdG9rZW5zOiA1MTIKICAgIHRva2Vuc19maWxlX3BhdGg6IC9kYXRhL3Rva2VucwogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKICAgIHpvbmVfYXdhcmVuZXNzX2VuYWJsZWQ6IHRydWUKaW5nZXN0ZXJfY2xpZW50OgogIGdycGNfY2xpZW50X2NvbmZpZzoKICAgIG1heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICAgIG1heF9zZW5kX21zZ19zaXplOiAxMDQ4NTc2MDAKaW5zdHJ1bWVudGF0aW9uOgogIGRpc3RyaWJ1dG9yX2NsaWVudDoKICAgIGFkZHJlc3M6IGRuczovLy90ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtZGlzdHJpYnV0b3ItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWwuOjkwOTUKICBlbmFibGVkOiB0cnVlCmxpY2Vuc2U6CiAgcGF0aDogL2xpY2Vuc2UvbGljZW5zZS5qd3QKbGltaXRzOgogIG1heF9jYWNoZV9mcmVzaG5lc3M6IDEwbQogIG1heF9xdWVyeV9wYXJhbGxlbGlzbTogMjQwCiAgbWF4X3RvdGFsX3F1ZXJ5X2xlbmd0aDogMTIwMDBoCm1lbWJlcmxpc3Q6CiAgYWJvcnRfaWZfY2x1c3Rlcl9qb2luX2ZhaWxzOiBmYWxzZQogIGNvbXByZXNzaW9uX2VuYWJsZWQ6IGZhbHNlCiAgam9pbl9tZW1iZXJzOgogIC0gZG5zK3Rlc3QtZW50ZXJwcmlzZS1sZWdhY3ktbGFiZWwtdmFsdWVzLWVudGVycHJpc2UtbWV0cmljcy1nb3NzaXAtcmluZy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbC46Nzk0NgpxdWVyaWVyOgogIG1heF9jb25jdXJyZW50OiAxNgpxdWVyeV9zY2hlZHVsZXI6CiAgbWF4X291dHN0YW5kaW5nX3JlcXVlc3RzX3Blcl90ZW5hbnQ6IDgwMApydWxlcjoKICBhbGVydG1hbmFnZXJfdXJsOiBkbnNzcnZub2EraHR0cDovL19odHRwLW1ldHJpY3MuX3RjcC50ZXN0LWVudGVycHJpc2UtbGVnYWN5LWxhYmVsLXZhbHVlcy1lbnRlcnByaXNlLW1ldHJpY3MtYWxlcnRtYW5hZ2VyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsLi9hbGVydG1hbmFnZXIKICBlbmFibGVfYXBpOiB0cnVlCiAgcnVsZV9wYXRoOiAvZGF0YQpydWxlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBidWNrZXRfbmFtZTogZW50ZXJwcmlzZS1tZXRyaWNzLXJ1bGVyCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLWxlZ2FjeS1sYWJlbC12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKcnVudGltZV9jb25maWc6CiAgZmlsZTogL3Zhci9lbnRlcnByaXNlLW1ldHJpY3MvcnVudGltZS55YW1sCnNlcnZlcjoKICBncnBjX3NlcnZlcl9tYXhfY29ubmVjdGlvbl9hZ2U6IDJtCiAgZ3JwY19zZXJ2ZXJfbWF4X2Nvbm5lY3Rpb25fYWdlX2dyYWNlOiA1bQogIGdycGNfc2VydmVyX21heF9jb25uZWN0aW9uX2lkbGU6IDFtCnN0b3JlX2dhdGV3YXk6CiAgc2hhcmRpbmdfcmluZzoKICAgIGt2c3RvcmU6CiAgICAgIHByZWZpeDogbXVsdGktem9uZS8KICAgIHRva2Vuc19maWxlX3BhdGg6IC9kYXRhL3Rva2VucwogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKICAgIHdhaXRfc3RhYmlsaXR5X21pbl9kdXJhdGlvbjogMW0KICAgIHpvbmVfYXdhcmVuZXNzX2VuYWJsZWQ6IHRydWUKdXNhZ2Vfc3RhdHM6CiAgaW5zdGFsbGF0aW9uX21vZGU6IGhlbG0= diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml index 1ba581325ad..4b320f1b1ad 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -10,4 +10,4 @@ metadata: app.kubernetes.io/managed-by: Helm namespace: "citestns" data: - mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2FjdGl2ZS1xdWVyeS10cmFja2VyL2FjdGl2aXR5LmxvZwphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogbWVtYmVybGlzdAphZG1pbl9jbGllbnQ6CiAgc3RvcmFnZToKICAgIHMzOgogICAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgICAgaW5zZWN1cmU6IHRydWUKICAgICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgICB0eXBlOiBzMwphbGVydG1hbmFnZXI6CiAgZGF0YV9kaXI6IC9kYXRhCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogL2FsZXJ0bWFuYWdlcgogIGZhbGxiYWNrX2NvbmZpZ19maWxlOiAvY29uZmlncy9hbGVydG1hbmFnZXJfZmFsbGJhY2tfY29uZmlnLnlhbWwKYWxlcnRtYW5hZ2VyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci1ydWxlcgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IG1pbWlyLXRzZGIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgdHNkYjoKICAgIGRpcjogL2RhdGEvdHNkYgogICAgaGVhZF9jb21wYWN0aW9uX2ludGVydmFsOiAxNW0KICAgIHdhbF9yZXBsYXlfY29uY3VycmVuY3k6IDMKY2x1c3Rlcl9uYW1lOiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzCmNvbXBhY3RvcjoKICBjb21wYWN0aW9uX2ludGVydmFsOiAzMG0KICBkYXRhX2RpcjogL2RhdGEKICBkZWxldGlvbl9kZWxheTogMmgKICBmaXJzdF9sZXZlbF9jb21wYWN0aW9uX3dhaXRfcGVyaW9kOiAyNW0KICBtYXhfY2xvc2luZ19ibG9ja3NfY29uY3VycmVuY3k6IDIKICBtYXhfb3BlbmluZ19ibG9ja3NfY29uY3VycmVuY3k6IDQKICBzaGFyZGluZ19yaW5nOgogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogIHN5bWJvbHNfZmx1c2hlcnNfY29uY3VycmVuY3k6IDQKZnJvbnRlbmQ6CiAgcGFyYWxsZWxpemVfc2hhcmRhYmxlX3F1ZXJpZXM6IHRydWUKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1zY2hlZHVsZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZnJvbnRlbmRfd29ya2VyOgogIGdycGNfY2xpZW50X2NvbmZpZzoKICAgIG1heF9zZW5kX21zZ19zaXplOiA0MTk0MzA0MDAKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1zY2hlZHVsZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZ2F0ZXdheToKICBwcm94eToKICAgIGFkbWluX2FwaToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGRlZmF1bHQ6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1kaXN0cmlidXRvci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbDo5MDk1CiAgICBpbmdlc3RlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1pbmdlc3Rlci1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6ODA4MAogICAgcXVlcnlfZnJvbnRlbmQ6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItcXVlcnktZnJvbnRlbmQuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHJ1bGVyOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXJ1bGVyLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBzdG9yZV9nYXRld2F5OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXN0b3JlLWdhdGV3YXktaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjgwODAKaW5nZXN0ZXI6CiAgcmluZzoKICAgIGZpbmFsX3NsZWVwOiAwcwogICAgbnVtX3Rva2VuczogNTEyCiAgICB0b2tlbnNfZmlsZV9wYXRoOiAvZGF0YS90b2tlbnMKICAgIHVucmVnaXN0ZXJfb25fc2h1dGRvd246IGZhbHNlCiAgICB6b25lX2F3YXJlbmVzc19lbmFibGVkOiB0cnVlCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCmluc3RydW1lbnRhdGlvbjoKICBkaXN0cmlidXRvcl9jbGllbnQ6CiAgICBhZGRyZXNzOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1kaXN0cmlidXRvci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbDo5MDk1CiAgZW5hYmxlZDogdHJ1ZQpsaWNlbnNlOgogIHBhdGg6IC9saWNlbnNlL2xpY2Vuc2Uuand0CmxpbWl0czoKICBtYXhfY2FjaGVfZnJlc2huZXNzOiAxMG0KICBtYXhfcXVlcnlfcGFyYWxsZWxpc206IDI0MAogIG1heF90b3RhbF9xdWVyeV9sZW5ndGg6IDEyMDAwaAptZW1iZXJsaXN0OgogIGFib3J0X2lmX2NsdXN0ZXJfam9pbl9mYWlsczogZmFsc2UKICBjb21wcmVzc2lvbl9lbmFibGVkOiBmYWxzZQogIGpvaW5fbWVtYmVyczoKICAtIGRucyt0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWdvc3NpcC1yaW5nLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsOjc5NDYKcXVlcmllcjoKICBtYXhfY29uY3VycmVudDogMTYKcXVlcnlfc2NoZWR1bGVyOgogIG1heF9vdXRzdGFuZGluZ19yZXF1ZXN0c19wZXJfdGVuYW50OiA4MDAKcnVsZXI6CiAgYWxlcnRtYW5hZ2VyX3VybDogZG5zc3J2bm9hK2h0dHA6Ly9faHR0cC1tZXRyaWNzLl90Y3AudGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWwvYWxlcnRtYW5hZ2VyCiAgZW5hYmxlX2FwaTogdHJ1ZQogIHJ1bGVfcGF0aDogL2RhdGEKcnVsZXJfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IG1pbWlyLXJ1bGVyCiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW5pby5jaXRlc3Rucy5zdmM6OTAwMAogICAgaW5zZWN1cmU6IHRydWUKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldApydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbApzZXJ2ZXI6CiAgZ3JwY19zZXJ2ZXJfbWF4X2Nvbm5lY3Rpb25fYWdlOiAybQogIGdycGNfc2VydmVyX21heF9jb25uZWN0aW9uX2FnZV9ncmFjZTogNW0KICBncnBjX3NlcnZlcl9tYXhfY29ubmVjdGlvbl9pZGxlOiAxbQpzdG9yZV9nYXRld2F5OgogIHNoYXJkaW5nX3Jpbmc6CiAgICBrdnN0b3JlOgogICAgICBwcmVmaXg6IG11bHRpLXpvbmUvCiAgICB0b2tlbnNfZmlsZV9wYXRoOiAvZGF0YS90b2tlbnMKICAgIHVucmVnaXN0ZXJfb25fc2h1dGRvd246IGZhbHNlCiAgICB3YWl0X3N0YWJpbGl0eV9taW5fZHVyYXRpb246IDFtCiAgICB6b25lX2F3YXJlbmVzc19lbmFibGVkOiB0cnVlCnVzYWdlX3N0YXRzOgogIGluc3RhbGxhdGlvbl9tb2RlOiBoZWxt + mimir.yaml: YWN0aXZpdHlfdHJhY2tlcjoKICBmaWxlcGF0aDogL2FjdGl2ZS1xdWVyeS10cmFja2VyL2FjdGl2aXR5LmxvZwphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogbWVtYmVybGlzdAphZG1pbl9jbGllbnQ6CiAgc3RvcmFnZToKICAgIHMzOgogICAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgICAgaW5zZWN1cmU6IHRydWUKICAgICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgICB0eXBlOiBzMwphbGVydG1hbmFnZXI6CiAgZGF0YV9kaXI6IC9kYXRhCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogL2FsZXJ0bWFuYWdlcgogIGZhbGxiYWNrX2NvbmZpZ19maWxlOiAvY29uZmlncy9hbGVydG1hbmFnZXJfZmFsbGJhY2tfY29uZmlnLnlhbWwKYWxlcnRtYW5hZ2VyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci1ydWxlcgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKYXV0aDoKICB0eXBlOiBlbnRlcnByaXNlCmJsb2Nrc19zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgYnVja2V0X25hbWU6IG1pbWlyLXRzZGIKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBpbnNlY3VyZTogdHJ1ZQogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgdHNkYjoKICAgIGRpcjogL2RhdGEvdHNkYgogICAgaGVhZF9jb21wYWN0aW9uX2ludGVydmFsOiAxNW0KICAgIHdhbF9yZXBsYXlfY29uY3VycmVuY3k6IDMKY2x1c3Rlcl9uYW1lOiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzCmNvbXBhY3RvcjoKICBjb21wYWN0aW9uX2ludGVydmFsOiAzMG0KICBkYXRhX2RpcjogL2RhdGEKICBkZWxldGlvbl9kZWxheTogMmgKICBmaXJzdF9sZXZlbF9jb21wYWN0aW9uX3dhaXRfcGVyaW9kOiAyNW0KICBtYXhfY2xvc2luZ19ibG9ja3NfY29uY3VycmVuY3k6IDIKICBtYXhfb3BlbmluZ19ibG9ja3NfY29uY3VycmVuY3k6IDQKICBzaGFyZGluZ19yaW5nOgogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogIHN5bWJvbHNfZmx1c2hlcnNfY29uY3VycmVuY3k6IDQKZnJvbnRlbmQ6CiAgcGFyYWxsZWxpemVfc2hhcmRhYmxlX3F1ZXJpZXM6IHRydWUKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1zY2hlZHVsZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZnJvbnRlbmRfd29ya2VyOgogIGdycGNfY2xpZW50X2NvbmZpZzoKICAgIG1heF9zZW5kX21zZ19zaXplOiA0MTk0MzA0MDAKICBzY2hlZHVsZXJfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1zY2hlZHVsZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKZ2F0ZXdheToKICBwcm94eToKICAgIGFkbWluX2FwaToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGRlZmF1bHQ6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWRtaW4tYXBpLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBkaXN0cmlidXRvcjoKICAgICAgdXJsOiBkbnM6Ly8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1kaXN0cmlidXRvci1oZWFkbGVzcy5jaXRlc3Rucy5zdmMuY2x1c3Rlci5sb2NhbC46OTA5NQogICAgaW5nZXN0ZXI6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItaW5nZXN0ZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHF1ZXJ5X2Zyb250ZW5kOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXF1ZXJ5LWZyb250ZW5kLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBydWxlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1ydWxlci5jaXRlc3Rucy5zdmM6ODA4MAogICAgc3RvcmVfZ2F0ZXdheToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1zdG9yZS1nYXRld2F5LWhlYWRsZXNzLmNpdGVzdG5zLnN2Yzo4MDgwCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdG9rZW5zX2ZpbGVfcGF0aDogL2RhdGEvdG9rZW5zCiAgICB1bnJlZ2lzdGVyX29uX3NodXRkb3duOiBmYWxzZQogICAgem9uZV9hd2FyZW5lc3NfZW5hYmxlZDogdHJ1ZQppbmdlc3Rlcl9jbGllbnQ6CiAgZ3JwY19jbGllbnRfY29uZmlnOgogICAgbWF4X3JlY3ZfbXNnX3NpemU6IDEwNDg1NzYwMAogICAgbWF4X3NlbmRfbXNnX3NpemU6IDEwNDg1NzYwMAppbnN0cnVtZW50YXRpb246CiAgZGlzdHJpYnV0b3JfY2xpZW50OgogICAgYWRkcmVzczogZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZGlzdHJpYnV0b3ItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWwuOjkwOTUKICBlbmFibGVkOiB0cnVlCmxpY2Vuc2U6CiAgcGF0aDogL2xpY2Vuc2UvbGljZW5zZS5qd3QKbGltaXRzOgogIG1heF9jYWNoZV9mcmVzaG5lc3M6IDEwbQogIG1heF9xdWVyeV9wYXJhbGxlbGlzbTogMjQwCiAgbWF4X3RvdGFsX3F1ZXJ5X2xlbmd0aDogMTIwMDBoCm1lbWJlcmxpc3Q6CiAgYWJvcnRfaWZfY2x1c3Rlcl9qb2luX2ZhaWxzOiBmYWxzZQogIGNvbXByZXNzaW9uX2VuYWJsZWQ6IGZhbHNlCiAgam9pbl9tZW1iZXJzOgogIC0gZG5zK3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZ29zc2lwLXJpbmcuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWwuOjc5NDYKcXVlcmllcjoKICBtYXhfY29uY3VycmVudDogMTYKcXVlcnlfc2NoZWR1bGVyOgogIG1heF9vdXRzdGFuZGluZ19yZXF1ZXN0c19wZXJfdGVuYW50OiA4MDAKcnVsZXI6CiAgYWxlcnRtYW5hZ2VyX3VybDogZG5zc3J2bm9hK2h0dHA6Ly9faHR0cC1tZXRyaWNzLl90Y3AudGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWwuL2FsZXJ0bWFuYWdlcgogIGVuYWJsZV9hcGk6IHRydWUKICBydWxlX3BhdGg6IC9kYXRhCnJ1bGVyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci1ydWxlcgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGluc2VjdXJlOiB0cnVlCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKcnVudGltZV9jb25maWc6CiAgZmlsZTogL3Zhci9taW1pci9ydW50aW1lLnlhbWwKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9jb25uZWN0aW9uX2FnZTogMm0KICBncnBjX3NlcnZlcl9tYXhfY29ubmVjdGlvbl9hZ2VfZ3JhY2U6IDVtCiAgZ3JwY19zZXJ2ZXJfbWF4X2Nvbm5lY3Rpb25faWRsZTogMW0Kc3RvcmVfZ2F0ZXdheToKICBzaGFyZGluZ19yaW5nOgogICAga3ZzdG9yZToKICAgICAgcHJlZml4OiBtdWx0aS16b25lLwogICAgdG9rZW5zX2ZpbGVfcGF0aDogL2RhdGEvdG9rZW5zCiAgICB1bnJlZ2lzdGVyX29uX3NodXRkb3duOiBmYWxzZQogICAgd2FpdF9zdGFiaWxpdHlfbWluX2R1cmF0aW9uOiAxbQogICAgem9uZV9hd2FyZW5lc3NfZW5hYmxlZDogdHJ1ZQp1c2FnZV9zdGF0czoKICBpbnN0YWxsYXRpb25fbW9kZTogaGVsbQ== diff --git a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml index 15179bac4c6..1d250a6b539 100644 --- a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -104,13 +104,13 @@ data: abort_if_cluster_join_fails: false compression_enabled: false join_members: - - dns+test-oss-k8s-1.25-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+test-oss-k8s-1.25-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.test-oss-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-oss-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data ruler_storage: diff --git a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index 5a65c599145..8a620765d08 100644 --- a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/test-oss-k8s-1.25-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 test-oss-k8s-1.25-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-k8s-1.25-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location = /api/v1/push { - set $distributor test-oss-k8s-1.25-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-k8s-1.25-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location /otlp/v1/metrics { - set $distributor test-oss-k8s-1.25-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-k8s-1.25-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - set $alertmanager test-oss-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /multitenant_alertmanager/status { - set $alertmanager test-oss-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /api/v1/alerts { - set $alertmanager test-oss-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-k8s-1.25-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - set $ruler test-oss-k8s-1.25-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-k8s-1.25-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/rules { - set $ruler test-oss-k8s-1.25-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-k8s-1.25-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/alerts { - set $ruler test-oss-k8s-1.25-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-k8s-1.25-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location = /ruler/ring { - set $ruler test-oss-k8s-1.25-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-k8s-1.25-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 test-oss-k8s-1.25-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-oss-k8s-1.25-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 test-oss-k8s-1.25-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-oss-k8s-1.25-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 test-oss-k8s-1.25-values-mimir-compactor.citestns.svc.cluster.local; + set $compactor test-oss-k8s-1.25-values-mimir-compactor.citestns.svc.cluster.local.; proxy_pass http://$compactor:8080$request_uri; } } diff --git a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml index 02ce3c929e1..02e62883a3e 100644 --- a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -79,13 +79,13 @@ data: abort_if_cluster_join_fails: false compression_enabled: false join_members: - - dns+test-oss-logical-multizone-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+test-oss-logical-multizone-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.test-oss-logical-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-oss-logical-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data ruler_storage: diff --git a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index 473e4ceff44..d329c963c25 100644 --- a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/test-oss-logical-multizone-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 test-oss-logical-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-logical-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location = /api/v1/push { - set $distributor test-oss-logical-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-logical-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location /otlp/v1/metrics { - set $distributor test-oss-logical-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-logical-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - set $alertmanager test-oss-logical-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-logical-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /multitenant_alertmanager/status { - set $alertmanager test-oss-logical-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-logical-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /api/v1/alerts { - set $alertmanager test-oss-logical-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-logical-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - set $ruler test-oss-logical-multizone-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-logical-multizone-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/rules { - set $ruler test-oss-logical-multizone-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-logical-multizone-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/alerts { - set $ruler test-oss-logical-multizone-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-logical-multizone-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location = /ruler/ring { - set $ruler test-oss-logical-multizone-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-logical-multizone-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 test-oss-logical-multizone-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-oss-logical-multizone-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 test-oss-logical-multizone-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-oss-logical-multizone-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 test-oss-logical-multizone-values-mimir-compactor.citestns.svc.cluster.local; + set $compactor test-oss-logical-multizone-values-mimir-compactor.citestns.svc.cluster.local.; proxy_pass http://$compactor:8080$request_uri; } } diff --git a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml index dd1efb39bcc..31b63ff25e1 100644 --- a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -79,13 +79,13 @@ data: abort_if_cluster_join_fails: false compression_enabled: false join_members: - - dns+test-oss-multizone-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+test-oss-multizone-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.test-oss-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-oss-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data ruler_storage: diff --git a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index a29d0eabe7f..6d57b4aeaa0 100644 --- a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/test-oss-multizone-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 test-oss-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location = /api/v1/push { - set $distributor test-oss-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location /otlp/v1/metrics { - set $distributor test-oss-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-multizone-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - set $alertmanager test-oss-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /multitenant_alertmanager/status { - set $alertmanager test-oss-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /api/v1/alerts { - set $alertmanager test-oss-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-multizone-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - set $ruler test-oss-multizone-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-multizone-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/rules { - set $ruler test-oss-multizone-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-multizone-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/alerts { - set $ruler test-oss-multizone-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-multizone-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location = /ruler/ring { - set $ruler test-oss-multizone-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-multizone-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 test-oss-multizone-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-oss-multizone-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 test-oss-multizone-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-oss-multizone-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 test-oss-multizone-values-mimir-compactor.citestns.svc.cluster.local; + set $compactor test-oss-multizone-values-mimir-compactor.citestns.svc.cluster.local.; proxy_pass http://$compactor:8080$request_uri; } } diff --git a/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/mimir-config.yaml index d8f89cfc832..f2cd51062d8 100644 --- a/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-oss-topology-spread-constraints-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -87,7 +87,7 @@ data: default: url: http://test-oss-topology-spread-constraints-values-mimir-admin-api.citestns.svc:8080 distributor: - url: dns:///test-oss-topology-spread-constraints-values-mimir-distributor-headless.citestns.svc.cluster.local:9095 + url: dns:///test-oss-topology-spread-constraints-values-mimir-distributor-headless.citestns.svc.cluster.local.:9095 ingester: url: http://test-oss-topology-spread-constraints-values-mimir-ingester-headless.citestns.svc:8080 query_frontend: @@ -109,7 +109,7 @@ data: max_send_msg_size: 104857600 instrumentation: distributor_client: - address: dns:///test-oss-topology-spread-constraints-values-mimir-distributor-headless.citestns.svc.cluster.local:9095 + address: dns:///test-oss-topology-spread-constraints-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+test-oss-topology-spread-constraints-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+test-oss-topology-spread-constraints-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.test-oss-topology-spread-constraints-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-oss-topology-spread-constraints-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data ruler_storage: diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml index ffcb4e6fec5..37b8dcde1a9 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/mimir-config.yaml @@ -103,13 +103,13 @@ data: abort_if_cluster_join_fails: false compression_enabled: false join_members: - - dns+test-oss-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+test-oss-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.test-oss-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-oss-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data ruler_storage: diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index 313ae8ff681..ba2f54b4aff 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/test-oss-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 test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location = /api/v1/push { - set $distributor test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location /otlp/v1/metrics { - set $distributor test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - set $alertmanager test-oss-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /multitenant_alertmanager/status { - set $alertmanager test-oss-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /api/v1/alerts { - set $alertmanager test-oss-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-oss-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - set $ruler test-oss-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/rules { - set $ruler test-oss-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/alerts { - set $ruler test-oss-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location = /ruler/ring { - set $ruler test-oss-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-oss-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 test-oss-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-oss-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 test-oss-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-oss-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 test-oss-values-mimir-compactor.citestns.svc.cluster.local; + set $compactor test-oss-values-mimir-compactor.citestns.svc.cluster.local.; proxy_pass http://$compactor:8080$request_uri; } } diff --git a/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/mimir-config.yaml index 4f69ebe93ba..066fa50bd7a 100644 --- a/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/mimir-config.yaml +++ b/operations/helm/tests/test-vault-agent-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+test-vault-agent-values-mimir-gossip-ring.citestns.svc.cluster.local:7946 + - dns+test-vault-agent-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.test-vault-agent-values-mimir-alertmanager-headless.citestns.svc.cluster.local/alertmanager + alertmanager_url: dnssrvnoa+http://_http-metrics._tcp.test-vault-agent-values-mimir-alertmanager-headless.citestns.svc.cluster.local./alertmanager enable_api: true rule_path: /data ruler_storage: diff --git a/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index 77e518657ef..bf71b444fd8 100644 --- a/operations/helm/tests/test-vault-agent-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/test-vault-agent-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 test-vault-agent-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-vault-agent-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location = /api/v1/push { - set $distributor test-vault-agent-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-vault-agent-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } location /otlp/v1/metrics { - set $distributor test-vault-agent-values-mimir-distributor-headless.citestns.svc.cluster.local; + set $distributor test-vault-agent-values-mimir-distributor-headless.citestns.svc.cluster.local.; proxy_pass http://$distributor:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - set $alertmanager test-vault-agent-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-vault-agent-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /multitenant_alertmanager/status { - set $alertmanager test-vault-agent-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-vault-agent-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } location = /api/v1/alerts { - set $alertmanager test-vault-agent-values-mimir-alertmanager-headless.citestns.svc.cluster.local; + set $alertmanager test-vault-agent-values-mimir-alertmanager-headless.citestns.svc.cluster.local.; proxy_pass http://$alertmanager:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - set $ruler test-vault-agent-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-vault-agent-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/rules { - set $ruler test-vault-agent-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-vault-agent-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location /prometheus/api/v1/alerts { - set $ruler test-vault-agent-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-vault-agent-values-mimir-ruler.citestns.svc.cluster.local.; proxy_pass http://$ruler:8080$request_uri; } location = /ruler/ring { - set $ruler test-vault-agent-values-mimir-ruler.citestns.svc.cluster.local; + set $ruler test-vault-agent-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 test-vault-agent-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-vault-agent-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 test-vault-agent-values-mimir-query-frontend.citestns.svc.cluster.local; + set $query_frontend test-vault-agent-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 test-vault-agent-values-mimir-compactor.citestns.svc.cluster.local; + set $compactor test-vault-agent-values-mimir-compactor.citestns.svc.cluster.local.; proxy_pass http://$compactor:8080$request_uri; } }