From 0130b7784d568ebb4f7377bf6d96245725942ee9 Mon Sep 17 00:00:00 2001 From: zirain Date: Wed, 27 Nov 2024 03:29:16 +0800 Subject: [PATCH 1/5] xds: use V4_PREFERRED dnsLookupFamily by default (#4745) * use Cluster_V4_PREFERRED Signed-off-by: zirain * release notes Signed-off-by: zirain --------- Signed-off-by: zirain --- .../testdata/translate/out/default-resources.all.yaml | 5 +++++ .../translate/out/echo-gateway-api.cluster.yaml | 1 + .../translate/out/from-gateway-api-to-xds.all.json | 5 +++++ .../translate/out/from-gateway-api-to-xds.all.yaml | 5 +++++ .../translate/out/from-gateway-api-to-xds.cluster.yaml | 5 +++++ .../out/jwt-single-route-single-match-to-xds.all.json | 2 ++ .../out/jwt-single-route-single-match-to-xds.all.yaml | 2 ++ .../jwt-single-route-single-match-to-xds.cluster.yaml | 2 ++ .../translate/out/no-service-cluster-ip.all.yaml | 1 + internal/xds/translator/cluster.go | 2 +- .../extensionpolicy-tcp-udp-http.clusters.yaml | 3 +++ .../http-route-extension-filter.clusters.yaml | 1 + .../out/extension-xds-ir/http-route.clusters.yaml | 1 + .../out/xds-ir/accesslog-als-tcp.clusters.yaml | 1 + .../testdata/out/xds-ir/accesslog-cel.clusters.yaml | 2 ++ .../out/xds-ir/accesslog-endpoint-stats.clusters.yaml | 2 ++ .../out/xds-ir/accesslog-formatters.clusters.yaml | 2 ++ .../out/xds-ir/accesslog-multi-cel.clusters.yaml | 2 ++ .../testdata/out/xds-ir/accesslog-types.clusters.yaml | 10 ++++++++++ .../out/xds-ir/accesslog-without-format.clusters.yaml | 3 +++ .../testdata/out/xds-ir/accesslog.clusters.yaml | 3 +++ .../out/xds-ir/authorization-client-cidr.clusters.yaml | 3 +++ .../out/xds-ir/authorization-jwt-claim.clusters.yaml | 4 ++++ .../out/xds-ir/authorization-jwt-scope.clusters.yaml | 4 ++++ .../authorization-multiple-principals.clusters.yaml | 1 + .../out/xds-ir/backend-buffer-limit.clusters.yaml | 3 +++ .../testdata/out/xds-ir/backend-priority.clusters.yaml | 3 +++ .../testdata/out/xds-ir/basic-auth.clusters.yaml | 3 +++ .../testdata/out/xds-ir/circuit-breaker.clusters.yaml | 1 + .../out/xds-ir/client-buffer-limit.clusters.yaml | 2 ++ .../out/xds-ir/client-ip-detection.clusters.yaml | 3 +++ .../testdata/out/xds-ir/client-timeout.clusters.yaml | 2 ++ .../translator/testdata/out/xds-ir/cors.clusters.yaml | 1 + .../out/xds-ir/custom-filter-order.clusters.yaml | 2 ++ .../testdata/out/xds-ir/custom-response.clusters.yaml | 1 + .../testdata/out/xds-ir/ext-auth-backend.clusters.yaml | 5 +++++ .../out/xds-ir/ext-auth-recomputation.clusters.yaml | 5 +++++ .../testdata/out/xds-ir/ext-auth.clusters.yaml | 5 +++++ .../ext-proc-with-traffic-settings.clusters.yaml | 3 +++ .../testdata/out/xds-ir/ext-proc.clusters.yaml | 6 ++++++ .../testdata/out/xds-ir/fault-injection.clusters.yaml | 5 +++++ .../headers-with-preserve-x-request-id.clusters.yaml | 2 ++ .../headers-with-underscores-action.clusters.yaml | 4 ++++ .../testdata/out/xds-ir/health-check.clusters.yaml | 5 +++++ .../xds-ir/http-early-header-mutation.clusters.yaml | 2 ++ .../out/xds-ir/http-endpoint-stats.clusters.yaml | 1 + .../out/xds-ir/http-health-check.clusters.yaml | 1 + .../xds-ir/http-preserve-client-protocol.clusters.yaml | 1 + .../out/xds-ir/http-req-resp-sizes-stats.clusters.yaml | 1 + .../xds-ir/http-route-direct-response.clusters.yaml | 1 + .../out/xds-ir/http-route-dns-cluster.clusters.yaml | 1 + .../out/xds-ir/http-route-mirror.clusters.yaml | 1 + .../xds-ir/http-route-multiple-matches.clusters.yaml | 7 +++++++ .../xds-ir/http-route-multiple-mirrors.clusters.yaml | 3 +++ .../xds-ir/http-route-partial-invalid.clusters.yaml | 1 + .../out/xds-ir/http-route-redirect.clusters.yaml | 1 + .../testdata/out/xds-ir/http-route-regex.clusters.yaml | 1 + .../xds-ir/http-route-request-headers.clusters.yaml | 1 + .../http-route-response-add-headers.clusters.yaml | 1 + ...ttp-route-response-add-remove-headers.clusters.yaml | 1 + .../http-route-response-remove-headers.clusters.yaml | 1 + ...tp-route-rewrite-root-path-url-prefix.clusters.yaml | 1 + ...-rewrite-sufixx-with-slash-url-prefix.clusters.yaml | 1 + .../http-route-rewrite-url-fullpath.clusters.yaml | 1 + .../xds-ir/http-route-rewrite-url-host.clusters.yaml | 1 + .../xds-ir/http-route-rewrite-url-prefix.clusters.yaml | 1 + .../xds-ir/http-route-rewrite-url-regex.clusters.yaml | 1 + .../http-route-session-persistence.clusters.yaml | 1 + .../out/xds-ir/http-route-timeout.clusters.yaml | 3 +++ .../http-route-weighted-backend-uds-ip.clusters.yaml | 1 + ...p-route-weighted-backend-with-filters.clusters.yaml | 2 ++ .../xds-ir/http-route-weighted-backend.clusters.yaml | 1 + .../http-route-weighted-invalid-backend.clusters.yaml | 1 + .../xds-ir/http-route-with-clientcert.clusters.yaml | 1 + .../out/xds-ir/http-route-with-metadata.clusters.yaml | 2 ++ ...http-route-with-tls-system-truststore.clusters.yaml | 1 + ...p-route-with-tlsbundle-multiple-certs.clusters.yaml | 2 ++ .../out/xds-ir/http-route-with-tlsbundle.clusters.yaml | 1 + .../testdata/out/xds-ir/http-route.clusters.yaml | 1 + .../out/xds-ir/http1-preserve-case.clusters.yaml | 2 ++ .../testdata/out/xds-ir/http1-trailers.clusters.yaml | 1 + .../testdata/out/xds-ir/http10.clusters.yaml | 1 + .../testdata/out/xds-ir/http2-route.clusters.yaml | 4 ++++ .../translator/testdata/out/xds-ir/http2.clusters.yaml | 1 + .../translator/testdata/out/xds-ir/http3.clusters.yaml | 1 + .../xds-ir/jsonpatch-missing-resource.clusters.yaml | 1 + .../out/xds-ir/jsonpatch-with-jsonpath.clusters.yaml | 2 ++ .../testdata/out/xds-ir/jsonpatch.clusters.yaml | 1 + .../out/xds-ir/jwt-custom-extractor.clusters.yaml | 2 ++ .../jwt-multi-route-multi-provider.clusters.yaml | 4 ++++ .../jwt-multi-route-single-provider.clusters.yaml | 3 +++ .../testdata/out/xds-ir/jwt-optional.clusters.yaml | 2 ++ .../testdata/out/xds-ir/jwt-ratelimit.clusters.yaml | 5 +++++ .../xds-ir/jwt-single-route-single-match.clusters.yaml | 2 ++ .../out/xds-ir/listener-connection-limit.clusters.yaml | 4 ++++ .../out/xds-ir/listener-proxy-protocol.clusters.yaml | 2 ++ .../out/xds-ir/listener-tcp-keepalive.clusters.yaml | 4 ++++ .../testdata/out/xds-ir/load-balancer.clusters.yaml | 10 ++++++++++ .../testdata/out/xds-ir/local-ratelimit.clusters.yaml | 3 +++ .../out/xds-ir/metrics-virtual-host.clusters.yaml | 1 + .../out/xds-ir/mixed-tls-jwt-authn.clusters.yaml | 1 + ...ners-same-port-with-different-filters.clusters.yaml | 5 +++++ .../xds-ir/multiple-listeners-same-port.clusters.yaml | 6 ++++++ .../multiple-simple-tcp-route-same-port.clusters.yaml | 5 +++++ ...d-client-certificate-with-custom-data.clusters.yaml | 5 +++++ ...mutual-tls-forward-client-certificate.clusters.yaml | 5 +++++ ...-required-client-certificate-disabled.clusters.yaml | 2 ++ .../testdata/out/xds-ir/mutual-tls.clusters.yaml | 2 ++ .../xds-ir/oidc-backend-cluster-provider.clusters.yaml | 2 ++ .../translator/testdata/out/xds-ir/oidc.clusters.yaml | 4 ++++ .../testdata/out/xds-ir/path-settings.clusters.yaml | 1 + .../out/xds-ir/proxy-protocol-upstream.clusters.yaml | 1 + .../out/xds-ir/ratelimit-custom-domain.clusters.yaml | 4 ++++ .../out/xds-ir/ratelimit-disable-headers.clusters.yaml | 4 ++++ .../out/xds-ir/ratelimit-endpoint-stats.clusters.yaml | 4 ++++ .../xds-ir/ratelimit-headers-and-cidr.clusters.yaml | 4 ++++ .../out/xds-ir/ratelimit-sourceip.clusters.yaml | 5 +++++ .../testdata/out/xds-ir/ratelimit.clusters.yaml | 5 +++++ .../out/xds-ir/retry-partial-invalid.clusters.yaml | 1 + .../securitypolicy-with-oidc-jwt-authz.clusters.yaml | 2 ++ .../testdata/out/xds-ir/simple-tls.clusters.yaml | 1 + .../out/xds-ir/suppress-envoy-headers.clusters.yaml | 1 + .../out/xds-ir/tcp-endpoint-stats.clusters.yaml | 1 + .../out/xds-ir/tcp-listener-ipfamily.clusters.yaml | 1 + .../out/xds-ir/tcp-req-resp-sizes-stats.clusters.yaml | 1 + .../out/xds-ir/tcp-route-complex.clusters.yaml | 1 + .../testdata/out/xds-ir/tcp-route-simple.clusters.yaml | 1 + .../out/xds-ir/tcp-route-tls-terminate.clusters.yaml | 2 ++ .../xds-ir/tcp-route-weighted-backend.clusters.yaml | 1 + .../testdata/out/xds-ir/timeout.clusters.yaml | 1 + .../out/xds-ir/tls-route-passthrough.clusters.yaml | 2 ++ .../tls-with-ciphers-versions-alpn.clusters.yaml | 2 ++ .../testdata/out/xds-ir/tracing-datadog.clusters.yaml | 2 ++ .../out/xds-ir/tracing-endpoint-stats.clusters.yaml | 2 ++ .../testdata/out/xds-ir/tracing-zipkin.clusters.yaml | 2 ++ .../testdata/out/xds-ir/tracing.clusters.yaml | 2 ++ .../out/xds-ir/udp-endpoint-stats.clusters.yaml | 1 + .../out/xds-ir/udp-req-resp-sizes-stats.clusters.yaml | 1 + .../testdata/out/xds-ir/udp-route.clusters.yaml | 1 + .../out/xds-ir/upstream-tcpkeepalive.clusters.yaml | 1 + .../translator/testdata/out/xds-ir/wasm.clusters.yaml | 2 ++ release-notes/current.yaml | 1 + 142 files changed, 335 insertions(+), 1 deletion(-) diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index e81c777ee74..80934209fce 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -772,6 +772,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -791,6 +792,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -817,6 +819,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -836,6 +839,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -855,6 +859,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml index 9bb0bc2ac1c..5b6162b655f 100644 --- a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml +++ b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml @@ -100,6 +100,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json index 96f794bb456..0cfb690977f 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json @@ -458,6 +458,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -487,6 +488,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -527,6 +529,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -556,6 +559,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -585,6 +589,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml index e4490080e3d..124e0fd65e0 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml @@ -251,6 +251,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -270,6 +271,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -296,6 +298,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -315,6 +318,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -334,6 +338,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml index aa348c640c9..714656cffaf 100644 --- a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml +++ b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml @@ -10,6 +10,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -29,6 +30,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +57,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -74,6 +77,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -93,6 +97,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json index a777f5cdc56..5042c9d1f03 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json @@ -350,6 +350,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", + "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { "edsConfig": { "ads": {}, @@ -379,6 +380,7 @@ "localityWeightedLbConfig": {} }, "connectTimeout": "10s", + "dnsLookupFamily": "V4_PREFERRED", "dnsRefreshRate": "30s", "lbPolicy": "LEAST_REQUEST", "loadAssignment": { diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml index c3ee0ddf26a..2644bf5babc 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml @@ -195,6 +195,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -214,6 +215,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml index ee8af9b7c15..9fce4f70e3e 100644 --- a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml +++ b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml @@ -10,6 +10,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -29,6 +30,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml index 6edf19677ad..df906c98211 100644 --- a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml @@ -195,6 +195,7 @@ xds: commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/cluster.go b/internal/xds/translator/cluster.go index 495640ff90a..c5064c29eef 100644 --- a/internal/xds/translator/cluster.go +++ b/internal/xds/translator/cluster.go @@ -84,7 +84,7 @@ func buildEndpointType(settings []*ir.DestinationSetting) EndpointType { } func buildXdsCluster(args *xdsClusterArgs) *clusterv3.Cluster { - dnsLookupFamily := clusterv3.Cluster_AUTO + dnsLookupFamily := clusterv3.Cluster_V4_PREFERRED if args.ipFamily != nil { switch *args.ipFamily { case egv1a1.IPv4: diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml index ed3cb77ab01..b8a8e059069 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml index dbfd7c8e2b2..f8ee95fc7f6 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml index dbfd7c8e2b2..f8ee95fc7f6 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml index 85a1bf46bac..86fb50d1d4e 100755 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml @@ -5,6 +5,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 15s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml index 7faf19f8bb4..090b3919f81 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml index dae7cbc0d4a..74a6fc0bb0c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -23,6 +24,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml index 7faf19f8bb4..090b3919f81 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml index 7faf19f8bb4..090b3919f81 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.clusters.yaml index 98d56781cb2..112aa95870f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-types.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-types.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -45,6 +47,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -69,6 +72,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -93,6 +97,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -117,6 +122,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -141,6 +147,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -165,6 +172,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -198,6 +206,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -231,6 +240,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.clusters.yaml index 967893fbd41..4212b175848 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-without-format.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -45,6 +47,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml index 967893fbd41..4212b175848 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -45,6 +47,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.clusters.yaml index 815e3e469ea..ec8ef8e0674 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-client-cidr.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.clusters.yaml index 3e81abb2f4e..8b4149cfe83 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-claim.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -73,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.clusters.yaml index 3e81abb2f4e..8b4149cfe83 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-jwt-scope.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -73,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.clusters.yaml index a5da3995b99..4b0cccf2c2c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-multiple-principals.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml index ae291870e19..611cbe7292a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-priority.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-priority.clusters.yaml index 64ef05a8795..66c3bf73ad7 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-priority.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-priority.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth.clusters.yaml index e170f954954..df23031f8bb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.clusters.yaml index a39d931e4d8..dd1fce78e8b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/circuit-breaker.clusters.yaml @@ -7,6 +7,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.clusters.yaml index 53d0ae1b88c..d1f95214f16 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-buffer-limit.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.clusters.yaml index f36c0f1c777..ab0b4fca62c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-ip-detection.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/client-timeout.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/client-timeout.clusters.yaml index b3601621bf2..e7ef5350995 100644 --- a/internal/xds/translator/testdata/out/xds-ir/client-timeout.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/client-timeout.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.clusters.yaml index 7b61aaf5f37..03fa483d156 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-filter-order.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -39,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/custom-response.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/custom-response.clusters.yaml index a5da3995b99..4b0cccf2c2c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/custom-response.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/custom-response.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.clusters.yaml index db4efa180a8..79e1aed5ebe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-backend.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -88,6 +92,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.clusters.yaml index db4efa180a8..79e1aed5ebe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-recomputation.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -88,6 +92,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth.clusters.yaml index 4b9e2de2200..ff9b672a1cc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -79,6 +83,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.clusters.yaml index d885aaddd66..99dc8b48184 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc-with-traffic-settings.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -39,6 +41,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 15s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-proc.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-proc.clusters.yaml index 6fcc3830e4f..4e40762dace 100755 --- a/internal/xds/translator/testdata/out/xds-ir/ext-proc.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-proc.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -62,6 +65,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -86,6 +90,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -110,6 +115,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/fault-injection.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/fault-injection.clusters.yaml index 77dc55a8476..348c3693e0f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/fault-injection.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/fault-injection.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.clusters.yaml index b3601621bf2..e7ef5350995 100755 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-x-request-id.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.clusters.yaml index 754b5ae5d02..58a2b85afd9 100755 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-underscores-action.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/health-check.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/health-check.clusters.yaml index 1d42d3495d8..6db525c99eb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/health-check.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/health-check.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -42,6 +43,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -78,6 +80,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -111,6 +114,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -145,6 +149,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.clusters.yaml index 1774ac35006..41a3c942e6a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-early-header-mutation.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -31,6 +32,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.clusters.yaml index 8256f58d447..1be553489ce 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-endpoint-stats.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-health-check.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-health-check.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-health-check.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-health-check.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.clusters.yaml index 73c0f3ee8b8..7706960228b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-preserve-client-protocol.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.clusters.yaml index d552d11a437..2dc04da7256 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-req-resp-sizes-stats.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.clusters.yaml index 90ea1e3123d..c3282c53e19 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.clusters.yaml index d6f92da0027..d2964ca5282 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dns-cluster.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.clusters.yaml index 7b147f2cc9e..2ee151ece25 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.clusters.yaml index 7dee2fae954..758292acfcd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-matches.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -89,6 +94,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -106,6 +112,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.clusters.yaml index af01a8494ca..0b5a779d918 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.clusters.yaml index 3847b55b7e3..759c732f54a 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-partial-invalid.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.clusters.yaml index 2e8d489ec0a..8bf69668b44 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.clusters.yaml index c3beb47b89f..8906cb55b30 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.clusters.yaml index db56b6185c5..9d7d6d0c663 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.clusters.yaml index 7b45637ccff..c1d3a9aedbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.clusters.yaml index 7b45637ccff..c1d3a9aedbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.clusters.yaml index 7b45637ccff..c1d3a9aedbb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.clusters.yaml index 48272f1f225..7311c3bbcbe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.clusters.yaml index 48272f1f225..7311c3bbcbe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-sufixx-with-slash-url-prefix.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.clusters.yaml index 03f27845ffe..929e5fb44bb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.clusters.yaml index 48272f1f225..7311c3bbcbe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.clusters.yaml index 48272f1f225..7311c3bbcbe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.clusters.yaml index 03f27845ffe..929e5fb44bb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-regex.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.clusters.yaml index c3beb47b89f..8906cb55b30 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-session-persistence.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.clusters.yaml index f36c0f1c777..ab0b4fca62c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-timeout.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-uds-ip.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.clusters.yaml index b3601621bf2..e7ef5350995 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend-with-filters.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.clusters.yaml index 390c26b1ab8..aa5b2a1bb20 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-clientcert.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.clusters.yaml index b3601621bf2..e7ef5350995 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-metadata.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.clusters.yaml index 49c8eebc00e..82bc9604a7d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tls-system-truststore.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.clusters.yaml index df5e85c34f2..3aab01e6684 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle-multiple-certs.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -62,6 +63,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.clusters.yaml index 2744cfc19d8..ba9cb4c4fe4 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-with-tlsbundle.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.clusters.yaml index 4cfa7db1e7e..b93477f78ca 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-preserve-case.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -31,6 +32,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.clusters.yaml index 1b3c2957d3f..7f270a11d04 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http1-trailers.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http1-trailers.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml index 62a8d033f04..8222dcd6ccb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.clusters.yaml index 2c58afdaac7..76e7c3dcb95 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-route.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-route.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -30,6 +31,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -54,6 +56,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -81,6 +84,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml index ff1dac67640..6091e5e97b1 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml index a5da3995b99..4b0cccf2c2c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-missing-resource.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.clusters.yaml index f1725d0f618..cb9e6eb5d11 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch-with-jsonpath.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml index 009411dcdf4..2867550caba 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.clusters.yaml index 95dbaeaeb9d..f3998fb3b59 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-custom-extractor.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml index 4af517cab1d..30d656a16fe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-multi-provider.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -64,6 +67,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml index 081ef33d842..599db139ea2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-multi-route-single-provider.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.clusters.yaml index 95dbaeaeb9d..f3998fb3b59 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-optional.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-optional.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml index 6701b170b27..b1433b1be87 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-ratelimit.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -81,6 +85,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml index 95dbaeaeb9d..f3998fb3b59 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.clusters.yaml index 2f38dd9d3aa..290beff3671 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-connection-limit.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.clusters.yaml index 6cae3947b35..e56073d06d5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-proxy-protocol.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.clusters.yaml index 2f38dd9d3aa..290beff3671 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-tcp-keepalive.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml index 5067244aeba..3b4bde72aeb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/load-balancer.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -20,6 +21,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -37,6 +39,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -54,6 +57,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -71,6 +75,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -91,6 +96,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -110,6 +116,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -127,6 +134,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -146,6 +154,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -163,6 +172,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.clusters.yaml index f36c0f1c777..ab0b4fca62c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/metrics-virtual-host.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mixed-tls-jwt-authn.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.clusters.yaml index 21ebdea126b..307f4cbc565 100755 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port-with-different-filters.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.clusters.yaml index 8d9e43d36cf..8ad066c0640 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -89,6 +94,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.clusters.yaml index b98d486efea..91395a135f6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.clusters.yaml index 77dc55a8476..348c3693e0f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate-with-custom-data.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.clusters.yaml index 77dc55a8476..348c3693e0f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-forward-client-certificate.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.clusters.yaml index 8d317defa13..1207329f055 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-required-client-certificate-disabled.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.clusters.yaml index 8d317defa13..1207329f055 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.clusters.yaml index ca2d3f5e3fb..9d60e8e0bed 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-backend-cluster-provider.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml index 52523fffbb8..cb505645ff8 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: @@ -73,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/path-settings.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/path-settings.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/path-settings.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/path-settings.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.clusters.yaml index c5555faa87a..6c7503a8669 100644 --- a/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/proxy-protocol-upstream.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.clusters.yaml index dc5c30ab312..b031b37db0e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-custom-domain.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.clusters.yaml index b74141720fa..a75716855d1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-disable-headers.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.clusters.yaml index 4eab9980691..e3f20b743ad 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-endpoint-stats.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -23,6 +24,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -42,6 +44,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -61,6 +64,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.clusters.yaml index b74141720fa..a75716855d1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-headers-and-cidr.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.clusters.yaml index a2926d67edd..79e1c96f69b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml index a2926d67edd..79e1c96f69b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -38,6 +40,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -55,6 +58,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -72,6 +76,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry-partial-invalid.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.clusters.yaml index f4f58fe1cc9..91bbe4fa396 100644 --- a/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/securitypolicy-with-oidc-jwt-authz.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/simple-tls.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/simple-tls.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.clusters.yaml index ff1dac67640..6091e5e97b1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/suppress-envoy-headers.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.clusters.yaml index d5e5aeaf991..0fd3d280a1b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-endpoint-stats.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.clusters.yaml index 394a72179b0..d0ab3efc743 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-listener-ipfamily.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.clusters.yaml index 8fd985878cc..d0b09155386 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-req-resp-sizes-stats.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.clusters.yaml index 7c294e2efa3..6b6fc7289f0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.clusters.yaml index 2653bb96c8d..79872344524 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.clusters.yaml index 122e0dad7dc..111eac1e7b2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-tls-terminate.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.clusters.yaml index da821625c09..f1717a49d2b 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml index 109e9d1392c..6414d365d02 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 31s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.clusters.yaml index 4cfa1289322..c3ef51c0b2f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.clusters.yaml index 8d317defa13..1207329f055 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tls-with-ciphers-versions-alpn.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.clusters.yaml index 12088c45682..7b7149b3f33 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.clusters.yaml index 304574452d2..bdf3cadd2ba 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-endpoint-stats.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -23,6 +24,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.clusters.yaml index d1459afe991..4ce2f4cfdc0 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-zipkin.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml index f211422edc5..cc1305448af 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -22,6 +23,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 15s + dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s lbPolicy: LEAST_REQUEST loadAssignment: diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.clusters.yaml index 6090f4f8ec2..586e95fc0e9 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-endpoint-stats.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.clusters.yaml index 2f1ed3604e8..ae84a44c505 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-req-resp-sizes-stats.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route.clusters.yaml index 14df838b6e6..54c7ebf435e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-route.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-route.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.clusters.yaml index 5d663e5665e..74800020855 100644 --- a/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/upstream-tcpkeepalive.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml index 8e3ac051015..480aca4bb47 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml @@ -4,6 +4,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} @@ -21,6 +22,7 @@ commonLbConfig: localityWeightedLbConfig: {} connectTimeout: 10s + dnsLookupFamily: V4_PREFERRED edsClusterConfig: edsConfig: ads: {} diff --git a/release-notes/current.yaml b/release-notes/current.yaml index c0f8dfc0e5b..eea29e8b78b 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -6,6 +6,7 @@ breaking changes: | ClientTrafficPolicy previously treated an empty TLS ALPNProtocols list as being undefined and applied Envoy Gateway defaults. An empty TLS ALPNProtocols list is now treated as user-defined disablement of the TLS ALPN extension. Always use `::` and `IPv4Compact` enabled on dynamic listeners. + Use `V4_PREFERRED` instead of `V4_ONLY` by default for the cluster's `DnsLookupFamily`. # Updates addressing vulnerabilities, security flaws, or compliance requirements. security updates: | From 29b5eaa6a209adb4e336b3c773dc92bdb647c891 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Tue, 26 Nov 2024 11:29:50 -0800 Subject: [PATCH 2/5] [docs] Add Teleport as an Adopter (#4785) * [docs] Add Teleport as an Adopter Signed-off-by: Arko Dasgupta * Update site/data/adopters.yaml Co-authored-by: David Boslee Signed-off-by: Arko Dasgupta --------- Signed-off-by: Arko Dasgupta Signed-off-by: Arko Dasgupta Co-authored-by: David Boslee --- site/data/adopters.yaml | 4 ++++ site/static/logos/teleport.svg | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 site/static/logos/teleport.svg diff --git a/site/data/adopters.yaml b/site/data/adopters.yaml index 542e381d1c3..16cf7893339 100644 --- a/site/data/adopters.yaml +++ b/site/data/adopters.yaml @@ -11,3 +11,7 @@ adopters: logo: "/logos/airspacelink.svg" url: "https://airspacelink.com/" description: "Airspace Link is using Envoy Gateway to route all public APIs to Kubernetes clusters, developers are manipulating routes descriptions using agnostic manifest files, which are then automatically provisioned using Envoy Gateway." + - name: "Teleport" + logo: "/logos/teleport.svg" + url: "https://goteleport.com/" + description: "Teleport is using Envoy Gateway to manage dynamic routing for all traffic to the Teleport Cloud Platform." diff --git a/site/static/logos/teleport.svg b/site/static/logos/teleport.svg new file mode 100644 index 00000000000..ad19786b556 --- /dev/null +++ b/site/static/logos/teleport.svg @@ -0,0 +1,16 @@ + + \ No newline at end of file From cda2dcb68e3503f625aa08e34c1e37e18a5f2adc Mon Sep 17 00:00:00 2001 From: Xunzhuo Date: Wed, 27 Nov 2024 10:48:27 +0800 Subject: [PATCH 3/5] community: add tencent cloud as an adopter (#4786) Signed-off-by: bitliu --- ADOPTERS.md | 13 +++++++++++++ site/data/adopters.yaml | 4 ++++ site/static/logos/tencent-cloud.png | Bin 0 -> 49618 bytes 3 files changed, 17 insertions(+) create mode 100644 site/static/logos/tencent-cloud.png diff --git a/ADOPTERS.md b/ADOPTERS.md index 5914f698e7b..54d7d933ad0 100644 --- a/ADOPTERS.md +++ b/ADOPTERS.md @@ -23,6 +23,7 @@ This page contains a list of organizations who are users of Envoy Gateway, follo If you would like to be included in this table, please submit a PR to this file or comment to [this issue](https://github.com/envoyproxy/gateway/issues/2781) and your information will be added. ## AllFactors + * Website https://allfactors.com * Category: End User * Environments: @@ -33,6 +34,7 @@ If you would like to be included in this table, please submit a PR to this file * Logo: https://allfactors.com/AllFactors-Logo.svg ## Tetrate + * Website: https://www.tetrate.io * Category: Service Provider * Environments: AWS @@ -43,6 +45,7 @@ If you would like to be included in this table, please submit a PR to this file * (Option) Description: ## Airspace Link + * Organizatioin: Airspace Link * Website: https://airspacelink.com/ * Category: End User @@ -51,3 +54,13 @@ If you would like to be included in this table, please submit a PR to this file - Airspace Link is using Envoy Gateway to route all public APIs to Kubernetes clusters, developers are manipulating routes descriptions using agnostic manifest files, which are then automatically provisioned using Envoy Gateway. * Status: production * Logo: https://airhub.airspacelink.com/images/asl-flat-logo.png + +## Tencent Cloud + +* Organizatioin: Tencent Cloud +* Website: https://www.tencentcloud.com +* Category: Service Provider +* Environments: Tencent Kubernetes Engine (TKE) +* Use Cases: + - Tencent Cloud is using Envoy Gateway as a Kubernetes Cluster Network Addon to manage dynamic routing in the Tencent Kubernetes Engine. +* Status: production diff --git a/site/data/adopters.yaml b/site/data/adopters.yaml index 16cf7893339..ef6bcfb8221 100644 --- a/site/data/adopters.yaml +++ b/site/data/adopters.yaml @@ -15,3 +15,7 @@ adopters: logo: "/logos/teleport.svg" url: "https://goteleport.com/" description: "Teleport is using Envoy Gateway to manage dynamic routing for all traffic to the Teleport Cloud Platform." + - name: "Tencent Cloud" + logo: "/logos/tencent-cloud.png" + url: "https://www.tencentcloud.com" + description: "Tencent Cloud is using Envoy Gateway as a Kubernetes Cluster Network Addon to manage dynamic routing in the Tencent Kubernetes Engine." diff --git a/site/static/logos/tencent-cloud.png b/site/static/logos/tencent-cloud.png new file mode 100644 index 0000000000000000000000000000000000000000..464fad1545c9c07865cba714af34f4e33fb25e5a GIT binary patch literal 49618 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 bJ&`EsTd^Va)Jwt9zJP*^s&u84ap3<0>PxC% literal 0 HcmV?d00001 From 8ec3095f7af87917f7528aaed7429ffc5566539c Mon Sep 17 00:00:00 2001 From: Huabing Zhao Date: Wed, 27 Nov 2024 10:54:32 +0800 Subject: [PATCH 4/5] Fix: frequent 503 errors when connecting to a Service experiencing high Pod churn (#4754) * Revert "fix: some status updates are discarded by the status updater (#4337)" This reverts commit 14830c7b7a7fa20cd3c5e82625c355485bcbd961. Signed-off-by: Huabing Zhao * store update events and process it later Signed-off-by: Huabing Zhao * rename method Signed-off-by: Huabing Zhao * add release note Signed-off-by: Huabing Zhao --------- Signed-off-by: Huabing Zhao --- .../provider/kubernetes/status_updater.go | 51 +++++++++++++++++-- release-notes/current.yaml | 1 + 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/internal/provider/kubernetes/status_updater.go b/internal/provider/kubernetes/status_updater.go index 24adaedd563..ee5cbce59d2 100644 --- a/internal/provider/kubernetes/status_updater.go +++ b/internal/provider/kubernetes/status_updater.go @@ -7,6 +7,7 @@ package kubernetes import ( "context" + "errors" "time" "github.com/go-logr/logr" @@ -56,14 +57,25 @@ func (m MutatorFunc) Mutate(old client.Object) client.Object { type UpdateHandler struct { log logr.Logger client client.Client + sendUpdates chan struct{} updateChannel chan Update + writer *UpdateWriter } func NewUpdateHandler(log logr.Logger, client client.Client) *UpdateHandler { + sendUpdates := make(chan struct{}) + updateChannel := make(chan Update, 100) return &UpdateHandler{ log: log, client: client, - updateChannel: make(chan Update, 100), + sendUpdates: sendUpdates, + updateChannel: updateChannel, + writer: &UpdateWriter{ + log: log, + enabled: sendUpdates, + updateChannel: updateChannel, + eventsBeforeEnabled: make(chan Update, 1000), + }, } } @@ -127,6 +139,10 @@ func (u *UpdateHandler) Start(ctx context.Context) error { u.log.Info("started status update handler") defer u.log.Info("stopped status update handler") + // Enable Updaters to start sending updates to this handler. + close(u.sendUpdates) + u.writer.handleEventsReceivedBeforeEnabled() + for { select { case <-ctx.Done(): @@ -142,9 +158,7 @@ func (u *UpdateHandler) Start(ctx context.Context) error { // Writer retrieves the interface that should be used to write to the UpdateHandler. func (u *UpdateHandler) Writer() Updater { - return &UpdateWriter{ - updateChannel: u.updateChannel, - } + return u.writer } // Updater describes an interface to send status updates somewhere. @@ -154,13 +168,40 @@ type Updater interface { // UpdateWriter takes status updates and sends these to the UpdateHandler via a channel. type UpdateWriter struct { + log logr.Logger + enabled <-chan struct{} updateChannel chan<- Update + // a temporary buffer to store events received before the Updater is enabled. + // These events will be sent to the update channel once the Updater is enabled. + eventsBeforeEnabled chan Update } // Send sends the given Update off to the update channel for writing by the UpdateHandler. func (u *UpdateWriter) Send(update Update) { // Non-blocking receive to see if we should pass along update. - u.updateChannel <- update + select { + case <-u.enabled: + u.updateChannel <- update + default: + if len(u.eventsBeforeEnabled) < cap(u.eventsBeforeEnabled) { + u.log.Info("received a status update while disabled, storing for later", "event", update.NamespacedName) + u.eventsBeforeEnabled <- update + } else { + // If the buffer is full, drop the event to avoid blocking the sender. + u.log.Error(errors.New("dropping status update, buffer full"), "event", update.NamespacedName) + } + } +} + +// handleEventsReceivedBeforeEnabled sends the events received before the Updater was enabled to the update channel. +func (u *UpdateWriter) handleEventsReceivedBeforeEnabled() { + go func() { + for e := range u.eventsBeforeEnabled { + u.log.Info("sending stored status update", "event", e.NamespacedName) + u.updateChannel <- e + } + close(u.eventsBeforeEnabled) + }() } // isStatusEqual checks if two objects have equivalent status. diff --git a/release-notes/current.yaml b/release-notes/current.yaml index eea29e8b78b..7b9d547d839 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -21,6 +21,7 @@ bug fixes: | Fixed failed to update SecurityPolicy resources with the `backendRef` field specified Fixed Envoy rejecting TCP Listeners that have no attached TCPRoutes Fixed xDS translation failed when oidc tokenEndpoint and jwt remoteJWKS are specified in the same SecurityPolicy and using the same hostname + Fixed frequent 503 errors when connecting to a Service experiencing high Pod churn # Enhancements that improve performance. performance improvements: | From a383dd97e4c7fe726f064c03f48a06e8b049001f Mon Sep 17 00:00:00 2001 From: Xunzhuo Date: Wed, 27 Nov 2024 10:57:17 +0800 Subject: [PATCH 5/5] chore: remove adopters.md (#4787) Signed-off-by: bitliu --- ADOPTERS.md | 66 ----------------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 ADOPTERS.md diff --git a/ADOPTERS.md b/ADOPTERS.md deleted file mode 100644 index 54d7d933ad0..00000000000 --- a/ADOPTERS.md +++ /dev/null @@ -1,66 +0,0 @@ - - - -# Envoy Gateway Adopters - -This page contains a list of organizations who are users of Envoy Gateway, following the [definitions provided by the CNCF](https://github.com/cncf/toc/blob/main/FAQ.md#what-is-the-definition-of-an-adopter). - -If you would like to be included in this table, please submit a PR to this file or comment to [this issue](https://github.com/envoyproxy/gateway/issues/2781) and your information will be added. - -## AllFactors - -* Website https://allfactors.com -* Category: End User -* Environments: -* Use Case: - - Routing all customer traffic to our various backends. Every time a new customer signs up we dynamically add a - route to a new hostname so Envoy Gateway is deeply integrated with our product. -* Status: production -* Logo: https://allfactors.com/AllFactors-Logo.svg - -## Tetrate - -* Website: https://www.tetrate.io -* Category: Service Provider -* Environments: AWS -* Use Cases: - - Tetrate provides Enterprise Gateway (TEG) to end users, which includes a 100% upstream distribution of Envoy Gateway, and management to deliver applications securely, authenticate user traffic, protect services with rate limiting and WAF, and integrate with your observability stack to monitor and observe activity. -* Status: production -* (Option) https://tetrate.io/wp-content/uploads/2023/03/tetrate-logo-dark.svg -* (Option) Description: - -## Airspace Link - -* Organizatioin: Airspace Link -* Website: https://airspacelink.com/ -* Category: End User -* Environments: Azure -* Use Cases: - - Airspace Link is using Envoy Gateway to route all public APIs to Kubernetes clusters, developers are manipulating routes descriptions using agnostic manifest files, which are then automatically provisioned using Envoy Gateway. -* Status: production -* Logo: https://airhub.airspacelink.com/images/asl-flat-logo.png - -## Tencent Cloud - -* Organizatioin: Tencent Cloud -* Website: https://www.tencentcloud.com -* Category: Service Provider -* Environments: Tencent Kubernetes Engine (TKE) -* Use Cases: - - Tencent Cloud is using Envoy Gateway as a Kubernetes Cluster Network Addon to manage dynamic routing in the Tencent Kubernetes Engine. -* Status: production