Default LB Policy to Least Request

https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/load_balancing/load_balancers#weighted-least-request Relates to envoyproxy#1105 Relevant now that we are introducing multiple endpoints with envoyproxy#1494 Signed-off-by: Arko Dasgupta <arko@tetrate.io>
arkodg · Sep 19, 2023 · b8bdf77 · b8bdf77
1 parent b98c1d1
commit b8bdf77
Show file tree

Hide file tree

Showing 55 changed files with 117 additions and 1 deletion.
diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json
@@ -231,6 +231,7 @@
                   },
                   "serviceName": "httproute/envoy-gateway-system/backend/rule/0"
                 },
+                "lbPolicy": "LEAST_REQUEST",
                 "name": "httproute/envoy-gateway-system/backend/rule/0",
                 "outlierDetection": {},
                 "perConnectionBufferLimitBytes": 32768,
@@ -246,6 +247,7 @@
                 "connectTimeout": "10s",
                 "dnsLookupFamily": "V4_ONLY",
                 "dnsRefreshRate": "30s",
+                "lbPolicy": "LEAST_REQUEST",
                 "loadAssignment": {
                   "clusterName": "raw_githubusercontent_com_443",
                   "endpoints": [

diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml
@@ -131,6 +131,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: httproute/envoy-gateway-system/backend/rule/0
+          lbPolicy: LEAST_REQUEST
           name: httproute/envoy-gateway-system/backend/rule/0
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -142,6 +143,7 @@ xds:
           connectTimeout: 10s
           dnsLookupFamily: V4_ONLY
           dnsRefreshRate: 30s
+          lbPolicy: LEAST_REQUEST
           loadAssignment:
             clusterName: raw_githubusercontent_com_443
             endpoints:

diff --git a/...rnal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.cluster.yaml b/...rnal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.cluster.yaml
@@ -13,6 +13,7 @@ xds:
             ads: {}
             resourceApiVersion: V3
           serviceName: httproute/envoy-gateway-system/backend/rule/0
+        lbPolicy: LEAST_REQUEST
         name: httproute/envoy-gateway-system/backend/rule/0
         outlierDetection: {}
         perConnectionBufferLimitBytes: 32768
@@ -24,6 +25,7 @@ xds:
         connectTimeout: 10s
         dnsLookupFamily: V4_ONLY
         dnsRefreshRate: 30s
+        lbPolicy: LEAST_REQUEST
         loadAssignment:
           clusterName: raw_githubusercontent_com_443
           endpoints:

diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -609,6 +609,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: httproute/default/backend/rule/0
+          lbPolicy: LEAST_REQUEST
           name: httproute/default/backend/rule/0
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -624,6 +625,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: grpcroute/default/backend/rule/0
+          lbPolicy: LEAST_REQUEST
           name: grpcroute/default/backend/rule/0
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -644,6 +646,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: tlsroute/default/backend/rule/-1
+          lbPolicy: LEAST_REQUEST
           name: tlsroute/default/backend/rule/-1
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -659,6 +662,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: tcproute/default/backend/rule/-1
+          lbPolicy: LEAST_REQUEST
           name: tcproute/default/backend/rule/-1
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -674,6 +678,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: udproute/default/backend/rule/-1
+          lbPolicy: LEAST_REQUEST
           name: udproute/default/backend/rule/-1
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768

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
@@ -96,6 +96,7 @@ xds:
             ads: {}
             resourceApiVersion: V3
           serviceName: httproute/envoy-gateway-system/backend/rule/0
+        lbPolicy: LEAST_REQUEST
         name: httproute/envoy-gateway-system/backend/rule/0
         outlierDetection: {}
         perConnectionBufferLimitBytes: 32768

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
@@ -329,6 +329,7 @@
                   },
                   "serviceName": "httproute/default/backend/rule/0"
                 },
+                "lbPolicy": "LEAST_REQUEST",
                 "name": "httproute/default/backend/rule/0",
                 "outlierDetection": {},
                 "perConnectionBufferLimitBytes": 32768,
@@ -350,6 +351,7 @@
                   },
                   "serviceName": "grpcroute/default/backend/rule/0"
                 },
+                "lbPolicy": "LEAST_REQUEST",
                 "name": "grpcroute/default/backend/rule/0",
                 "outlierDetection": {},
                 "perConnectionBufferLimitBytes": 32768,
@@ -379,6 +381,7 @@
                   },
                   "serviceName": "tlsroute/default/backend/rule/-1"
                 },
