diff --git a/internal/dag/gatewayapi_processor.go b/internal/dag/gatewayapi_processor.go index bdbe3d5ab4e..f5d71fd9eb4 100644 --- a/internal/dag/gatewayapi_processor.go +++ b/internal/dag/gatewayapi_processor.go @@ -2545,8 +2545,8 @@ func addRouteNotAcceptedConditionDueToMatchConflict(routeAccessor *status.RouteP status.ReasonRouteRuleMatchConflict, fmt.Sprintf(status.MessageRouteRuleMatchConflict, routeKind, routeKind), ) - } + func addRoutePartiallyInvalidConditionDueToMatchPartiallyConflict(routeAccessor *status.RouteParentStatusUpdate, routeKind string) { routeAccessor.AddCondition( gatewayapi_v1.RouteConditionPartiallyInvalid, diff --git a/internal/dag/gatewayapi_processor_test.go b/internal/dag/gatewayapi_processor_test.go index 463229636a7..c1c50bcb70b 100644 --- a/internal/dag/gatewayapi_processor_test.go +++ b/internal/dag/gatewayapi_processor_test.go @@ -1133,7 +1133,6 @@ func TestSortRoutes(t *testing.T) { for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { - res := sortHTTPRoutes(tc.m) assert.Equal(t, tc.expected, res) }) @@ -1428,7 +1427,6 @@ func TestSortGRPCRoutes(t *testing.T) { for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { - res := sortGRPCRoutes(tc.m) assert.Equal(t, tc.expected, res) }) diff --git a/test/e2e/gateway/grpc_route_conflict_match_test.go b/test/e2e/gateway/grpc_route_conflict_match_test.go index 00bdbf29ef2..96797d9b4ce 100644 --- a/test/e2e/gateway/grpc_route_conflict_match_test.go +++ b/test/e2e/gateway/grpc_route_conflict_match_test.go @@ -56,7 +56,7 @@ func testGRPCRouteConflictMatch(namespace string, gateway types.NamespacedName) }}, }, } - _, ok := f.CreateGRPCRouteAndWaitFor(route1, e2e.GRPCRouteAccepted) + ok := f.CreateGRPCRouteAndWaitFor(route1, e2e.GRPCRouteAccepted) require.True(f.T(), ok) By("create grpcroute-2 with conflicted matches") @@ -87,7 +87,7 @@ func testGRPCRouteConflictMatch(namespace string, gateway types.NamespacedName) }, }, } - _, ok = f.CreateGRPCRouteAndWaitFor(route2, e2e.GRPCRouteNotAcceptedDueToConflict) + ok = f.CreateGRPCRouteAndWaitFor(route2, e2e.GRPCRouteNotAcceptedDueToConflict) require.True(f.T(), ok) cleanup() diff --git a/test/e2e/gateway/grpc_route_partially_conflict_match_test.go b/test/e2e/gateway/grpc_route_partially_conflict_match_test.go index 1026be40db6..4ca211269b5 100644 --- a/test/e2e/gateway/grpc_route_partially_conflict_match_test.go +++ b/test/e2e/gateway/grpc_route_partially_conflict_match_test.go @@ -56,7 +56,7 @@ func testGRPCRoutePartiallyConflictMatch(namespace string, gateway types.Namespa }}, }, } - _, ok := f.CreateGRPCRouteAndWaitFor(route1, e2e.GRPCRouteAccepted) + ok := f.CreateGRPCRouteAndWaitFor(route1, e2e.GRPCRouteAccepted) require.True(f.T(), ok) By("create grpcroute-2 with only partially conflicted matches")