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 3a504865c9..31b11eb1af 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -815,8 +815,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -826,6 +825,14 @@ xds: serviceName: httproute/default/backend/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -842,8 +849,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -853,6 +859,14 @@ xds: serviceName: grpcroute/default/backend/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -875,8 +889,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -886,6 +899,14 @@ xds: serviceName: tcproute/default/backend/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -901,8 +922,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -912,6 +932,14 @@ xds: serviceName: tlsroute/default/backend/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -927,8 +955,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -938,6 +965,14 @@ xds: serviceName: udproute/default/backend/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: 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 1fa83bfd36..8326b7ec70 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 @@ -106,8 +106,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -117,6 +116,14 @@ xds: serviceName: httproute/envoy-gateway-system/backend/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: 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 d055a12efb..b592bd3e6a 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 @@ -491,9 +491,7 @@ } ] }, - "commonLbConfig": { - "localityWeightedLbConfig": {} - }, + "commonLbConfig": {}, "connectTimeout": "10s", "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { @@ -505,6 +503,21 @@ }, "ignoreHealthOnHostRemoval": true, "lbPolicy": "LEAST_REQUEST", + "loadBalancingPolicy": { + "policies": [ + { + "typedExtensionConfig": { + "name": "envoy.load_balancing_policies.least_request", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest", + "localityLbConfig": { + "localityWeightedLbConfig": {} + } + } + } + } + ] + }, "metadata": { "filterMetadata": { "envoy-gateway": { @@ -533,9 +546,7 @@ } ] }, - "commonLbConfig": { - "localityWeightedLbConfig": {} - }, + "commonLbConfig": {}, "connectTimeout": "10s", "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { @@ -547,6 +558,21 @@ }, "ignoreHealthOnHostRemoval": true, "lbPolicy": "LEAST_REQUEST", + "loadBalancingPolicy": { + "policies": [ + { + "typedExtensionConfig": { + "name": "envoy.load_balancing_policies.least_request", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest", + "localityLbConfig": { + "localityWeightedLbConfig": {} + } + } + } + } + ] + }, "metadata": { "filterMetadata": { "envoy-gateway": { @@ -586,9 +612,7 @@ } ] }, - "commonLbConfig": { - "localityWeightedLbConfig": {} - }, + "commonLbConfig": {}, "connectTimeout": "10s", "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { @@ -600,6 +624,21 @@ }, "ignoreHealthOnHostRemoval": true, "lbPolicy": "LEAST_REQUEST", + "loadBalancingPolicy": { + "policies": [ + { + "typedExtensionConfig": { + "name": "envoy.load_balancing_policies.least_request", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest", + "localityLbConfig": { + "localityWeightedLbConfig": {} + } + } + } + } + ] + }, "metadata": { "filterMetadata": { "envoy-gateway": { @@ -628,9 +667,7 @@ } ] }, - "commonLbConfig": { - "localityWeightedLbConfig": {} - }, + "commonLbConfig": {}, "connectTimeout": "10s", "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { @@ -642,6 +679,21 @@ }, "ignoreHealthOnHostRemoval": true, "lbPolicy": "LEAST_REQUEST", + "loadBalancingPolicy": { + "policies": [ + { + "typedExtensionConfig": { + "name": "envoy.load_balancing_policies.least_request", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest", + "localityLbConfig": { + "localityWeightedLbConfig": {} + } + } + } + } + ] + }, "metadata": { "filterMetadata": { "envoy-gateway": { @@ -670,9 +722,7 @@ } ] }, - "commonLbConfig": { - "localityWeightedLbConfig": {} - }, + "commonLbConfig": {}, "connectTimeout": "10s", "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { @@ -684,6 +734,21 @@ }, "ignoreHealthOnHostRemoval": true, "lbPolicy": "LEAST_REQUEST", + "loadBalancingPolicy": { + "policies": [ + { + "typedExtensionConfig": { + "name": "envoy.load_balancing_policies.least_request", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest", + "localityLbConfig": { + "localityWeightedLbConfig": {} + } + } + } + } + ] + }, "metadata": { "filterMetadata": { "envoy-gateway": { 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 de52ee5e6c..0ce878805f 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 @@ -269,8 +269,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -280,6 +279,14 @@ xds: serviceName: httproute/default/backend/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -295,8 +302,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -306,6 +312,14 @@ xds: serviceName: grpcroute/default/backend/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -328,8 +342,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -339,6 +352,14 @@ xds: serviceName: tcproute/default/backend/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -354,8 +375,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -365,6 +385,14 @@ xds: serviceName: tlsroute/default/backend/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -380,8 +408,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -391,6 +418,14 @@ xds: serviceName: udproute/default/backend/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: 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 64b13a3882..be145680d0 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 @@ -7,8 +7,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -18,6 +17,14 @@ xds: serviceName: httproute/default/backend/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -33,8 +40,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -44,6 +50,14 @@ xds: serviceName: grpcroute/default/backend/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -66,8 +80,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -77,6 +90,14 @@ xds: serviceName: tcproute/default/backend/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -92,8 +113,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -103,6 +123,14 @@ xds: serviceName: tlsroute/default/backend/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -118,8 +146,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -129,6 +156,14 @@ xds: serviceName: udproute/default/backend/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: 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 28ecacdd2f..1cfbb327fe 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 @@ -327,9 +327,7 @@ } ] }, - "commonLbConfig": { - "localityWeightedLbConfig": {} - }, + "commonLbConfig": {}, "connectTimeout": "10s", "dnsLookupFamily": "V4_PREFERRED", "edsClusterConfig": { @@ -341,6 +339,21 @@ }, "ignoreHealthOnHostRemoval": true, "lbPolicy": "LEAST_REQUEST", + "loadBalancingPolicy": { + "policies": [ + { + "typedExtensionConfig": { + "name": "envoy.load_balancing_policies.least_request", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest", + "localityLbConfig": { + "localityWeightedLbConfig": {} + } + } + } + } + ] + }, "metadata": { "filterMetadata": { "envoy-gateway": { @@ -369,9 +382,7 @@ } ] }, - "commonLbConfig": { - "localityWeightedLbConfig": {} - }, + "commonLbConfig": {}, "connectTimeout": "10s", "dnsLookupFamily": "V4_PREFERRED", "dnsRefreshRate": "30s", @@ -400,6 +411,21 @@ } ] }, + "loadBalancingPolicy": { + "policies": [ + { + "typedExtensionConfig": { + "name": "envoy.load_balancing_policies.least_request", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest", + "localityLbConfig": { + "localityWeightedLbConfig": {} + } + } + } + } + ] + }, "name": "raw_githubusercontent_com_443", "perConnectionBufferLimitBytes": 32768, "respectDnsTtl": true, 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 dae303a9f7..afddaa3f01 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 @@ -181,8 +181,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -192,6 +191,14 @@ xds: serviceName: httproute/envoy-gateway-system/backend/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -207,8 +214,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -226,6 +232,14 @@ xds: loadBalancingWeight: 1 locality: region: raw_githubusercontent_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: raw_githubusercontent_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 e84d41dcad..a00e442729 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 @@ -7,8 +7,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -18,6 +17,14 @@ xds: serviceName: httproute/envoy-gateway-system/backend/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -33,8 +40,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -52,6 +58,14 @@ xds: loadBalancingWeight: 1 locality: region: raw_githubusercontent_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: raw_githubusercontent_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 9d138baa57..0553585ed2 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 @@ -181,8 +181,7 @@ xds: circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -192,6 +191,14 @@ xds: serviceName: httproute/envoy-gateway-system/routes/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: diff --git a/internal/xds/translator/cluster.go b/internal/xds/translator/cluster.go index 277466f137..5b24c996bb 100644 --- a/internal/xds/translator/cluster.go +++ b/internal/xds/translator/cluster.go @@ -19,6 +19,7 @@ import ( codecv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/upstream_codec/v3" hcmv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" preservecasev3 "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_formatters/preserve_case/v3" + cluster_providedv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/cluster_provided/v3" commonv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3" least_requestv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3" maglevv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/maglev/v3" @@ -144,13 +145,9 @@ func buildXdsCluster(args *xdsClusterArgs) (*buildClusterResult, error) { } cluster := &clusterv3.Cluster{ - Name: args.name, - DnsLookupFamily: dnsLookupFamily, - CommonLbConfig: &clusterv3.Cluster_CommonLbConfig{ - LocalityConfigSpecifier: &clusterv3.Cluster_CommonLbConfig_LocalityWeightedLbConfig_{ - LocalityWeightedLbConfig: &clusterv3.Cluster_CommonLbConfig_LocalityWeightedLbConfig{}, - }, - }, + Name: args.name, + DnsLookupFamily: dnsLookupFamily, + CommonLbConfig: &clusterv3.Cluster_CommonLbConfig{}, PerConnectionBufferLimitBytes: buildBackandConnectionBufferLimitBytes(args.backendConnection), Metadata: buildXdsMetadata(args.metadata), } @@ -228,45 +225,125 @@ func buildXdsCluster(args *xdsClusterArgs) (*buildClusterResult, error) { cluster.TypedExtensionProtocolOptions = epo } + // Set default localityLbConfig + localityLbConfig := &commonv3.LocalityLbConfig{ + LocalityConfigSpecifier: &commonv3.LocalityLbConfig_LocalityWeightedLbConfig_{ + LocalityWeightedLbConfig: &commonv3.LocalityLbConfig_LocalityWeightedLbConfig{}, + }, + } + + // Override LocalityWeightedLbConfig if zone aware routing is enabled. + // Zone aware enabled backendRefs always have a single DestinationSetting per-cluster. + if len(args.settings) == 1 && args.settings[0].ZoneAwareRouting != nil { + localityLbConfig.LocalityConfigSpecifier = &commonv3.LocalityLbConfig_ZoneAwareLbConfig_{ + ZoneAwareLbConfig: &commonv3.LocalityLbConfig_ZoneAwareLbConfig{ + MinClusterSize: wrapperspb.UInt64(1), + ForceLocalZone: &commonv3.LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone{ + MinSize: wrapperspb.UInt32(uint32(args.settings[0].ZoneAwareRouting.MinSize)), + }, + }, + } + } + // Set Load Balancer policy //nolint:gocritic switch { case args.loadBalancer == nil: cluster.LbPolicy = clusterv3.Cluster_LEAST_REQUEST + leastRequest := &least_requestv3.LeastRequest{ + LocalityLbConfig: localityLbConfig, + } + typedLeastRequest, err := proto.ToAnyWithValidation(leastRequest) + if err != nil { + return nil, err + } + cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ + Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ + TypedExtensionConfig: &corev3.TypedExtensionConfig{ + Name: "envoy.load_balancing_policies.least_request", + TypedConfig: typedLeastRequest, + }, + }}, + } case args.loadBalancer.LeastRequest != nil: cluster.LbPolicy = clusterv3.Cluster_LEAST_REQUEST - if args.loadBalancer.LeastRequest.SlowStart != nil { - if args.loadBalancer.LeastRequest.SlowStart.Window != nil { - cluster.LbConfig = &clusterv3.Cluster_LeastRequestLbConfig_{ - LeastRequestLbConfig: &clusterv3.Cluster_LeastRequestLbConfig{ - SlowStartConfig: &clusterv3.Cluster_SlowStartConfig{ - SlowStartWindow: durationpb.New(args.loadBalancer.LeastRequest.SlowStart.Window.Duration), - }, - }, - } + + leastRequest := &least_requestv3.LeastRequest{ + LocalityLbConfig: localityLbConfig, + } + if args.loadBalancer.LeastRequest.SlowStart != nil && args.loadBalancer.LeastRequest.SlowStart.Window != nil { + leastRequest.SlowStartConfig = &commonv3.SlowStartConfig{ + SlowStartWindow: durationpb.New(args.loadBalancer.LeastRequest.SlowStart.Window.Duration), } } + typedLeastRequest, err := proto.ToAnyWithValidation(leastRequest) + if err != nil { + return nil, err + } + cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ + Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ + TypedExtensionConfig: &corev3.TypedExtensionConfig{ + Name: "envoy.load_balancing_policies.least_request", + TypedConfig: typedLeastRequest, + }, + }}, + } case args.loadBalancer.RoundRobin != nil: cluster.LbPolicy = clusterv3.Cluster_ROUND_ROBIN + roundRobin := &round_robinv3.RoundRobin{ + LocalityLbConfig: localityLbConfig, + } if args.loadBalancer.RoundRobin.SlowStart != nil && args.loadBalancer.RoundRobin.SlowStart.Window != nil { - cluster.LbConfig = &clusterv3.Cluster_RoundRobinLbConfig_{ - RoundRobinLbConfig: &clusterv3.Cluster_RoundRobinLbConfig{ - SlowStartConfig: &clusterv3.Cluster_SlowStartConfig{ - SlowStartWindow: durationpb.New(args.loadBalancer.RoundRobin.SlowStart.Window.Duration), - }, - }, + roundRobin.SlowStartConfig = &commonv3.SlowStartConfig{ + SlowStartWindow: durationpb.New(args.loadBalancer.RoundRobin.SlowStart.Window.Duration), } } + typedRoundRobin, err := proto.ToAnyWithValidation(roundRobin) + if err != nil { + return nil, err + } + cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ + Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ + TypedExtensionConfig: &corev3.TypedExtensionConfig{ + Name: "envoy.load_balancing_policies.round_robin", + TypedConfig: typedRoundRobin, + }, + }}, + } case args.loadBalancer.Random != nil: cluster.LbPolicy = clusterv3.Cluster_RANDOM + random := &randomv3.Random{ + LocalityLbConfig: localityLbConfig, + } + typeRandom, err := proto.ToAnyWithValidation(random) + if err != nil { + return nil, err + } + cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ + Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ + TypedExtensionConfig: &corev3.TypedExtensionConfig{ + Name: "envoy.load_balancing_policies.random", + TypedConfig: typeRandom, + }, + }}, + } case args.loadBalancer.ConsistentHash != nil: cluster.LbPolicy = clusterv3.Cluster_MAGLEV + consistentHash := &maglevv3.Maglev{} if args.loadBalancer.ConsistentHash.TableSize != nil { - cluster.LbConfig = &clusterv3.Cluster_MaglevLbConfig_{ - MaglevLbConfig: &clusterv3.Cluster_MaglevLbConfig{ - TableSize: &wrapperspb.UInt64Value{Value: *args.loadBalancer.ConsistentHash.TableSize}, + consistentHash.TableSize = wrapperspb.UInt64(*args.loadBalancer.ConsistentHash.TableSize) + } + typedConsistentHash, err := proto.ToAnyWithValidation(consistentHash) + if err != nil { + return nil, err + } + cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ + Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ + TypedExtensionConfig: &corev3.TypedExtensionConfig{ + Name: "envoy.load_balancing_policies.maglev", + TypedConfig: typedConsistentHash, }, - } + }}, } } @@ -313,7 +390,19 @@ func buildXdsCluster(args *xdsClusterArgs) (*buildClusterResult, error) { TypedConfig: dfpAny, }} cluster.LbPolicy = clusterv3.Cluster_CLUSTER_PROVIDED - + clusterProvided := &cluster_providedv3.ClusterProvided{} + typedClusterProvided, err := proto.ToAnyWithValidation(clusterProvided) + if err != nil { + return nil, err + } + cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ + Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ + TypedExtensionConfig: &corev3.TypedExtensionConfig{ + Name: "envoy.load_balancing_policies.cluster_provided", + TypedConfig: typedClusterProvided, + }, + }}, + } case EndpointTypeStatic: cluster.ClusterDiscoveryType = &clusterv3.Cluster_Type{Type: clusterv3.Cluster_EDS} cluster.EdsClusterConfig = &clusterv3.Cluster_EdsClusterConfig{ @@ -344,114 +433,12 @@ func buildXdsCluster(args *xdsClusterArgs) (*buildClusterResult, error) { } } - if args.endpointType != EndpointTypeDynamicResolver { - for _, ds := range args.settings { - buildZoneAwareRoutingCluster(ds.ZoneAwareRouting, cluster, args.loadBalancer) - } - } - return &buildClusterResult{ cluster: cluster, secrets: secrets, }, nil } -// buildZoneAwareRoutingCluster configures an xds cluster with Zone Aware Routing configuration. It overrides -// cluster.LbPolicy and cluster.CommonLbConfig with cluster.LoadBalancingPolicy. -// TODO: Remove cluster.LbPolicy along with clustercommongLbConfig and switch to cluster.LoadBalancingPolicy -// everywhere as the preferred and more feature-rich configuration field. -func buildZoneAwareRoutingCluster(cfg *ir.ZoneAwareRouting, cluster *clusterv3.Cluster, lb *ir.LoadBalancer) { - if cfg == nil { - return - } - - // Remove CommonLbConfig.LocalityConfigSpecifier and instead configure via cluster.LoadBalancingPolicy - cluster.CommonLbConfig.LocalityConfigSpecifier = nil - - localityLbConfig := &commonv3.LocalityLbConfig{ - LocalityConfigSpecifier: &commonv3.LocalityLbConfig_ZoneAwareLbConfig_{ - ZoneAwareLbConfig: &commonv3.LocalityLbConfig_ZoneAwareLbConfig{ - MinClusterSize: wrapperspb.UInt64(1), - ForceLocalZone: &commonv3.LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone{ - MinSize: wrapperspb.UInt32(uint32(cfg.MinSize)), - }, - }, - }, - } - - // Default to least request LoadBalancingPolicy - leastRequest := &least_requestv3.LeastRequest{ - LocalityLbConfig: localityLbConfig, - } - typedLeastRequest, _ := anypb.New(leastRequest) - cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ - Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ - TypedExtensionConfig: &corev3.TypedExtensionConfig{ - Name: "envoy.load_balancing_policies.least_request", - TypedConfig: typedLeastRequest, - }, - }}, - } - - if lb != nil { - switch cluster.LbPolicy { - case clusterv3.Cluster_LEAST_REQUEST: - if lb.LeastRequest != nil && lb.LeastRequest.SlowStart != nil && lb.LeastRequest.SlowStart.Window != nil { - leastRequest.SlowStartConfig = &commonv3.SlowStartConfig{ - SlowStartWindow: durationpb.New(lb.LeastRequest.SlowStart.Window.Duration), - } - } - cluster.LoadBalancingPolicy.Policies[0].TypedExtensionConfig.TypedConfig, _ = anypb.New(leastRequest) - case clusterv3.Cluster_ROUND_ROBIN: - roundRobin := &round_robinv3.RoundRobin{ - LocalityLbConfig: localityLbConfig, - } - if lb.RoundRobin.SlowStart != nil && lb.RoundRobin.SlowStart.Window != nil { - roundRobin.SlowStartConfig = &commonv3.SlowStartConfig{ - SlowStartWindow: durationpb.New(lb.RoundRobin.SlowStart.Window.Duration), - } - } - typedRoundRobin, _ := anypb.New(roundRobin) - cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ - Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ - TypedExtensionConfig: &corev3.TypedExtensionConfig{ - Name: "envoy.load_balancing_policies.round_robin", - TypedConfig: typedRoundRobin, - }, - }}, - } - - case clusterv3.Cluster_RANDOM: - random := &randomv3.Random{ - LocalityLbConfig: localityLbConfig, - } - typeRandom, _ := anypb.New(random) - cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ - Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ - TypedExtensionConfig: &corev3.TypedExtensionConfig{ - Name: "envoy.load_balancing_policies.random", - TypedConfig: typeRandom, - }, - }}, - } - case clusterv3.Cluster_MAGLEV: - consistentHash := &maglevv3.Maglev{} - if lb.ConsistentHash.TableSize != nil { - consistentHash.TableSize = wrapperspb.UInt64(*lb.ConsistentHash.TableSize) - } - typedConsistentHash, _ := anypb.New(consistentHash) - cluster.LoadBalancingPolicy = &clusterv3.LoadBalancingPolicy{ - Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ - TypedExtensionConfig: &corev3.TypedExtensionConfig{ - Name: "envoy.load_balancing_policies.maglev", - TypedConfig: typedConsistentHash, - }, - }}, - } - } - } -} - func buildXdsHealthCheck(healthcheck *ir.ActiveHealthCheck) []*corev3.HealthCheck { hc := &corev3.HealthCheck{ Timeout: durationpb.New(healthcheck.Timeout.Duration), diff --git a/internal/xds/translator/cluster_test.go b/internal/xds/translator/cluster_test.go index db2d0a4895..a05363a7a2 100644 --- a/internal/xds/translator/cluster_test.go +++ b/internal/xds/translator/cluster_test.go @@ -7,24 +7,13 @@ package translator import ( "testing" - "time" bootstrapv3 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3" clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" - corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - commonv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3" - least_requestv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3" - maglevv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/maglev/v3" - randomv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/random/v3" - round_robinv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/round_robin/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "google.golang.org/protobuf/types/known/anypb" - "google.golang.org/protobuf/types/known/durationpb" - "google.golang.org/protobuf/types/known/wrapperspb" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" "sigs.k8s.io/yaml" @@ -58,201 +47,6 @@ func TestBuildXdsCluster(t *testing.T) { assert.True(t, proto.Equal(bootstrapXdsCluster.ConnectTimeout, dynamicXdsCluster.ConnectTimeout)) } -func TestCheckZoneAwareRouting(t *testing.T) { - tests := []struct { - name string - zoneRouting *ir.ZoneAwareRouting - loadBalancerCfg *ir.LoadBalancer - }{ - { - name: "zone-routing with default lb", - zoneRouting: &ir.ZoneAwareRouting{MinSize: 1}, - loadBalancerCfg: &ir.LoadBalancer{ - LeastRequest: &ir.LeastRequest{}, - }, - }, - { - name: "zone-routing with default lb and topology aware routing", - zoneRouting: &ir.ZoneAwareRouting{MinSize: 3}, - loadBalancerCfg: &ir.LoadBalancer{ - LeastRequest: &ir.LeastRequest{}, - }, - }, - { - name: "zone-routing with nil lb", - zoneRouting: &ir.ZoneAwareRouting{MinSize: 1}, - loadBalancerCfg: nil, - }, - { - name: "zone-routing with least request", - zoneRouting: &ir.ZoneAwareRouting{MinSize: 1}, - loadBalancerCfg: &ir.LoadBalancer{ - LeastRequest: &ir.LeastRequest{ - SlowStart: &ir.SlowStart{Window: &metav1.Duration{Duration: 1 * time.Second}}, - }, - }, - }, - { - name: "zone-routing with round robin", - zoneRouting: &ir.ZoneAwareRouting{MinSize: 1}, - loadBalancerCfg: &ir.LoadBalancer{ - RoundRobin: &ir.RoundRobin{ - SlowStart: &ir.SlowStart{Window: &metav1.Duration{Duration: 1 * time.Second}}, - }, - }, - }, - { - name: "zone-routing with random", - zoneRouting: &ir.ZoneAwareRouting{MinSize: 1}, - loadBalancerCfg: &ir.LoadBalancer{Random: &ir.Random{}}, - }, - { - name: "zone-routing with maglev", - zoneRouting: &ir.ZoneAwareRouting{MinSize: 1}, - loadBalancerCfg: &ir.LoadBalancer{ - ConsistentHash: &ir.ConsistentHash{ - TableSize: proto.Uint64(65537), - }, - }, - }, - { - name: "zone-routing with round robin", - zoneRouting: &ir.ZoneAwareRouting{MinSize: 1}, - loadBalancerCfg: &ir.LoadBalancer{ - RoundRobin: &ir.RoundRobin{ - SlowStart: &ir.SlowStart{Window: &metav1.Duration{Duration: 1 * time.Second}}, - }, - }, - }, - { - name: "zone-routing disabled", - zoneRouting: nil, - loadBalancerCfg: &ir.LoadBalancer{ - LeastRequest: &ir.LeastRequest{}, - }, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - bootstrapXdsCluster := getXdsClusterObjFromBootstrap(t) - ds := &ir.DestinationSetting{ - Endpoints: []*ir.DestinationEndpoint{{Host: envoyGatewayXdsServerHost, Port: bootstrap.DefaultXdsServerPort}}, - ZoneAwareRouting: tt.zoneRouting, - } - args := &xdsClusterArgs{ - name: bootstrapXdsCluster.Name, - tSocket: bootstrapXdsCluster.TransportSocket, - endpointType: EndpointTypeDNS, - healthCheck: &ir.HealthCheck{ - PanicThreshold: ptr.To[uint32](66), - }, - loadBalancer: tt.loadBalancerCfg, - settings: []*ir.DestinationSetting{ds}, - } - clusterResult, err := buildXdsCluster(args) - dynamicXdsCluster := clusterResult.cluster - require.NoError(t, err) - - if tt.zoneRouting == nil { - require.Nil(t, dynamicXdsCluster.LoadBalancingPolicy) - require.Equal(t, &clusterv3.Cluster_CommonLbConfig_LocalityWeightedLbConfig_{LocalityWeightedLbConfig: &clusterv3.Cluster_CommonLbConfig_LocalityWeightedLbConfig{}}, dynamicXdsCluster.CommonLbConfig.LocalityConfigSpecifier) - } else { - require.Nil(t, dynamicXdsCluster.CommonLbConfig.LocalityConfigSpecifier) - expectedLoadBalancingPolicy := getExpectedClusterLbPolicies(tt.zoneRouting, dynamicXdsCluster.LbPolicy, args.loadBalancer) - require.Equal(t, expectedLoadBalancingPolicy.Policies[0].TypedExtensionConfig.Name, dynamicXdsCluster.LoadBalancingPolicy.Policies[0].TypedExtensionConfig.Name) - require.Equal(t, expectedLoadBalancingPolicy.Policies[0].GetTypedExtensionConfig().GetTypedConfig().String(), dynamicXdsCluster.LoadBalancingPolicy.Policies[0].GetTypedExtensionConfig().GetTypedConfig().String()) - } - }) - } -} - -func getExpectedClusterLbPolicies(zoneRouting *ir.ZoneAwareRouting, policy clusterv3.Cluster_LbPolicy, lb *ir.LoadBalancer) *clusterv3.LoadBalancingPolicy { - localityLbConfig := &commonv3.LocalityLbConfig{ - LocalityConfigSpecifier: &commonv3.LocalityLbConfig_ZoneAwareLbConfig_{ - ZoneAwareLbConfig: &commonv3.LocalityLbConfig_ZoneAwareLbConfig{ - MinClusterSize: wrapperspb.UInt64(1), - ForceLocalZone: &commonv3.LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone{ - MinSize: wrapperspb.UInt32(uint32(zoneRouting.MinSize)), - }, - }, - }, - } - leastRequest := &least_requestv3.LeastRequest{ - LocalityLbConfig: localityLbConfig, - } - typedLeastRequest, _ := anypb.New(leastRequest) - loadBalancingPolicy := &clusterv3.LoadBalancingPolicy{ - Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ - TypedExtensionConfig: &corev3.TypedExtensionConfig{ - Name: "envoy.load_balancing_policies.least_request", - TypedConfig: typedLeastRequest, - }, - }}, - } - - if lb == nil { - return loadBalancingPolicy - } - switch policy { - case clusterv3.Cluster_LEAST_REQUEST: - if lb.LeastRequest != nil && lb.LeastRequest.SlowStart != nil && lb.LeastRequest.SlowStart.Window != nil { - leastRequest.SlowStartConfig = &commonv3.SlowStartConfig{ - SlowStartWindow: durationpb.New(lb.LeastRequest.SlowStart.Window.Duration), - } - } - loadBalancingPolicy.Policies[0].TypedExtensionConfig.TypedConfig, _ = anypb.New(leastRequest) - return loadBalancingPolicy - case clusterv3.Cluster_ROUND_ROBIN: - roundRobin := &round_robinv3.RoundRobin{ - LocalityLbConfig: localityLbConfig, - } - if lb.RoundRobin.SlowStart != nil && lb.RoundRobin.SlowStart.Window != nil { - roundRobin.SlowStartConfig = &commonv3.SlowStartConfig{ - SlowStartWindow: durationpb.New(lb.RoundRobin.SlowStart.Window.Duration), - } - } - typedRoundRobin, _ := anypb.New(roundRobin) - return &clusterv3.LoadBalancingPolicy{ - Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ - TypedExtensionConfig: &corev3.TypedExtensionConfig{ - Name: "envoy.load_balancing_policies.round_robin", - TypedConfig: typedRoundRobin, - }, - }}, - } - case clusterv3.Cluster_RANDOM: - random := &randomv3.Random{ - LocalityLbConfig: localityLbConfig, - } - typeRandom, _ := anypb.New(random) - return &clusterv3.LoadBalancingPolicy{ - Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ - TypedExtensionConfig: &corev3.TypedExtensionConfig{ - Name: "envoy.load_balancing_policies.random", - TypedConfig: typeRandom, - }, - }}, - } - case clusterv3.Cluster_MAGLEV: - consistentHash := &maglevv3.Maglev{} - if lb.ConsistentHash.TableSize != nil { - consistentHash.TableSize = wrapperspb.UInt64(*lb.ConsistentHash.TableSize) - } - typedConsistentHash, _ := anypb.New(consistentHash) - - return &clusterv3.LoadBalancingPolicy{ - Policies: []*clusterv3.LoadBalancingPolicy_Policy{{ - TypedExtensionConfig: &corev3.TypedExtensionConfig{ - Name: "envoy.load_balancing_policies.maglev", - TypedConfig: typedConsistentHash, - }, - }}, - } - - } - return nil -} - func TestBuildXdsClusterLoadAssignment(t *testing.T) { bootstrapXdsCluster := getXdsClusterObjFromBootstrap(t) ds := &ir.DestinationSetting{ 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 4e46c1dfc6..342deacae0 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: http-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: http-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: tcp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: udp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: udp-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.clusters.yaml index c40bcfbfdb..e9cb88c174 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-error.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: custom-backend-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: custom-backend-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.clusters.yaml index c40bcfbfdb..e9cb88c174 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend-multiple-backend-error.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: custom-backend-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: custom-backend-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.clusters.yaml index 30cb39f8f0..11c753ed6a 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backend.clusters.yaml @@ -5,6 +5,14 @@ dnsLookupFamily: V4_PREFERRED ignoreHealthOnHostRemoval: true lbPolicy: CLUSTER_PROVIDED + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: custom-backend-dest originalDstLbConfig: httpHeaderName: x-gateway-destination-endpoint diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.clusters.yaml index 30cb39f8f0..11c753ed6a 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-mixed.clusters.yaml @@ -5,6 +5,14 @@ dnsLookupFamily: V4_PREFERRED ignoreHealthOnHostRemoval: true lbPolicy: CLUSTER_PROVIDED + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: custom-backend-dest originalDstLbConfig: httpHeaderName: x-gateway-destination-endpoint diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.clusters.yaml index c40bcfbfdb..e9cb88c174 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-custom-backends-multiple-mixed.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: custom-backend-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: custom-backend-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 0dcc3b4819..023d7b81a6 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.clusters.yaml index 0dcc3b4819..023d7b81a6 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-listener-error.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.clusters.yaml index f8f489d240..4b42348410 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-route-error.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: extension-post-xdsroute-hook-error-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: extension-post-xdsroute-hook-error-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.clusters.yaml index 46fd544dc1..b7e67826e3 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-translate-error.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: fail-close-error ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fail-close-error perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.clusters.yaml index 0dcc3b4819..023d7b81a6 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/http-route-extension-virtualhost-error.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 0dcc3b4819..023d7b81a6 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.clusters.yaml index 5a3ea4c872..bc3fd7d2ae 100644 --- a/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.clusters.yaml +++ b/internal/xds/translator/testdata/out/extension-xds-ir/multiple-listeners-same-port-error.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 86fb50d1d4..dfc236fe0e 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 @@ -2,8 +2,7 @@ thresholds: - maxConnections: 2048 maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 15s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -13,6 +12,14 @@ serviceName: accesslog/monitoring/envoy-als/port/9000 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog/monitoring/envoy-als/port/9000 outlierDetection: baseEjectionTime: 30s 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 81c121a400..fc81e62d38 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: accesslog-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog-0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 37bb1cef24..0cc742ae88 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -20,8 +27,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -39,6 +45,14 @@ loadBalancingWeight: 1 locality: region: accesslog-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog-0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 81c121a400..fc81e62d38 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: accesslog-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog-0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 81c121a400..fc81e62d38 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: accesslog-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog-0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 088632d350..f7629863b5 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: accesslog_als_0_1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_als_0_1 perConnectionBufferLimitBytes: 32768 type: EDS @@ -42,8 +56,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -53,6 +66,14 @@ serviceName: accesslog_als_0_2 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_als_0_2 perConnectionBufferLimitBytes: 32768 type: EDS @@ -66,8 +87,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -77,6 +97,14 @@ serviceName: accesslog_als_1_1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_als_1_1 perConnectionBufferLimitBytes: 32768 type: EDS @@ -90,8 +118,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -101,6 +128,14 @@ serviceName: accesslog_als_1_2 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_als_1_2 perConnectionBufferLimitBytes: 32768 type: EDS @@ -114,8 +149,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -125,6 +159,14 @@ serviceName: accesslog_als_2_1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_als_2_1 perConnectionBufferLimitBytes: 32768 type: EDS @@ -138,8 +180,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -149,6 +190,14 @@ serviceName: accesslog_als_2_2 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_als_2_2 perConnectionBufferLimitBytes: 32768 type: EDS @@ -162,8 +211,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -181,6 +229,14 @@ loadBalancingWeight: 1 locality: region: accesslog_otel_0_3/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_otel_0_3 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -195,8 +251,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -214,6 +269,14 @@ loadBalancingWeight: 1 locality: region: accesslog_otel_1_3/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_otel_1_3 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -228,8 +291,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -247,6 +309,14 @@ loadBalancingWeight: 1 locality: region: accesslog_otel_2_3/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_otel_2_3 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.clusters.yaml index 07213bc392..f3887e6b59 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog-with-format.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: accesslog/monitoring/envoy-als/port/9000 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog/monitoring/envoy-als/port/9000 perConnectionBufferLimitBytes: 32768 type: EDS @@ -42,8 +56,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -60,6 +73,14 @@ loadBalancingWeight: 1 loadBalancingWeight: 1 locality: {} + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog-0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 6df53f6698..16b3c2958e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: accesslog/monitoring/envoy-als/port/9000 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog/monitoring/envoy-als/port/9000 perConnectionBufferLimitBytes: 32768 type: EDS @@ -42,8 +56,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -61,6 +74,14 @@ loadBalancingWeight: 1 locality: region: accesslog-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog-0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true diff --git a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.clusters.yaml index c60ba5e19a..f7ef9fef6c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/api-key-auth.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/api-key-auth.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-1/rule/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 b6e0c7f99a..e58334f68e 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-3/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-3/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.clusters.yaml index c24d059eea..54ba5dfc91 100644 --- a/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/authorization-http-header.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 399a448d81..07a60bccf2 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -54,6 +67,14 @@ loadBalancingWeight: 1 locality: region: two_example_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: two_example_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -70,8 +91,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -89,6 +109,14 @@ loadBalancingWeight: 1 locality: region: one_example_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: one_example_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 399a448d81..07a60bccf2 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -54,6 +67,14 @@ loadBalancingWeight: 1 locality: region: two_example_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: two_example_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -70,8 +91,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -89,6 +109,14 @@ loadBalancingWeight: 1 locality: region: one_example_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: one_example_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 c24d059eea..54ba5dfc91 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 baa860c9ff..cb4f7c1745 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 100000000 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: tcp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-dest perConnectionBufferLimitBytes: 100000000 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: udp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: udp-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 970324b2c9..6dcc407b52 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: envoyextensionpolicy/default/policy-for-http-route/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: envoyextensionpolicy/default/policy-for-http-route/0 perConnectionBufferLimitBytes: 32768 transportSocketMatches: diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.clusters.yaml index 8122060bcb..540ba4fd71 100644 --- a/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/backend-tls-skip-verify.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 transportSocketMatches: diff --git a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.clusters.yaml index c60ba5e19a..f7ef9fef6c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/basic-auth-username-header.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-1/rule/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 c60ba5e19a..f7ef9fef6c 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-1/rule/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.clusters.yaml index c24d059eea..54ba5dfc91 100644 --- a/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/btp-telemetry.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 0084cd8b45..d217f201ef 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 @@ -6,8 +6,7 @@ maxPendingRequests: 1 maxRequests: 1 maxRetries: 2 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -17,6 +16,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 1b8a0dcfcd..00eea07119 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: tcp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 dba5fc4a3c..79cefc3763 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,6 +83,14 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 ba595752d9..7e9eb80719 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/compression.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/compression.clusters.yaml index c24d059eea..54ba5dfc91 100644 --- a/internal/xds/translator/testdata/out/xds-ir/compression.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/compression.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.clusters.yaml index 06e9a8da52..054f90bb71 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors-from-httpcorsfilter.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 100644 --- a/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/cors.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.clusters.yaml index 369e102c75..f0b9856283 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection-backend-filter.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/1/backend/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1/backend/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: httproute/default/httproute-1/rule/1/backend/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1/backend/1 perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/credential-injection.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/credential-injection.clusters.yaml index c9c467430d..851e32627d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/credential-injection.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/credential-injection.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-1/rule/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: httproute/default/httproute-1/rule/2 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/2 perConnectionBufferLimitBytes: 32768 type: EDS 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 980fba29fb..2195996acf 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -20,6 +19,14 @@ loadBalancingWeight: 1 locality: region: one_example_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: one_example_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -36,8 +43,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -55,6 +61,14 @@ loadBalancingWeight: 1 locality: region: two_example_com_80/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: two_example_com_80 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 ba27dfd9d2..2d4772df3e 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.clusters.yaml index 30b831b0eb..230d1e7184 100644 --- a/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/dns-lookup-family.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V6_ONLY dnsRefreshRate: 5s @@ -19,14 +18,21 @@ loadBalancingWeight: 1 loadBalancingWeight: 1 locality: {} + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: STRICT_DNS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V6_ONLY dnsRefreshRate: 5s @@ -43,6 +49,14 @@ loadBalancingWeight: 1 loadBalancingWeight: 1 locality: {} + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: grpcroute/default/grpcroute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: STRICT_DNS @@ -56,8 +70,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -74,6 +87,14 @@ loadBalancingWeight: 1 loadBalancingWeight: 1 locality: {} + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/envoy-gateway/policy-for-gateway-1/extauth/0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -81,8 +102,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: ALL dnsRefreshRate: 5s @@ -99,6 +119,14 @@ loadBalancingWeight: 1 loadBalancingWeight: 1 locality: {} + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: envoyextensionpolicy/default/policy-for-httproute/extproc/0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -113,8 +141,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_ONLY dnsRefreshRate: 30s @@ -132,6 +159,14 @@ loadBalancingWeight: 1 locality: region: accesslog-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: accesslog_otel_0_1 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 8c4d92eeaa..5b2e86b1d6 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-1/rule/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -71,6 +91,14 @@ loadBalancingWeight: 1 locality: region: securitypolicy/default/policy-for-http-route-1/default/grpc-backend/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-http-route-1/default/grpc-backend perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -88,8 +116,7 @@ maxPendingRequests: 1024 maxRequests: 1022 maxRetries: 1023 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -107,6 +134,14 @@ loadBalancingWeight: 1 locality: region: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend perConnectionBufferLimitBytes: 32768 respectDnsTtl: true diff --git a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.clusters.yaml index 3ff821f5ef..736e3bad14 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ext-auth-body.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-1/rule/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -71,6 +91,14 @@ loadBalancingWeight: 1 locality: region: securitypolicy/default/policy-for-http-route-1/default/grpc-backend/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-http-route-1/default/grpc-backend perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -85,8 +113,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -104,6 +131,14 @@ loadBalancingWeight: 1 locality: region: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 3ff821f5ef..736e3bad14 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-1/rule/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -71,6 +91,14 @@ loadBalancingWeight: 1 locality: region: securitypolicy/default/policy-for-http-route-1/default/grpc-backend/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-http-route-1/default/grpc-backend perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -85,8 +113,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -104,6 +131,14 @@ loadBalancingWeight: 1 locality: region: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 4b69123192..c032820441 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-1/rule/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/1 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,6 +83,14 @@ serviceName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-http-route-1/default/grpc-backend perConnectionBufferLimitBytes: 32768 type: EDS @@ -76,8 +104,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -87,6 +114,14 @@ serviceName: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend perConnectionBufferLimitBytes: 32768 type: EDS 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 fc5d51a1ae..e008f47176 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS @@ -36,8 +50,7 @@ thresholds: - maxConnections: 2048 maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 15s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,16 @@ resourceApiVersion: V3 serviceName: envoyextensionpolicy/default/policy-for-http-route/0 ignoreHealthOnHostRemoval: true + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.round_robin + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.round_robin.v3.RoundRobin + localityLbConfig: + localityWeightedLbConfig: {} + slowStartConfig: + slowStartWindow: 5s name: envoyextensionpolicy/default/policy-for-http-route/0 outlierDetection: baseEjectionTime: 30s @@ -55,9 +78,6 @@ interval: 5s maxEjectionPercent: 10 perConnectionBufferLimitBytes: 20971520 - roundRobinLbConfig: - slowStartConfig: - slowStartWindow: 5s transportSocket: name: envoy.transport_sockets.upstream_proxy_protocol typedConfig: 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 6e72ef5092..1cedd484b8 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: httproute/default/httproute-3/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-3/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,6 +83,14 @@ serviceName: envoyextensionpolicy/default/policy-for-route-2/0/grpc-backend-4 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: envoyextensionpolicy/default/policy-for-route-2/0/grpc-backend-4 perConnectionBufferLimitBytes: 32768 type: EDS @@ -76,8 +104,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -87,6 +114,14 @@ serviceName: envoyextensionpolicy/default/policy-for-route-1/0/grpc-backend-2 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: envoyextensionpolicy/default/policy-for-route-1/0/grpc-backend-2 perConnectionBufferLimitBytes: 32768 type: EDS @@ -100,8 +135,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -111,6 +145,14 @@ serviceName: envoyextensionpolicy/envoy-gateway/policy-for-gateway-2/0/grpc-backend-3 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: envoyextensionpolicy/envoy-gateway/policy-for-gateway-2/0/grpc-backend-3 perConnectionBufferLimitBytes: 32768 type: EDS @@ -124,8 +166,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -135,6 +176,14 @@ serviceName: envoyextensionpolicy/envoy-gateway/policy-for-gateway-1/0/grpc-backend ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: envoyextensionpolicy/envoy-gateway/policy-for-gateway-1/0/grpc-backend perConnectionBufferLimitBytes: 32768 type: EDS @@ -148,8 +197,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -159,6 +207,14 @@ serviceName: envoyextensionpolicy/envoy-gateway/policy-for-route-3/0/grpc-backend-3 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: envoyextensionpolicy/envoy-gateway/policy-for-route-3/0/grpc-backend-3 perConnectionBufferLimitBytes: 32768 type: EDS 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 cc411266ad..e60461edd8 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -80,6 +107,14 @@ serviceName: fifth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fifth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.clusters.yaml index ba595752d9..7e9eb80719 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-disable-request-id.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.clusters.yaml index ba595752d9..7e9eb80719 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-generate-request-id.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.clusters.yaml index ba595752d9..7e9eb80719 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-or-generate-request-id.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.clusters.yaml index ba595752d9..7e9eb80719 100644 --- a/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/headers-with-preserve-request-id.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 dba5fc4a3c..79cefc3763 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,6 +83,14 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 db58cac660..3c797c2ff9 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -27,6 +26,14 @@ unhealthyThreshold: 3 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest outlierDetection: baseEjectionTime: 180s @@ -40,8 +47,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -64,6 +70,14 @@ unhealthyThreshold: 3 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest outlierDetection: baseEjectionTime: 180s @@ -77,8 +91,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -98,6 +111,14 @@ unhealthyThreshold: 3 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest outlierDetection: baseEjectionTime: 160s @@ -111,8 +132,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -132,6 +152,14 @@ unhealthyThreshold: 3 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest outlierDetection: baseEjectionTime: 180s @@ -146,8 +174,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -164,6 +191,14 @@ unhealthyThreshold: 3 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fifth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.clusters.yaml index c24d059eea..54ba5dfc91 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-proxy.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.clusters.yaml index c24d059eea..54ba5dfc91 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-connect-terminate.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 f015e69fce..535e3061d3 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS @@ -28,8 +35,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -39,6 +45,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 d825e6d375..7be94a36b5 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 b532b46bdb..e6f9ee9f8c 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 5362244f7b..59bf618ace 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: 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 df0e6b954a..d04acce9f7 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 07757e5fde..af1b3d65f1 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -26,6 +25,14 @@ loadBalancingWeight: 1 locality: region: first-route-dest/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 respectDnsTtl: true diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.clusters.yaml index 10a5acd0d8..d94c71a083 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-dynamic-resolver.clusters.yaml @@ -9,11 +9,16 @@ dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s name: httproute/default/httproute-1/rule/0 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED lbPolicy: CLUSTER_PROVIDED + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.cluster_provided + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.cluster_provided.v3.ClusterProvided name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 transportSocket: 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 ce54d3a35d..9ffaee3b79 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.clusters.yaml index 5f0b3deaa9..fca71d6ad2 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-mirrors-percentage.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: mirror-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: mirror-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 b70cda2ec5..76a64be2b8 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -80,14 +107,21 @@ serviceName: fifth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fifth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -97,14 +131,21 @@ serviceName: sixth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: sixth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -114,6 +155,14 @@ serviceName: seventh-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: seventh-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.clusters.yaml index 6ca132c714..6d745e7f0f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-multiple-mirrors-percentage.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: mirror-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: mirror-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: mirror-route-dest1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: mirror-route-dest1 perConnectionBufferLimitBytes: 32768 type: EDS 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 6ca132c714..6d745e7f0f 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: mirror-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: mirror-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: mirror-route-dest1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: mirror-route-dest1 perConnectionBufferLimitBytes: 32768 type: EDS 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 5c4d68ac90..ed73a35d8c 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: valid-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: valid-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 2410099664..321ddd1382 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: redirect-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: redirect-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 058b9ac85b..5b004af4d7 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: regex-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: regex-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 b43604253d..e6439e1efd 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: request-header-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: request-header-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 4d2ccc10e6..b3bfed997a 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: response-header-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: response-header-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 4d2ccc10e6..b3bfed997a 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: response-header-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: response-header-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 4d2ccc10e6..b3bfed997a 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: response-header-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: response-header-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 ce7e7e5857..0f015847a1 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: rewrite-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: rewrite-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 ce7e7e5857..0f015847a1 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: rewrite-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: rewrite-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 171998c0b5..24923a6922 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: rewrite-route ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: rewrite-route perConnectionBufferLimitBytes: 32768 type: EDS 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 ce7e7e5857..0f015847a1 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: rewrite-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: rewrite-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 ce7e7e5857..0f015847a1 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: rewrite-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: rewrite-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 171998c0b5..24923a6922 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: rewrite-route ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: rewrite-route perConnectionBufferLimitBytes: 32768 type: EDS 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 058b9ac85b..5b004af4d7 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: regex-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: regex-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.clusters.yaml index 6d9c237e17..9948793483 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-stat-name.clusters.yaml @@ -2,8 +2,7 @@ circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -13,6 +12,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 b70cda2ec5..76a64be2b8 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -80,14 +107,21 @@ serviceName: fifth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fifth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -97,14 +131,21 @@ serviceName: sixth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: sixth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -114,6 +155,14 @@ serviceName: seventh-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: seventh-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 fdcc44c1d0..f4fa08ccbd 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest/backend/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest/backend/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest/backend/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest/backend/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: second-route-dest/backend/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest/backend/1 perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 8d1fa95bcc..a44be9ca14 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/envoy-gateway/httproute-btls/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/envoy-gateway/httproute-btls/rule/0 perConnectionBufferLimitBytes: 32768 transportSocketMatches: 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 a7db25103b..3e38076a25 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: @@ -28,8 +35,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -39,6 +45,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: 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 0ba4829c93..262b5dc0aa 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/envoy-gateway/httproute-btls/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/envoy-gateway/httproute-btls/rule/0 perConnectionBufferLimitBytes: 32768 transportSocketMatches: 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 3061088f3e..ade0a0307b 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/envoy-gateway/httproute-btls/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/envoy-gateway/httproute-btls/rule/0 perConnectionBufferLimitBytes: 32768 transportSocketMatches: @@ -59,8 +66,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -70,6 +76,14 @@ serviceName: httproute/envoy-gateway/httproute-btls-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/envoy-gateway/httproute-btls-2/rule/0 perConnectionBufferLimitBytes: 32768 transportSocket: 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 991b3dbbaa..2cbbec7340 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/envoy-gateway/httproute-btls/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/envoy-gateway/httproute-btls/rule/0 perConnectionBufferLimitBytes: 32768 transportSocketMatches: diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.clusters.yaml index 7494b14bce..d4c76edfbf 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-route-zonal-routing-weighted-clusters.clusters.yaml @@ -28,8 +28,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -39,6 +38,14 @@ serviceName: first-route-dest/backend/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest/backend/1 perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.clusters.yaml index c24d059eea..54ba5dfc91 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-spdy.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.clusters.yaml index c24d059eea..54ba5dfc91 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http-upgrade-websocket-spdy.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 d9d1f8189a..6db88ff1e3 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS @@ -28,8 +35,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -39,6 +45,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 0bb16c7f4d..eb727a12ae 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 389a66ffb3..4ea80a1fba 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http10.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.clusters.yaml index d12f63b498..92313ce2eb 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http2-mixed.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2-mixed.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest/backend/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest/backend/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: first-route-dest/backend/1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest/backend/1 perConnectionBufferLimitBytes: 32768 type: EDS 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 5db664bf32..ed267e2009 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS @@ -27,8 +34,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -38,6 +44,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS @@ -51,8 +65,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -62,6 +75,14 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS @@ -78,8 +99,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -89,6 +109,14 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 100755 --- a/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http2.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 c24d059eea..54ba5dfc91 100644 --- a/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/http3.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 20e66b9276..2771f41ffa 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 cfa4f05980..158c212fbe 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jsonpatch.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 f38c078afa..4859433598 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: localhost_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: localhost_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 d040fc20a4..77eb6e9258 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-www.test.com-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-www.test.com-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-www.test.com-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-www.test.com-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -54,6 +67,14 @@ loadBalancingWeight: 1 locality: region: localhost_80/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: localhost_80 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -61,8 +82,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -72,6 +92,14 @@ serviceName: "192_168_1_250_8080" ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: "192_168_1_250_8080" perConnectionBufferLimitBytes: 32768 transportSocket: 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 02eba4b6fc..cb66d7b6c8 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -54,6 +67,14 @@ loadBalancingWeight: 1 locality: region: localhost_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: localhost_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 f38c078afa..4859433598 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: localhost_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: localhost_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 281cd662bf..211a80c57b 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,6 +83,14 @@ serviceName: "192_168_1_250_443" ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: "192_168_1_250_443" perConnectionBufferLimitBytes: 32768 transportSocket: @@ -78,8 +106,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -97,6 +124,14 @@ loadBalancingWeight: 1 locality: region: ratelimit_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: ratelimit_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 f38c078afa..4859433598 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: localhost_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: localhost_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.clusters.yaml index edc7120e86..c9eef8f751 100644 --- a/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/jwt-with-backend-tls-retry.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -41,6 +47,14 @@ loadBalancingWeight: 1 locality: region: securitypolicy/default/policy-for-route/jwt/0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-route/jwt/0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 d4e79e5ab0..cc9716d043 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: tls-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,6 +83,14 @@ serviceName: tcp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.clusters.yaml index db79f67a89..f04949b663 100644 --- a/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/listener-overlapping-tls-config.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: httproute/envoy-gateway/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/envoy-gateway/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 fd2f544028..3f3cd10696 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: tls-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 d4e79e5ab0..cc9716d043 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: tls-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,6 +83,14 @@ serviceName: tcp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 449ed38b57..5edf1ebaf2 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -11,14 +10,21 @@ resourceApiVersion: V3 serviceName: first-route-dest ignoreHealthOnHostRemoval: true + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.round_robin + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.round_robin.v3.RoundRobin + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -28,14 +34,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: RANDOM + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.random + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.random.v3.Random + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -45,14 +58,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -62,14 +82,19 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: MAGLEV + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.maglev + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.maglev.v3.Maglev name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -79,17 +104,23 @@ serviceName: fifth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST - leastRequestLbConfig: - slowStartConfig: - slowStartWindow: 60s + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} + slowStartConfig: + slowStartWindow: 60s name: fifth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -98,17 +129,23 @@ resourceApiVersion: V3 serviceName: sixth-route-dest ignoreHealthOnHostRemoval: true + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.round_robin + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.round_robin.v3.RoundRobin + localityLbConfig: + localityWeightedLbConfig: {} + slowStartConfig: + slowStartWindow: 300s name: sixth-route-dest perConnectionBufferLimitBytes: 32768 - roundRobinLbConfig: - slowStartConfig: - slowStartWindow: 300s type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -118,14 +155,19 @@ serviceName: seventh-route-dest ignoreHealthOnHostRemoval: true lbPolicy: MAGLEV + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.maglev + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.maglev.v3.Maglev name: seventh-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -135,16 +177,20 @@ serviceName: eighth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: MAGLEV - maglevLbConfig: - tableSize: "524287" + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.maglev + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.maglev.v3.Maglev + tableSize: "524287" name: eighth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -154,14 +200,19 @@ serviceName: ninth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: MAGLEV + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.maglev + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.maglev.v3.Maglev name: ninth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -171,6 +222,12 @@ serviceName: tenth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: MAGLEV + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.maglev + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.maglev.v3.Maglev name: tenth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.clusters.yaml index ba595752d9..7e9eb80719 100644 --- a/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/local-ratelimit-distinct.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 121c8aad8b..c4f69acb98 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/lua.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/lua.clusters.yaml index ba27dfd9d2..2d4772df3e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/lua.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/lua.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.clusters.yaml index 114c76febe..5aa2ff1b9d 100644 --- a/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/max-conn-per-socket-event.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: max-accept-disabled ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: max-accept-disabled perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,6 +59,14 @@ serviceName: max-accept-default ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: max-accept-default perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 ba71fb5f54..013d8e8a18 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: securitypolicy/default/policy-for-http-route-2/envoy-gateway/http-backend ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/default/policy-for-http-route-2/envoy-gateway/http-backend perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: httproute/default/httproute-3/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-3/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -88,6 +115,14 @@ loadBalancingWeight: 1 locality: region: oauth_foo_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: oauth_foo_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 cbe74c802d..a9dd222a8f 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -80,14 +107,21 @@ serviceName: tcp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -97,6 +131,14 @@ serviceName: tls-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 f10d60e34b..2c11516b98 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: tcp-route-simple-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-simple-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: tcp-route-simple-1-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-simple-1-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: tcp-route-simple-2-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-simple-2-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: tcp-route-simple-3-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-simple-3-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -80,6 +107,14 @@ serviceName: tcp-route-simple-4-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-simple-4-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 cc411266ad..e60461edd8 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -80,6 +107,14 @@ serviceName: fifth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fifth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 cc411266ad..e60461edd8 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -80,6 +107,14 @@ serviceName: fifth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fifth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 4521d562ef..e12c8c4e4f 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: tls-terminate-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-terminate-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.clusters.yaml index 4521d562ef..e12c8c4e4f 100644 --- a/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/mutual-tls-san.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: tls-terminate-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-terminate-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 4521d562ef..e12c8c4e4f 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: tls-terminate-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-terminate-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.clusters.yaml index 19ed98a02b..25b85801bd 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc-and-jwt-with-passthrough.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: oauth_foo_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: oauth_foo_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 0649bcbf62..c19c1eefd7 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -41,6 +47,14 @@ loadBalancingWeight: 1 locality: region: securitypolicy/envoy-gateway/policy-for-gateway/0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: securitypolicy/envoy-gateway/policy-for-gateway/0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 4b87b10260..80eff9c9e6 100644 --- a/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/oidc.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -54,6 +67,14 @@ loadBalancingWeight: 1 locality: region: oauth_foo_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: oauth_foo_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true @@ -70,8 +91,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -89,6 +109,14 @@ loadBalancingWeight: 1 locality: region: oauth_bar_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: oauth_bar_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true diff --git a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.clusters.yaml index 6c478efffd..32815467ed 100644 --- a/internal/xds/translator/testdata/out/xds-ir/panic-threshold.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/panic-threshold.clusters.yaml @@ -4,7 +4,6 @@ commonLbConfig: healthyPanicThreshold: value: 66 - localityWeightedLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -14,6 +13,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS @@ -23,7 +30,6 @@ commonLbConfig: healthyPanicThreshold: value: 80 - localityWeightedLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -33,6 +39,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS @@ -42,7 +56,6 @@ commonLbConfig: healthyPanicThreshold: value: 20 - localityWeightedLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -52,14 +65,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -69,6 +89,14 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS @@ -78,7 +106,6 @@ commonLbConfig: healthyPanicThreshold: value: 80 - localityWeightedLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -88,6 +115,14 @@ serviceName: fifth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fifth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 2ca45156f1..6c9e3d4119 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 transportSocket: 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 64f2811448..dd43b80611 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -71,6 +91,14 @@ loadBalancingWeight: 1 locality: region: ratelimit_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: ratelimit_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 cc53cfb4b4..ed9d549f4f 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -71,6 +91,14 @@ loadBalancingWeight: 1 locality: region: ratelimit_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: ratelimit_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 6fc0376cbf..011ffcc128 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -20,8 +27,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -31,6 +37,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -39,8 +53,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -50,6 +63,14 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -58,8 +79,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -77,6 +97,14 @@ loadBalancingWeight: 1 locality: region: ratelimit_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: ratelimit_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.clusters.yaml index eda9440ea0..b0060aa2f1 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-global-shared.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -20,8 +27,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -31,6 +37,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -39,8 +53,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -50,6 +63,14 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -58,8 +79,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -69,6 +89,14 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -77,8 +105,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -96,6 +123,14 @@ loadBalancingWeight: 1 locality: region: ratelimit_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: ratelimit_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 cc53cfb4b4..ed9d549f4f 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -71,6 +91,14 @@ loadBalancingWeight: 1 locality: region: ratelimit_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: ratelimit_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.clusters.yaml index 6fc0376cbf..011ffcc128 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit-multi-global-shared.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -20,8 +27,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -31,6 +37,14 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -39,8 +53,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -50,6 +63,14 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -58,8 +79,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -77,6 +97,14 @@ loadBalancingWeight: 1 locality: region: ratelimit_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: ratelimit_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 c8ebe9beb6..fa050dc3dc 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -88,6 +115,14 @@ loadBalancingWeight: 1 locality: region: ratelimit_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: ratelimit_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 c8ebe9beb6..fa050dc3dc 100644 --- a/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/ratelimit.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: second-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: second-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -46,14 +59,21 @@ serviceName: third-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: third-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -63,14 +83,21 @@ serviceName: fourth-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: fourth-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -88,6 +115,14 @@ loadBalancingWeight: 1 locality: region: ratelimit_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: ratelimit_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true diff --git a/internal/xds/translator/testdata/out/xds-ir/request-buffer.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/request-buffer.clusters.yaml index ba27dfd9d2..2d4772df3e 100644 --- a/internal/xds/translator/testdata/out/xds-ir/request-buffer.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/request-buffer.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/retry.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/retry.clusters.yaml index 06e9a8da52..054f90bb71 100644 --- a/internal/xds/translator/testdata/out/xds-ir/retry.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/retry.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 50f739b77e..a1a64c0f74 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: oidc_example_com_443/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: oidc_example_com_443 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 06e9a8da52..054f90bb71 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 21044f7735..6a637e63f9 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: tcp-route-simple-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-simple-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: 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 809de35dd5..f0255021dd 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: tcp-route-dual-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-dual-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 fc444f5c83..c37470a8bf 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: tcp-route-simple-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-simple-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: 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 e0827c7446..ca6f7b0ad3 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: tcp-route-complex-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-complex-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 c6f3d6e609..b66d2ea80c 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: tcp-route-simple-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-simple-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 4532429003..9417e0320a 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: tls-terminate-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-terminate-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: tls-terminate-hostname-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-terminate-hostname-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 d449d82d3f..8e9a7aed17 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: tcp-route-weighted-backend-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tcp-route-weighted-backend-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 17f4bb2b31..20237eab2c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/timeout.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 31s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 08ab482392..958ad3a8e8 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: tls-passthrough-foo-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-passthrough-foo-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: tls-passthrough-bar-dest/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-passthrough-bar-dest perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 4521d562ef..e12c8c4e4f 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: tls-terminate-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tls-terminate-dest perConnectionBufferLimitBytes: 32768 type: EDS diff --git a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.clusters.yaml index 46b6091ff5..d1ea7fcfa5 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing-datadog-uds.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,6 +35,14 @@ serviceName: tracing-0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tracing-0 perConnectionBufferLimitBytes: 32768 type: EDS 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 7d65a07f07..3ddd17bebc 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: tracing-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tracing-0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 69549cacd2..59a7aa268c 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: @@ -20,8 +27,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -39,6 +45,14 @@ loadBalancingWeight: 1 locality: region: tracing-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tracing-0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 222bb2c6c9..1484ac87e4 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -37,6 +43,14 @@ loadBalancingWeight: 1 locality: region: tracing-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tracing-0 perConnectionBufferLimitBytes: 32768 respectDnsTtl: true 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 58b42a23c8..8f91a2e62c 100644 --- a/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/tracing.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: direct-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: direct-route-dest perConnectionBufferLimitBytes: 32768 type: EDS @@ -19,8 +26,7 @@ thresholds: - maxConnections: 2048 maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 15s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -38,6 +44,14 @@ loadBalancingWeight: 1 locality: region: tracing-0/backend/0 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: tracing-0 outlierDetection: baseEjectionTime: 30s 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 15499f284e..cea7e3b77c 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: udp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: udp-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: 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 2dd1f52284..c5e09a5fd6 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: udp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: udp-route-dest perConnectionBufferLimitBytes: 32768 trackClusterStats: diff --git a/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.clusters.yaml index 62b5062e7d..a08a256b86 100644 --- a/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/udp-route-no-endpoints.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: udproute/default/udproute-1/rule/-1 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} metadata: filterMetadata: envoy-gateway: 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 0a15318666..01a573e635 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: udp-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: udp-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 1b1ee8d57b..32a3651cf8 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 @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,6 +11,14 @@ serviceName: first-route-dest ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: first-route-dest perConnectionBufferLimitBytes: 32768 type: EDS 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 013fb88341..88e3c014f0 100755 --- a/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml +++ b/internal/xds/translator/testdata/out/xds-ir/wasm.clusters.yaml @@ -1,8 +1,7 @@ - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -12,14 +11,21 @@ serviceName: httproute/default/httproute-1/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-1/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED edsClusterConfig: @@ -29,14 +35,21 @@ serviceName: httproute/default/httproute-2/rule/0 ignoreHealthOnHostRemoval: true lbPolicy: LEAST_REQUEST + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: httproute/default/httproute-2/rule/0 perConnectionBufferLimitBytes: 32768 type: EDS - circuitBreakers: thresholds: - maxRetries: 1024 - commonLbConfig: - localityWeightedLbConfig: {} + commonLbConfig: {} connectTimeout: 10s dnsLookupFamily: V4_PREFERRED dnsRefreshRate: 30s @@ -54,6 +67,14 @@ loadBalancingWeight: 1 locality: region: wasm_cluster/backend/-1 + loadBalancingPolicy: + policies: + - typedExtensionConfig: + name: envoy.load_balancing_policies.least_request + typedConfig: + '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest + localityLbConfig: + localityWeightedLbConfig: {} name: wasm_cluster perConnectionBufferLimitBytes: 32768 respectDnsTtl: true