+                "lbPolicy": "LEAST_REQUEST",
                 "name": "tlsroute/default/backend/rule/-1",
                 "outlierDetection": {},
                 "perConnectionBufferLimitBytes": 32768,
@@ -400,6 +403,7 @@
                   },
                   "serviceName": "tcproute/default/backend/rule/-1"
                 },
+                "lbPolicy": "LEAST_REQUEST",
                 "name": "tcproute/default/backend/rule/-1",
                 "outlierDetection": {},
                 "perConnectionBufferLimitBytes": 32768,
@@ -421,6 +425,7 @@
                   },
                   "serviceName": "udproute/default/backend/rule/-1"
                 },
+                "lbPolicy": "LEAST_REQUEST",
                 "name": "udproute/default/backend/rule/-1",
                 "outlierDetection": {},
                 "perConnectionBufferLimitBytes": 32768,

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
@@ -181,6 +181,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: httproute/default/backend/rule/0
+          lbPolicy: LEAST_REQUEST
           name: httproute/default/backend/rule/0
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -196,6 +197,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: grpcroute/default/backend/rule/0
+          lbPolicy: LEAST_REQUEST
           name: grpcroute/default/backend/rule/0
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -216,6 +218,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: tlsroute/default/backend/rule/-1
+          lbPolicy: LEAST_REQUEST
           name: tlsroute/default/backend/rule/-1
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -231,6 +234,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: tcproute/default/backend/rule/-1
+          lbPolicy: LEAST_REQUEST
           name: tcproute/default/backend/rule/-1
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -246,6 +250,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: udproute/default/backend/rule/-1
+          lbPolicy: LEAST_REQUEST
           name: udproute/default/backend/rule/-1
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768

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
@@ -13,6 +13,7 @@ xds:
             ads: {}
             resourceApiVersion: V3
           serviceName: httproute/default/backend/rule/0
+        lbPolicy: LEAST_REQUEST
         name: httproute/default/backend/rule/0
         outlierDetection: {}
         perConnectionBufferLimitBytes: 32768
@@ -28,6 +29,7 @@ xds:
             ads: {}
             resourceApiVersion: V3
           serviceName: grpcroute/default/backend/rule/0
+        lbPolicy: LEAST_REQUEST
         name: grpcroute/default/backend/rule/0
         outlierDetection: {}
         perConnectionBufferLimitBytes: 32768
@@ -48,6 +50,7 @@ xds:
             ads: {}
             resourceApiVersion: V3
           serviceName: tlsroute/default/backend/rule/-1
+        lbPolicy: LEAST_REQUEST
         name: tlsroute/default/backend/rule/-1
         outlierDetection: {}
         perConnectionBufferLimitBytes: 32768
@@ -63,6 +66,7 @@ xds:
             ads: {}
             resourceApiVersion: V3
           serviceName: tcproute/default/backend/rule/-1
+        lbPolicy: LEAST_REQUEST
         name: tcproute/default/backend/rule/-1
         outlierDetection: {}
         perConnectionBufferLimitBytes: 32768
@@ -78,6 +82,7 @@ xds:
             ads: {}
             resourceApiVersion: V3
           serviceName: udproute/default/backend/rule/-1
+        lbPolicy: LEAST_REQUEST
         name: udproute/default/backend/rule/-1
         outlierDetection: {}
         perConnectionBufferLimitBytes: 32768

diff --git a/.../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.json b/.../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.json
@@ -231,6 +231,7 @@
                   },
                   "serviceName": "httproute/envoy-gateway-system/http-ratelimit/rule/0"
                 },
+                "lbPolicy": "LEAST_REQUEST",
                 "name": "httproute/envoy-gateway-system/http-ratelimit/rule/0",
                 "outlierDetection": {},
                 "perConnectionBufferLimitBytes": 32768,
@@ -246,6 +247,7 @@
                 "connectTimeout": "10s",
                 "dnsLookupFamily": "V4_ONLY",
                 "dnsRefreshRate": "30s",
