add e2e tests, remove route validator

Author: zac-nixon

main.go

@@ -278,7 +278,7 @@ func main() {
 		enabledControllers := sets.Set[string]{}
 
 		routeLoaderCreator := sync.OnceValue(func() routeutils.Loader {
-			return routeutils.NewLoader(mgr.GetClient(), routeReconciler, routeutils.NewRouteValidator(), mgr.GetLogger().WithName("gateway-route-loader"))
+			return routeutils.NewLoader(mgr.GetClient(), routeReconciler, mgr.GetLogger().WithName("gateway-route-loader"))
 		})
 
 		// Setup NLB Gateway controller if enabled

pkg/gateway/routeutils/loader.go

@@ -65,17 +65,15 @@ type loaderImpl struct {
 	routeSubmitter  RouteReconcilerSubmitter
 	k8sClient       client.Client
 	logger          logr.Logger
-	routeValidator  RouteValidator
 	allRouteLoaders map[RouteKind]func(context context.Context, client client.Client, opts ...client.ListOption) ([]preLoadRouteDescriptor, error)
 }
 
-func NewLoader(k8sClient client.Client, routeSubmitter RouteReconcilerSubmitter, routeValidator RouteValidator, logger logr.Logger) Loader {
+func NewLoader(k8sClient client.Client, routeSubmitter RouteReconcilerSubmitter, logger logr.Logger) Loader {
 	return &loaderImpl{
 		mapper:          newListenerToRouteMapper(k8sClient, logger.WithName("route-mapper")),
 		routeSubmitter:  routeSubmitter,
 		k8sClient:       k8sClient,
 		allRouteLoaders: allRoutes,
-		routeValidator:  routeValidator,
 		logger:          logger,
 	}
 }
@@ -117,13 +115,9 @@ func (l *loaderImpl) LoadRoutesForGateway(ctx context.Context, gw gwv1.Gateway,
 	// 2. Validate listeners configuration and get listener status
 	listenerValidationResults := ValidateListeners(gw, controllerName, ctx, l.k8sClient)
 
-	// 3. Validate route configuration, filter out bad configurations.
-	validatedRoutes, validationErrors := l.routeValidator.filterToValidRoutes(gw, foo)
-	routeStatusUpdates = append(routeStatusUpdates, validationErrors...)
-
-	// 4. Remove routes that aren't granted attachment by the listener.
+	// 3. Remove routes that aren't granted attachment by the listener.
 	// Map any routes that are granted attachment to the listener port that allows the attachment.
-	mappedRoutes, statusUpdates, err := l.mapper.mapGatewayAndRoutes(ctx, gw, validatedRoutes)
+	mappedRoutes, statusUpdates, err := l.mapper.mapGatewayAndRoutes(ctx, gw, foo)
 
 	routeStatusUpdates = append(routeStatusUpdates, statusUpdates...)
 
@@ -134,7 +128,7 @@ func (l *loaderImpl) LoadRoutesForGateway(ctx context.Context, gw gwv1.Gateway,
 	// Count attached routes per listener for listener status update
 	attachedRouteMap := buildAttachedRouteMap(gw, mappedRoutes)
 
-	// 5. Load the underlying resource(s) for each route that is configured.
+	// 4. Load the underlying resource(s) for each route that is configured.
 	loadedRoute, childRouteLoadUpdates, err := l.loadChildResources(ctx, mappedRoutes, gw)
 	routeStatusUpdates = append(routeStatusUpdates, childRouteLoadUpdates...)
 	if err != nil {

pkg/gateway/routeutils/loader_test.go

@@ -299,7 +299,6 @@ func TestLoadRoutesForGateway(t *testing.T) {
 					mapToReturn:        tc.expectedPreloadMap,
 					routeStatusUpdates: tc.mapperRouteStatusUpdates,
 				},
-				routeValidator:  NewRouteValidator(),
 				allRouteLoaders: allRouteLoaders,
 				logger:          logr.Discard(),
 				routeSubmitter:  routeReconciler,