EndpointSlice to IR Route Destinations (#1494)

* EndpointSlice to IR Route Destinations Relates to #1256 Signed-off-by: Arko Dasgupta <[email protected]> * assign backend weight to locality weight add another level of indirection in RouteDestination called DestinationSetting Signed-off-by: Arko Dasgupta <[email protected]>
envoyproxy · Sep 26, 2023 · a785be8 · a785be8
1 parent c70144b
commit a785be8
Show file tree

Hide file tree

Showing 256 changed files with 2,006 additions and 1,165 deletions.
diff --git a/api/config/v1alpha1/validation/testdata/valid-user-bootstrap.yaml b/api/config/v1alpha1/validation/testdata/valid-user-bootstrap.yaml
@@ -36,8 +36,10 @@ staticResources:
     loadAssignment:
       clusterName: xds_cluster
       endpoints:
-      - lbEndpoints:
-        - endpoint:
+      - loadBalancingWeight: 1
+        lbEndpoints:
+        - loadBalancingWeight: 1
+          endpoint:
             address:
               socketAddress:
                 address: envoy-gateway

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
@@ -81,9 +81,11 @@
                                   "portValue": 18000
                                 }
                               }
-                            }
+                            },
+                            "loadBalancingWeight": 1
                           }
-                        ]
+                        ],
+                        "loadBalancingWeight": 1
                       }
                     ]
                   },
@@ -261,7 +263,8 @@
                                 "portValue": 443
                               }
                             }
-                          }
+                          },
+                          "loadBalancingWeight": 1
                         }
                       ],
                       "loadBalancingWeight": 1,

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
@@ -51,6 +51,8 @@ xds:
                       socketAddress:
                         address: envoy-gateway
                         portValue: 18000
+                  loadBalancingWeight: 1
+                loadBalancingWeight: 1
             name: xds_cluster
             transportSocket:
               name: envoy.transport_sockets.tls
@@ -153,6 +155,7 @@ xds:
                     socketAddress:
                       address: raw.githubusercontent.com
                       portValue: 443
+                loadBalancingWeight: 1
               loadBalancingWeight: 1
               locality: {}
           name: raw_githubusercontent_com_443

diff --git a/...al/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.bootstrap.yaml b/...al/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.bootstrap.yaml
@@ -50,6 +50,8 @@ xds:
                     socketAddress:
                       address: envoy-gateway
                       portValue: 18000
+                loadBalancingWeight: 1
+              loadBalancingWeight: 1
           name: xds_cluster
           transportSocket:
             name: envoy.transport_sockets.tls

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
@@ -35,6 +35,7 @@ xds:
                   socketAddress:
                     address: raw.githubusercontent.com
                     portValue: 443
+              loadBalancingWeight: 1
             loadBalancingWeight: 1
             locality: {}
         name: raw_githubusercontent_com_443

diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -64,8 +64,10 @@ envoyProxy:
             load_assignment:
               cluster_name: xds_cluster
               endpoints:
-              - lb_endpoints:
-                - endpoint:
+              - load_balancing_weight: 1
+                lb_endpoints:
+                - load_balancing_weight: 1
+                  endpoint:
                     address:
                       socket_address:
                         address: envoy-gateway
@@ -479,6 +481,8 @@ xds:
                       socketAddress:
                         address: envoy-gateway
                         portValue: 18000
+                  loadBalancingWeight: 1
+                loadBalancingWeight: 1
             name: xds_cluster
             transportSocket:
               name: envoy.transport_sockets.tls
@@ -582,6 +586,7 @@ xds:
                   socketAddress:
                     address: 127.0.0.1
                     portValue: 3000
+              loadBalancingWeight: 1
             loadBalancingWeight: 1
             locality: {}
       - endpointConfig:
@@ -594,6 +599,7 @@ xds:
                   socketAddress:
                     address: 127.0.0.1
                     portValue: 3000
+              loadBalancingWeight: 1
             loadBalancingWeight: 1
             locality: {}
     - '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump

diff --git a/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml b/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml
@@ -51,6 +51,8 @@ xds:
                       socketAddress:
                         address: envoy-gateway
                         portValue: 18000
+                  loadBalancingWeight: 1
+                loadBalancingWeight: 1
             name: xds_cluster
             transportSocket:
               name: envoy.transport_sockets.tls

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
@@ -81,9 +81,11 @@
                                   "portValue": 18000
                                 }
                               }
-                            }
+                            },
+                            "loadBalancingWeight": 1
                           }
-                        ]
+                        ],
+                        "loadBalancingWeight": 1
                       }
                     ]
                   },
@@ -276,7 +278,8 @@
                               "portValue": 3000
                             }
                           }
-                        }
+                        },
+                        "loadBalancingWeight": 1
                       }
                     ],
                     "loadBalancingWeight": 1,
@@ -300,7 +303,8 @@
                               "portValue": 3000
                             }
                           }
-                        }
+                        },
+                        "loadBalancingWeight": 1
                       }
                     ],
                     "loadBalancingWeight": 1,

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
@@ -51,6 +51,8 @@ xds:
                       socketAddress:
                         address: envoy-gateway
                         portValue: 18000
+                  loadBalancingWeight: 1
+                loadBalancingWeight: 1
             name: xds_cluster
             transportSocket:
               name: envoy.transport_sockets.tls
@@ -154,6 +156,7 @@ xds:
                   socketAddress:
                     address: 1.1.1.1
                     portValue: 3000
+              loadBalancingWeight: 1
             loadBalancingWeight: 1
             locality: {}
       - endpointConfig:
@@ -166,6 +169,7 @@ xds:
                   socketAddress:
                     address: 1.1.1.1
                     portValue: 3000
+              loadBalancingWeight: 1
             loadBalancingWeight: 1
             locality: {}
     - '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml
@@ -50,6 +50,8 @@ xds:
                     socketAddress:
                       address: envoy-gateway
                       portValue: 18000
+                loadBalancingWeight: 1
+              loadBalancingWeight: 1
           name: xds_cluster
           transportSocket:
             name: envoy.transport_sockets.tls

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml
@@ -51,6 +51,7 @@ xds:
                 socketAddress:
                   address: 1.1.1.1
                   portValue: 3000
+            loadBalancingWeight: 1
           loadBalancingWeight: 1
           locality: {}
     - endpointConfig:
@@ -63,5 +64,6 @@ xds:
                 socketAddress:
                   address: 1.1.1.1
                   portValue: 3000
+            loadBalancingWeight: 1
           loadBalancingWeight: 1
           locality: {}
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
@@ -81,9 +81,11 @@
                                   "portValue": 18000
                                 }
                               }
-                            }
+                            },
+                            "loadBalancingWeight": 1
                           }
-                        ]
+                        ],
+                        "loadBalancingWeight": 1
                       }
                     ]
                   },
@@ -261,7 +263,8 @@
                                 "portValue": 8081
                               }
                             }
-                          }
+                          },
+                          "loadBalancingWeight": 1
                         }
                       ],
                       "loadBalancingWeight": 1,

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
@@ -51,6 +51,8 @@ xds:
                       socketAddress:
                         address: envoy-gateway
                         portValue: 18000
+                  loadBalancingWeight: 1
+                loadBalancingWeight: 1
             name: xds_cluster
             transportSocket:
               name: envoy.transport_sockets.tls
@@ -153,6 +155,7 @@ xds:
                     socketAddress:
                       address: envoy-ratelimit.envoy-gateway.svc.cluster.local
                       portValue: 8081
+                loadBalancingWeight: 1
               loadBalancingWeight: 1
               locality: {}
           name: ratelimit_cluster

diff --git a/.../testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.bootstrap.yaml b/.../testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.bootstrap.yaml
@@ -50,6 +50,8 @@ xds:
                     socketAddress:
                       address: envoy-gateway
                       portValue: 18000
+                loadBalancingWeight: 1
+              loadBalancingWeight: 1
           name: xds_cluster
           transportSocket:
             name: envoy.transport_sockets.tls

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
@@ -35,6 +35,7 @@ xds:
                   socketAddress:
                     address: envoy-ratelimit.envoy-gateway.svc.cluster.local
                     portValue: 8081
+              loadBalancingWeight: 1
             loadBalancingWeight: 1
             locality: {}
         name: ratelimit_cluster