+                "lbPolicy": "LEAST_REQUEST",
                 "loadAssignment": {
                   "clusterName": "ratelimit_cluster",
                   "endpoints": [

diff --git a/.../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.yaml b/.../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.yaml
@@ -131,6 +131,7 @@ xds:
               ads: {}
               resourceApiVersion: V3
             serviceName: httproute/envoy-gateway-system/http-ratelimit/rule/0
+          lbPolicy: LEAST_REQUEST
           name: httproute/envoy-gateway-system/http-ratelimit/rule/0
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
@@ -142,6 +143,7 @@ xds:
           connectTimeout: 10s
           dnsLookupFamily: V4_ONLY
           dnsRefreshRate: 30s
+          lbPolicy: LEAST_REQUEST
           loadAssignment:
             clusterName: ratelimit_cluster
             endpoints:

diff --git a/...tl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.cluster.yaml b/...tl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.cluster.yaml
@@ -13,6 +13,7 @@ xds:
             ads: {}
             resourceApiVersion: V3
           serviceName: httproute/envoy-gateway-system/http-ratelimit/rule/0
+        lbPolicy: LEAST_REQUEST
         name: httproute/envoy-gateway-system/http-ratelimit/rule/0
         outlierDetection: {}
         perConnectionBufferLimitBytes: 32768
@@ -24,6 +25,7 @@ xds:
         connectTimeout: 10s
         dnsLookupFamily: V4_ONLY
         dnsRefreshRate: 30s
+        lbPolicy: LEAST_REQUEST
         loadAssignment:
           clusterName: ratelimit_cluster
           endpoints:

diff --git a/internal/xds/translator/cluster.go b/internal/xds/translator/cluster.go
@@ -31,7 +31,7 @@ func buildXdsCluster(clusterName string, tSocket *corev3.TransportSocket, protoc
 	cluster := &clusterv3.Cluster{
 		Name:            clusterName,
 		ConnectTimeout:  durationpb.New(10 * time.Second),
-		LbPolicy:        clusterv3.Cluster_ROUND_ROBIN,
+		LbPolicy:        clusterv3.Cluster_LEAST_REQUEST,
 		DnsLookupFamily: clusterv3.Cluster_V4_ONLY,
 		CommonLbConfig: &clusterv3.Cluster_CommonLbConfig{
 			LocalityConfigSpecifier: &clusterv3.Cluster_CommonLbConfig_LocalityWeightedLbConfig_{

diff --git a/...al/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml b/...al/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml
@@ -7,6 +7,7 @@
       ads: {}
       resourceApiVersion: V3
     serviceName: first-route-dest
+  lbPolicy: LEAST_REQUEST
   name: first-route-dest
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768

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
@@ -7,6 +7,7 @@
       ads: {}
       resourceApiVersion: V3
     serviceName: first-route-dest
+  lbPolicy: LEAST_REQUEST
   name: first-route-dest
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768

diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.clusters.yaml
@@ -7,6 +7,7 @@
       ads: {}
       resourceApiVersion: V3
     serviceName: direct-route-dest
+  lbPolicy: LEAST_REQUEST
   name: direct-route-dest
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768
@@ -16,6 +17,7 @@
   connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
+  lbPolicy: LEAST_REQUEST
   loadAssignment:
     clusterName: accesslog|otel-collector.default.svc.cluster.local|4317
     endpoints:

diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-multi-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-multi-provider.clusters.yaml
@@ -7,6 +7,7 @@
       ads: {}
       resourceApiVersion: V3
     serviceName: first-route-www.test.com-dest
+  lbPolicy: LEAST_REQUEST
   name: first-route-www.test.com-dest
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768
@@ -20,6 +21,7 @@
       ads: {}
       resourceApiVersion: V3
     serviceName: second-route-www.test.com-dest
+  lbPolicy: LEAST_REQUEST
   name: second-route-www.test.com-dest
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768
@@ -29,6 +31,7 @@
   connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
+  lbPolicy: LEAST_REQUEST
   loadAssignment:
     clusterName: localhost_443
     endpoints:
@@ -62,6 +65,7 @@
       ads: {}
       resourceApiVersion: V3
     serviceName: "192_168_1_250_8080"
+  lbPolicy: LEAST_REQUEST
   name: "192_168_1_250_8080"
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768

diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-single-provider.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-single-provider.clusters.yaml
@@ -7,6 +7,7 @@
       ads: {}
       resourceApiVersion: V3
     serviceName: first-route-dest
+  lbPolicy: LEAST_REQUEST
   name: first-route-dest
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768
@@ -20,6 +21,7 @@
       ads: {}
       resourceApiVersion: V3
     serviceName: second-route-dest
+  lbPolicy: LEAST_REQUEST
   name: second-route-dest
   outlierDetection: {}
   perConnectionBufferLimitBytes: 32768
@@ -29,6 +31,7 @@
   connectTimeout: 10s
   dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
+  lbPolicy: LEAST_REQUEST
   loadAssignment:
     clusterName: localhost_443
     endpoints: