From c07c0f28201d93924bf6e72f8b455a27c6b0f991 Mon Sep 17 00:00:00 2001 From: Suraj Nath <9503187+electron0zero@users.noreply.github.com> Date: Wed, 24 Aug 2022 18:22:03 +0530 Subject: [PATCH 1/3] Make DNS address fully qualified to reduce DNS lookups in Kubernetes Change DNS address absolute (fully qualified) to reduce DNS lookups in Kubernetes. See https://pracucci.com/kubernetes-dns-resolution-ndots-options-and-why-it-may-affect-application-performances.html for more details. --- operations/jsonnet/microservices/configmap.libsonnet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/operations/jsonnet/microservices/configmap.libsonnet b/operations/jsonnet/microservices/configmap.libsonnet index 1e42edf3b5e..97201e9db71 100644 --- a/operations/jsonnet/microservices/configmap.libsonnet +++ b/operations/jsonnet/microservices/configmap.libsonnet @@ -54,7 +54,7 @@ memberlist: { abort_if_cluster_join_fails: false, bind_port: $._config.gossip_ring_port, - join_members: ['gossip-ring.%s.svc.cluster.local:%d' % [$._config.namespace, $._config.gossip_ring_port]], + join_members: ['gossip-ring.%s.svc.cluster.local.:%d' % [$._config.namespace, $._config.gossip_ring_port]], }, }, @@ -107,7 +107,7 @@ }, querier+: { frontend_worker+: { - frontend_address: 'query-frontend-discovery.%s.svc.cluster.local:9095' % [$._config.namespace], + frontend_address: 'query-frontend-discovery.%s.svc.cluster.local.:9095' % [$._config.namespace], }, }, }, From b0e693d34b09f42921451ea14fe1557152605a29 Mon Sep 17 00:00:00 2001 From: Suraj Nath <9503187+electron0zero@users.noreply.github.com> Date: Wed, 24 Aug 2022 18:30:06 +0530 Subject: [PATCH 2/3] Update compiled jsonnet --- .../jsonnet-compiled/ConfigMap-tempo-compactor.yaml | 2 +- .../jsonnet-compiled/ConfigMap-tempo-distributor.yaml | 2 +- .../jsonnet-compiled/ConfigMap-tempo-ingester.yaml | 2 +- .../ConfigMap-tempo-metrics-generator.yaml | 2 +- .../jsonnet-compiled/ConfigMap-tempo-querier.yaml | 4 ++-- .../ConfigMap-tempo-query-frontend.yaml | 2 +- operations/jsonnet-compiled/Deployment-compactor.yaml | 2 +- .../jsonnet-compiled/Deployment-distributor.yaml | 2 +- .../Deployment-metrics-generator.yaml | 2 +- operations/jsonnet-compiled/Deployment-querier.yaml | 2 +- .../jsonnet-compiled/Deployment-query-frontend.yaml | 2 +- operations/jsonnet-compiled/StatefulSet-ingester.yaml | 2 +- .../jsonnet-compiled/util/jsonnetfile.lock.json | 6 +++--- .../jsonnet-libs/ksonnet-util/grafana.libsonnet | 4 ---- .../jsonnet-libs/ksonnet-util/legacy-custom.libsonnet | 4 ---- .../jsonnet-libs/ksonnet-util/legacy-noname.libsonnet | 5 ----- .../ksonnet-util/legacy-subtypes.libsonnet | 11 ----------- 17 files changed, 16 insertions(+), 40 deletions(-) diff --git a/operations/jsonnet-compiled/ConfigMap-tempo-compactor.yaml b/operations/jsonnet-compiled/ConfigMap-tempo-compactor.yaml index 27451fda827..6782c23d9c3 100644 --- a/operations/jsonnet-compiled/ConfigMap-tempo-compactor.yaml +++ b/operations/jsonnet-compiled/ConfigMap-tempo-compactor.yaml @@ -18,7 +18,7 @@ data: abort_if_cluster_join_fails: false bind_port: 7946 join_members: - - gossip-ring.tracing.svc.cluster.local:7946 + - gossip-ring.tracing.svc.cluster.local.:7946 metrics_generator_enabled: false overrides: per_tenant_override_config: /overrides/overrides.yaml diff --git a/operations/jsonnet-compiled/ConfigMap-tempo-distributor.yaml b/operations/jsonnet-compiled/ConfigMap-tempo-distributor.yaml index e37e19175a3..ccfa54112f3 100644 --- a/operations/jsonnet-compiled/ConfigMap-tempo-distributor.yaml +++ b/operations/jsonnet-compiled/ConfigMap-tempo-distributor.yaml @@ -21,7 +21,7 @@ data: abort_if_cluster_join_fails: false bind_port: 7946 join_members: - - gossip-ring.tracing.svc.cluster.local:7946 + - gossip-ring.tracing.svc.cluster.local.:7946 metrics_generator_enabled: false overrides: per_tenant_override_config: /overrides/overrides.yaml diff --git a/operations/jsonnet-compiled/ConfigMap-tempo-ingester.yaml b/operations/jsonnet-compiled/ConfigMap-tempo-ingester.yaml index 80e421f4952..fac98730973 100644 --- a/operations/jsonnet-compiled/ConfigMap-tempo-ingester.yaml +++ b/operations/jsonnet-compiled/ConfigMap-tempo-ingester.yaml @@ -12,7 +12,7 @@ data: abort_if_cluster_join_fails: false bind_port: 7946 join_members: - - gossip-ring.tracing.svc.cluster.local:7946 + - gossip-ring.tracing.svc.cluster.local.:7946 metrics_generator_enabled: false overrides: per_tenant_override_config: /overrides/overrides.yaml diff --git a/operations/jsonnet-compiled/ConfigMap-tempo-metrics-generator.yaml b/operations/jsonnet-compiled/ConfigMap-tempo-metrics-generator.yaml index 544e0ef0004..077edbb949f 100644 --- a/operations/jsonnet-compiled/ConfigMap-tempo-metrics-generator.yaml +++ b/operations/jsonnet-compiled/ConfigMap-tempo-metrics-generator.yaml @@ -12,7 +12,7 @@ data: abort_if_cluster_join_fails: false bind_port: 7946 join_members: - - gossip-ring.tracing.svc.cluster.local:7946 + - gossip-ring.tracing.svc.cluster.local.:7946 metrics_generator: storage: path: /var/tempo/generator_wal diff --git a/operations/jsonnet-compiled/ConfigMap-tempo-querier.yaml b/operations/jsonnet-compiled/ConfigMap-tempo-querier.yaml index 4106e81604f..2888746f11f 100644 --- a/operations/jsonnet-compiled/ConfigMap-tempo-querier.yaml +++ b/operations/jsonnet-compiled/ConfigMap-tempo-querier.yaml @@ -12,13 +12,13 @@ data: abort_if_cluster_join_fails: false bind_port: 7946 join_members: - - gossip-ring.tracing.svc.cluster.local:7946 + - gossip-ring.tracing.svc.cluster.local.:7946 metrics_generator_enabled: false overrides: per_tenant_override_config: /overrides/overrides.yaml querier: frontend_worker: - frontend_address: query-frontend-discovery.tracing.svc.cluster.local:9095 + frontend_address: query-frontend-discovery.tracing.svc.cluster.local.:9095 search_enabled: false server: http_listen_port: 3200 diff --git a/operations/jsonnet-compiled/ConfigMap-tempo-query-frontend.yaml b/operations/jsonnet-compiled/ConfigMap-tempo-query-frontend.yaml index abe8589e85a..3173e39266b 100644 --- a/operations/jsonnet-compiled/ConfigMap-tempo-query-frontend.yaml +++ b/operations/jsonnet-compiled/ConfigMap-tempo-query-frontend.yaml @@ -12,7 +12,7 @@ data: abort_if_cluster_join_fails: false bind_port: 7946 join_members: - - gossip-ring.tracing.svc.cluster.local:7946 + - gossip-ring.tracing.svc.cluster.local.:7946 metrics_generator_enabled: false overrides: per_tenant_override_config: /overrides/overrides.yaml diff --git a/operations/jsonnet-compiled/Deployment-compactor.yaml b/operations/jsonnet-compiled/Deployment-compactor.yaml index 08f6a1c9d20..8127c25dea4 100644 --- a/operations/jsonnet-compiled/Deployment-compactor.yaml +++ b/operations/jsonnet-compiled/Deployment-compactor.yaml @@ -18,7 +18,7 @@ spec: template: metadata: annotations: - config_hash: 39135b35e93010b0064838bd8f37a47f + config_hash: 04977ed074a986f446c93be0dbcd59cc labels: app: compactor name: compactor diff --git a/operations/jsonnet-compiled/Deployment-distributor.yaml b/operations/jsonnet-compiled/Deployment-distributor.yaml index 23bd880004d..39a8b6302df 100644 --- a/operations/jsonnet-compiled/Deployment-distributor.yaml +++ b/operations/jsonnet-compiled/Deployment-distributor.yaml @@ -19,7 +19,7 @@ spec: template: metadata: annotations: - config_hash: 1419befab9a6b69d88896bd1f4394654 + config_hash: b18e8715d189e60852d11f32653473a9 labels: app: distributor name: distributor diff --git a/operations/jsonnet-compiled/Deployment-metrics-generator.yaml b/operations/jsonnet-compiled/Deployment-metrics-generator.yaml index 3de218f8435..879f92e2905 100644 --- a/operations/jsonnet-compiled/Deployment-metrics-generator.yaml +++ b/operations/jsonnet-compiled/Deployment-metrics-generator.yaml @@ -19,7 +19,7 @@ spec: template: metadata: annotations: - config_hash: 38371b26593e9c469c05ce32310ccdc9 + config_hash: 264025c7ed58d6666fe3c7278e8993f2 labels: app: metrics-generator name: metrics-generator diff --git a/operations/jsonnet-compiled/Deployment-querier.yaml b/operations/jsonnet-compiled/Deployment-querier.yaml index 43fabd3ae04..600d38d2602 100644 --- a/operations/jsonnet-compiled/Deployment-querier.yaml +++ b/operations/jsonnet-compiled/Deployment-querier.yaml @@ -19,7 +19,7 @@ spec: template: metadata: annotations: - config_hash: a584f6c6479c64143d0008609e0b0c25 + config_hash: 15acd5511dbb9b46b5e58e3fa1059843 labels: app: querier name: querier diff --git a/operations/jsonnet-compiled/Deployment-query-frontend.yaml b/operations/jsonnet-compiled/Deployment-query-frontend.yaml index a4d91e1f8dc..d2b229c0137 100644 --- a/operations/jsonnet-compiled/Deployment-query-frontend.yaml +++ b/operations/jsonnet-compiled/Deployment-query-frontend.yaml @@ -18,7 +18,7 @@ spec: template: metadata: annotations: - config_hash: 345364f17b5771460510d3d5b9028e3c + config_hash: df848edaed79a9620eb44a18be4ce4f5 labels: app: query-frontend name: query-frontend diff --git a/operations/jsonnet-compiled/StatefulSet-ingester.yaml b/operations/jsonnet-compiled/StatefulSet-ingester.yaml index 2b14ca2edd5..882a33fb309 100644 --- a/operations/jsonnet-compiled/StatefulSet-ingester.yaml +++ b/operations/jsonnet-compiled/StatefulSet-ingester.yaml @@ -15,7 +15,7 @@ spec: template: metadata: annotations: - config_hash: 345364f17b5771460510d3d5b9028e3c + config_hash: df848edaed79a9620eb44a18be4ce4f5 labels: app: ingester name: ingester diff --git a/operations/jsonnet-compiled/util/jsonnetfile.lock.json b/operations/jsonnet-compiled/util/jsonnetfile.lock.json index 347d3a51dc9..70aedc8a969 100644 --- a/operations/jsonnet-compiled/util/jsonnetfile.lock.json +++ b/operations/jsonnet-compiled/util/jsonnetfile.lock.json @@ -8,8 +8,8 @@ "subdir": "ksonnet-util" } }, - "version": "1aa353b7afc7ce46351b88d52235ae7a17f4ec0e", - "sum": "QiIOYQ0mdyVXStdPxu99M5CYGtYAXczWAC62EAQmWBM=" + "version": "c132c4afcf17491718539db4c2d94c0ea4346120", + "sum": "2++XoPslyz02LRgsxREWxjLgYgiCIqhAtXCyVSvYcoE=" }, { "source": { @@ -18,7 +18,7 @@ "subdir": "memcached" } }, - "version": "1aa353b7afc7ce46351b88d52235ae7a17f4ec0e", + "version": "c132c4afcf17491718539db4c2d94c0ea4346120", "sum": "8hXTN4QOMkpad75LESkdfRD4/Sl81fMqZcD0ZPx2SNc=" }, { diff --git a/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/grafana.libsonnet b/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/grafana.libsonnet index 8277402227e..9f6c760357f 100644 --- a/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/grafana.libsonnet +++ b/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/grafana.libsonnet @@ -60,10 +60,6 @@ }, }, - extensions+: { - v1beta1+: appsExtentions, - }, - apps+: { v1beta1+: appsExtentions, v1+: appsExtentions, diff --git a/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-custom.libsonnet b/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-custom.libsonnet index 2d42997ab8f..ba39d7a5cfd 100644 --- a/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-custom.libsonnet +++ b/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-custom.libsonnet @@ -144,10 +144,6 @@ }, }, - extensions+: { - v1beta1+: appsExtentions, - }, - apps+: { v1beta1+: appsExtentions, v1+: appsExtentions, diff --git a/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-noname.libsonnet b/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-noname.libsonnet index 9529244f299..30b54c0b34b 100644 --- a/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-noname.libsonnet +++ b/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-noname.libsonnet @@ -5,11 +5,6 @@ function(noNewEmptyNameMixin) { core+: { v1+: { persistentVolumeClaim+: noNewEmptyNameMixin, } }, - extensions+: { - v1beta1+: { - ingress+: noNewEmptyNameMixin, - }, - }, networking+: { v1beta1+: { ingress+: noNewEmptyNameMixin, diff --git a/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-subtypes.libsonnet b/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-subtypes.libsonnet index 1708bf0a41d..59cd1b849c9 100644 --- a/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-subtypes.libsonnet +++ b/operations/jsonnet-compiled/util/vendor/github.com/grafana/jsonnet-libs/ksonnet-util/legacy-subtypes.libsonnet @@ -79,17 +79,6 @@ v1+: appsPatch, v1beta1+: appsPatch, }, - extensions+: { - v1beta1+: appsPatch { - ingress+: { - spec+: { - rulesType: $.extensions.v1beta1.ingressRule { - httpType+: { pathsType: $.extensions.v1beta1.httpIngressPath }, - }, - }, - }, - }, - }, batch+: { local patch = { From 883669c11fe70ba84e89d0798db67151b6500fd8 Mon Sep 17 00:00:00 2001 From: Suraj Nath <9503187+electron0zero@users.noreply.github.com> Date: Wed, 24 Aug 2022 18:33:28 +0530 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd12fcce5b9..18640561cb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * [ENHANCEMENT] metrics-generator: expose span size as a metric [#1662](https://github.com/grafana/tempo/pull/1662) (@ie-pham) * [ENHANCEMENT] Set Max Idle connections to 100 for Azure, should reduce DNS errors in Azure [#1632](https://github.com/grafana/tempo/pull/1632) (@electron0zero) +* [CHANGE] Make DNS address fully qualified to reduce DNS lookups in Kubernetes [#1687](https://github.com/grafana/tempo/pull/1687) (@electron0zero) ## v1.5.0 / 2022-08-17