Merge branch 'perf/status-route-evaluation-20260618'

Author: mahmut-Abi

internal/status/evaluator.go

@@ -9,54 +9,55 @@ import (
 )
 
 func evaluateRoutes(state *clusterState) routeState {
+	ctx := newRouteEvaluationContext(state)
 	out := routeState{
 		http:        make(map[client.ObjectKey][]routeParentEvaluation),
 		grpc:        make(map[client.ObjectKey][]routeParentEvaluation),
 		tcp:         make(map[client.ObjectKey][]routeParentEvaluation),
 		udp:         make(map[client.ObjectKey][]routeParentEvaluation),
 		tls:         make(map[client.ObjectKey][]routeParentEvaluation),
-		attachments: make(map[listenerKey]map[string]struct{}),
+		attachments: make(map[listenerKey]routeAttachmentSet),
 	}
 
 	for _, route := range state.httpRoutes {
 		key := client.ObjectKeyFromObject(&route)
-		evals := evaluateRoute(state, httpRouteInput(route))
+		evals := ctx.evaluateRoute(httpRouteInput(route))
 		out.http[key] = evals
 		recordAttachments(out.attachments, key, evals)
 	}
 
 	for _, route := range state.grpcRoutes {
 		key := client.ObjectKeyFromObject(&route)
-		evals := evaluateRoute(state, grpcRouteInput(route))
+		evals := ctx.evaluateRoute(grpcRouteInput(route))
 		out.grpc[key] = evals
 		recordAttachments(out.attachments, key, evals)
 	}
 
 	for _, route := range state.tcpRoutes {
 		key := client.ObjectKeyFromObject(&route)
-		evals := evaluateRoute(state, tcpRouteInput(route))
+		evals := ctx.evaluateRoute(tcpRouteInput(route))
 		out.tcp[key] = evals
 		recordAttachments(out.attachments, key, evals)
 	}
 
 	for _, route := range state.udpRoutes {
 		key := client.ObjectKeyFromObject(&route)
-		evals := evaluateRoute(state, udpRouteInput(route))
+		evals := ctx.evaluateRoute(udpRouteInput(route))
 		out.udp[key] = evals
 		recordAttachments(out.attachments, key, evals)
 	}
 
 	for _, route := range state.tlsRoutes {
 		key := client.ObjectKeyFromObject(&route)
-		evals := evaluateRoute(state, tlsRouteInput(route))
+		evals := ctx.evaluateRoute(tlsRouteInput(route))
 		out.tls[key] = evals
 		recordAttachments(out.attachments, key, evals)
 	}
 
 	return out
 }
 