diff --git a/internal/cmd/egctl/translate.go b/internal/cmd/egctl/translate.go
@@ -262,9 +262,10 @@ func translateGatewayAPIToGatewayAPI(resources *gatewayapi.Resources) (gatewayap
 
 	// Translate from Gateway API to Xds IR
 	gTranslator := &gatewayapi.Translator{
-		GatewayControllerName:  egv1alpha1.GatewayControllerName,
-		GatewayClassName:       v1beta1.ObjectName(resources.GatewayClass.Name),
-		GlobalRateLimitEnabled: true,
+		GatewayControllerName:   egv1alpha1.GatewayControllerName,
+		GatewayClassName:        v1beta1.ObjectName(resources.GatewayClass.Name),
+		GlobalRateLimitEnabled:  true,
+		EndpointRoutingDisabled: true,
 	}
 	gRes := gTranslator.Translate(resources)
 	// Update the status of the GatewayClass based on EnvoyProxy validation
@@ -292,9 +293,10 @@ func translateGatewayAPIToXds(dnsDomain string, resourceType string, resources *
 
 	// Translate from Gateway API to Xds IR
 	gTranslator := &gatewayapi.Translator{
-		GatewayControllerName:  egv1alpha1.GatewayControllerName,
-		GatewayClassName:       v1beta1.ObjectName(resources.GatewayClass.Name),
-		GlobalRateLimitEnabled: true,
+		GatewayControllerName:   egv1alpha1.GatewayControllerName,
+		GatewayClassName:        v1beta1.ObjectName(resources.GatewayClass.Name),
+		GlobalRateLimitEnabled:  true,
+		EndpointRoutingDisabled: true,
 	}
 	gRes := gTranslator.Translate(resources)
 

diff --git a/internal/gatewayapi/filters.go b/internal/gatewayapi/filters.go
@@ -833,11 +833,11 @@ func (t *Translator) processRequestMirrorFilter(
 		return
 	}
 
-	mirrorEndpoints, _ := t.processDestEndpoints(mirrorBackendRef, filterContext.ParentRef, filterContext.Route, resources)
+	ds, _ := t.processDestination(mirrorBackendRef, filterContext.ParentRef, filterContext.Route, resources)
 
 	newMirror := &ir.RouteDestination{
-		Name:      fmt.Sprintf("%s-mirror-%d", irRouteDestinationName(filterContext.Route, filterContext.RuleIdx), filterIdx),
-		Endpoints: mirrorEndpoints,
+		Name:     fmt.Sprintf("%s-mirror-%d", irRouteDestinationName(filterContext.Route, filterContext.RuleIdx), filterIdx),
+		Settings: []*ir.DestinationSetting{ds},
 	}
 	filterContext.Mirrors = append(filterContext.Mirrors, newMirror)
 }

diff --git a/internal/gatewayapi/helpers.go b/internal/gatewayapi/helpers.go
@@ -57,18 +57,6 @@ func SectionNamePtr(name string) *v1beta1.SectionName {
 	return &sectionName
 }
 
-func TLSModeTypePtr(mode v1beta1.TLSModeType) *v1beta1.TLSModeType {
-	return &mode
-}
-
-func StringPtr(val string) *string {
-	return &val
-}
-
-func Int32Ptr(val int32) *int32 {
-	return &val
-}
-
 func PortNumPtr(val int32) *v1beta1.PortNumber {
 	portNum := v1beta1.PortNumber(val)
 	return &portNum
@@ -79,14 +67,6 @@ func ObjectNamePtr(val string) *v1alpha2.ObjectName {
 	return &objectName
 }
 
-func PathMatchTypePtr(pType v1beta1.PathMatchType) *v1beta1.PathMatchType {
-	return &pType
-}
-
-func GatewayAddressTypePtr(addr v1beta1.AddressType) *v1beta1.AddressType {
-	return &addr
-}
-
 func PathMatchTypeDerefOr(matchType *v1beta1.PathMatchType, defaultType v1beta1.PathMatchType) v1beta1.PathMatchType {
 	if matchType != nil {
 		return *matchType

diff --git a/internal/gatewayapi/resource.go b/internal/gatewayapi/resource.go
@@ -104,3 +104,14 @@ func (r *Resources) GetSecret(namespace, name string) *v1.Secret {
 
 	return nil
 }
+
+func (r *Resources) GetEndpointSlicesForService(svcNamespace, svcName string) []*discoveryv1.EndpointSlice {
+	endpointSlices := []*discoveryv1.EndpointSlice{}
+	for _, endpointSlice := range r.EndpointSlices {
+		if svcNamespace == endpointSlice.Namespace &&
+			endpointSlice.GetLabels()[discoveryv1.LabelServiceName] == svcName {
+			endpointSlices = append(endpointSlices, endpointSlice)
+		}
+	}
+	return endpointSlices
+}