-func evaluateGateways(state *clusterState, attachments map[listenerKey]map[string]struct{}) map[client.ObjectKey]gatewayEvaluation {
+func evaluateGateways(state *clusterState, attachments map[listenerKey]routeAttachmentSet) map[client.ObjectKey]gatewayEvaluation {
 	out := make(map[client.ObjectKey]gatewayEvaluation, len(state.managedGateways))
 
 	for _, gateway := range state.managedGateways {

internal/status/evaluator_benchmark_test.go

@@ -17,7 +17,7 @@ var (
 	benchmarkListenerStatusSink     []gatewayv1.ListenerStatus
 	benchmarkBackendTLSPoliciesSink map[client.ObjectKey]backendTLSPolicyEvaluation
 	benchmarkBackendLBPoliciesSink  map[client.ObjectKey]backendLBPolicyEvaluation
-	benchmarkGatewayAttachmentsSink map[listenerKey]map[string]struct{}
+	benchmarkGatewayAttachmentsSink map[listenerKey]routeAttachmentSet
 )
 
 func BenchmarkEvaluateRoutesRouteFanout(b *testing.B) {
@@ -103,18 +103,21 @@ func benchmarkLoadStatusState(b *testing.B, reconciler *Reconciler) *clusterStat
 	return state
 }
 
-func benchmarkGatewayFleetAttachments(state *clusterState, attachedPerListener int) map[listenerKey]map[string]struct{} {
-	out := make(map[listenerKey]map[string]struct{}, len(state.managedGateways))
+func benchmarkGatewayFleetAttachments(state *clusterState, attachedPerListener int) map[listenerKey]routeAttachmentSet {
+	out := make(map[listenerKey]routeAttachmentSet, len(state.managedGateways))
 	for _, gateway := range state.managedGateways {
 		for _, listener := range gateway.Spec.Listeners {
 			key := listenerKey{
 				gatewayNamespace: gateway.Namespace,
 				gatewayName:      gateway.Name,
 				listenerName:     listener.Name,
 			}
-			attached := make(map[string]struct{}, attachedPerListener)
+			attached := make(routeAttachmentSet, attachedPerListener)
 			for i := 0; i < attachedPerListener; i++ {
-				attached[fmt.Sprintf("%s/%s-route-%d", gateway.Namespace, gateway.Name, i)] = struct{}{}
+				attached[client.ObjectKey{
+					Namespace: gateway.Namespace,
+					Name:      fmt.Sprintf("%s-route-%d", gateway.Name, i),
+				}] = struct{}{}
 			}
 			out[key] = attached
 		}

internal/status/evaluator_listener_sets.go

@@ -27,7 +27,7 @@ func evaluateListenerSets(
 	state *clusterState,
 	lses []gatewayv1.ListenerSet,
 	managedGateways map[string]gatewayv1.Gateway,
-	attachments map[listenerKey]map[string]struct{},
+	attachments map[listenerKey]routeAttachmentSet,
 ) map[string]listenerSetEvaluation {
 	out := make(map[string]listenerSetEvaluation, len(lses))
 	gwToLSes := groupListenerSetsByGateway(lses)
@@ -87,7 +87,7 @@ func evaluateOneListenerSet(
 	gw gatewayv1.Gateway,
 	conflictListeners []gatewayv1.Listener,
 	state *clusterState,
-	attachments map[listenerKey]map[string]struct{},
+	attachments map[listenerKey]routeAttachmentSet,
 ) listenerSetEvaluation {
 	allowed := gatewayAllowsListenerSet(gw, ls, state.namespaceByName)
 	if !allowed {
@@ -237,7 +237,7 @@ func listenerSetEntryAttachedRoutes(
 	gateway gatewayv1.Gateway,
 	ls gatewayv1.ListenerSet,
 	entry gatewayv1.ListenerEntry,
-	attachments map[listenerKey]map[string]struct{},
+	attachments map[listenerKey]routeAttachmentSet,
 ) int32 {
 	if len(attachments) == 0 {
 		return 0
@@ -287,7 +287,7 @@ func evaluateGatewayListenerSetListeners(
 	state *clusterState,
 	gateway gatewayv1.Gateway,
 	listenerSets []gatewayv1.ListenerSet,
-	attachments map[listenerKey]map[string]struct{},
+	attachments map[listenerKey]routeAttachmentSet,
 ) []listenerEvaluation {
 	if len(listenerSets) == 0 {
 		return nil

internal/status/evaluator_policies.go

@@ -15,20 +15,6 @@ import (
 	"github.com/nantian-gw/gateway/internal/mesh"
 )
 
-func candidateListeners(state *clusterState, gateway gatewayv1.Gateway, parentRef gatewayv1.ParentReference) []gatewayv1.Listener {
-	out := make([]gatewayv1.Listener, 0, len(gateway.Spec.Listeners))
-	for _, listener := range gateway.Spec.Listeners {
-		if parentRef.SectionName != nil && listener.Name != *parentRef.SectionName {
-			continue
-		}
-		if parentRef.Port != nil && listener.Port != *parentRef.Port {
-			continue
-		}
-		out = append(out, listener)
-	}
-	return out
-}
-
 func serviceParentPortMatches(service corev1.Service, parentRef gatewayv1.ParentReference) bool {
 	if parentRef.Port == nil {
 		return true
@@ -269,7 +255,12 @@ func referenceGrantToAllowed(items []gatewayv1beta1.ReferenceGrantTo, expected g
 }
 
 func httpRouteBackends(route gatewayv1.HTTPRoute) []backendInput {
-	out := make([]backendInput, 0)
+	total := 0
+	for _, rule := range route.Spec.Rules {
+		total += len(rule.BackendRefs)
+	}
+
+	out := make([]backendInput, 0, total)
 	for _, rule := range route.Spec.Rules {
 		for _, backendRef := range rule.BackendRefs {
 			out = append(out, backendInput{
@@ -285,7 +276,12 @@ func httpRouteBackends(route gatewayv1.HTTPRoute) []backendInput {
 }
 
 func grpcRouteBackends(route gatewayv1.GRPCRoute) []backendInput {
-	out := make([]backendInput, 0)
+	total := 0
+	for _, rule := range route.Spec.Rules {
+		total += len(rule.BackendRefs)
+	}
+
+	out := make([]backendInput, 0, total)
 	for _, rule := range route.Spec.Rules {
 		for _, backendRef := range rule.BackendRefs {
 			out = append(out, backendInput{
@@ -301,7 +297,12 @@ func grpcRouteBackends(route gatewayv1.GRPCRoute) []backendInput {
 }
 
 func tcpRouteBackends(route gatewayv1alpha2.TCPRoute) []backendInput {
-	out := make([]backendInput, 0)
+	total := 0
+	for _, rule := range route.Spec.Rules {
+		total += len(rule.BackendRefs)
+	}
+
+	out := make([]backendInput, 0, total)
 	for _, rule := range route.Spec.Rules {
 		for _, backendRef := range rule.BackendRefs {
 			out = append(out, backendInput{
@@ -317,7 +318,12 @@ func tcpRouteBackends(route gatewayv1alpha2.TCPRoute) []backendInput {
 }
 
 func udpRouteBackends(route gatewayv1alpha2.UDPRoute) []backendInput {
-	out := make([]backendInput, 0)
+	total := 0
+	for _, rule := range route.Spec.Rules {
+		total += len(rule.BackendRefs)
+	}
+
+	out := make([]backendInput, 0, total)
 	for _, rule := range route.Spec.Rules {
 		for _, backendRef := range rule.BackendRefs {
 			out = append(out, backendInput{
@@ -333,7 +339,12 @@ func udpRouteBackends(route gatewayv1alpha2.UDPRoute) []backendInput {
 }
 
 func tlsRouteBackends(route gatewayv1alpha2.TLSRoute) []backendInput {
-	out := make([]backendInput, 0)
+	total := 0
+	for _, rule := range route.Spec.Rules {
+		total += len(rule.BackendRefs)
+	}
+
+	out := make([]backendInput, 0, total)
 	for _, rule := range route.Spec.Rules {
 		for _, backendRef := range rule.BackendRefs {
 			out = append(out, backendInput{