fix conformance test failure, replace generation with message.

Signed-off-by: hai.yue <20416005+yuehaii@users.noreply.github.com>

Author: yuehaii

internal/gatewayapi/helpers.go

@@ -146,8 +146,7 @@ func IsRefToGateway(routeNamespace gwapiv1.Namespace, parentRef gwapiv1.ParentRe
 // in the given list, and if so, a list of the Listeners within that Gateway or ListenerSet that
 // are included by the parent ref (either one specific Listener, or all Listeners
 // in the Gateway or ListenerSet, depending on whether section name is specified or not).
-// The second return value is the matched GatewayContext when the parentRef points to a Gateway
-func GetReferencedListeners(routeNamespace gwapiv1.Namespace, parentRef gwapiv1.ParentReference, gateways []*GatewayContext) (bool, *GatewayContext, []*ListenerContext) {
+func GetReferencedListeners(routeNamespace gwapiv1.Namespace, parentRef gwapiv1.ParentReference, gateways []*GatewayContext) (bool, []*ListenerContext) {
 	var referencedListeners []*ListenerContext
 
 	// The parentRef is an ListenerSet
@@ -173,7 +172,7 @@ func GetReferencedListeners(routeNamespace gwapiv1.Namespace, parentRef gwapiv1.
 				}
 			}
 		}
-		return matchedListenerSet, nil, referencedListeners
+		return matchedListenerSet, referencedListeners
 	}
 
 	// The parentRef is a Gateway
@@ -188,11 +187,11 @@ func GetReferencedListeners(routeNamespace gwapiv1.Namespace, parentRef gwapiv1.
 					referencedListeners = append(referencedListeners, listener)
 				}
 			}
-			return true, gateway, referencedListeners
+			return true, referencedListeners
 		}
 	}
 
-	return false, nil, referencedListeners
+	return false, referencedListeners
 }
 
 func isRefToListenerSet(parentRef gwapiv1.ParentReference) bool {

internal/gatewayapi/route.go

@@ -110,21 +110,22 @@ func (t *Translator) ProcessGRPCRoutes(grpcRoutes []*gwapiv1.GRPCRoute, gateways
 	return relevantGRPCRoutes
 }
 
+// gatewayAcceptedMsg returns the message embedding the Gateway's generation
+// so that a gateway-only update changes the message text and breaks the watchable DeepEqual gate
+// observedGeneration stays as the route's own generation to remain spec-compliant.
+func (t *Translator) gatewayMsg(gw *GatewayContext, base string) string {
+	if gw != nil && gw.GetGeneration() > 0 {
+		return fmt.Sprintf("%s (gateway generation: %d)", base, gw.GetGeneration())
+	}
+	return base
+}
+
 func (t *Translator) processHTTPRouteParentRefs(httpRoute *HTTPRouteContext, resources *resource.Resources, xdsIR resource.XdsIRMap) {
 	for _, parentRef := range httpRoute.ParentRefs {
 		// Need to compute Route rules within the parentRef loop because
 		// any conditions that come out of it have to go on each RouteParentStatus,
 		// not on the Route as a whole.
 		routeRoutes, errs, unacceptedRules := t.processHTTPRouteRules(httpRoute, parentRef, resources)
-
-		// For gateway-driven conditions, use the Gateway's generation as observedGeneration
-		// Gateway-only edit produces a condition value that differs
-		// from the stale stored one, unblocking the watchable DeepEqual gate.
-		observedGeneration := httpRoute.GetGeneration()
-		if gw := parentRef.GetGateway(); gw != nil && gw.GetGeneration() > 0 {
-			observedGeneration = gw.GetGeneration()
-		}
-
 		if len(errs) > 0 {
 			routeStatus := GetRouteStatus(httpRoute)
 			// errs are already grouped by condition type in TypedErrorCollector
@@ -195,11 +196,11 @@ func (t *Translator) processHTTPRouteParentRefs(httpRoute *HTTPRouteContext, res
 			routeStatus := GetRouteStatus(httpRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				httpRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionFalse,
 				gwapiv1.RouteReasonNoMatchingListenerHostname,
-				"There were no hostname intersections between the HTTPRoute and this parent ref's Listener(s).",
+				t.gatewayMsg(parentRef.GetGateway(), "There were no hostname intersections between the HTTPRoute and this parent ref's Listener(s)."),
 			)
 		}
 
@@ -214,11 +215,11 @@ func (t *Translator) processHTTPRouteParentRefs(httpRoute *HTTPRouteContext, res
 			routeStatus := GetRouteStatus(httpRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				httpRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionTrue,
 				gwapiv1.RouteReasonAccepted,
-				"Route is accepted",
+				t.gatewayMsg(parentRef.GetGateway(), "Route is accepted"),
 			)
 		}
 	}
@@ -855,15 +856,6 @@ func (t *Translator) processGRPCRouteParentRefs(grpcRoute *GRPCRouteContext, res
 		// any conditions that come out of it have to go on each RouteParentStatus,
 		// not on the Route as a whole.
 		routeRoutes, errs, unacceptedRules := t.processGRPCRouteRules(grpcRoute, parentRef, resources)
-
-		// For gateway-driven conditions, use the Gateway's generation as observedGeneration
-		// Gateway-only edit produces a condition value that differs
-		// from the stale stored one, unblocking the watchable DeepEqual gate.
-		observedGeneration := grpcRoute.GetGeneration()
-		if gw := parentRef.GetGateway(); gw != nil && gw.GetGeneration() > 0 {
-			observedGeneration = gw.GetGeneration()
-		}
-
 		if len(errs) > 0 {
 			routeStatus := GetRouteStatus(grpcRoute)
 			// errs are already grouped by condition type in TypedErrorCollector
@@ -938,11 +930,11 @@ func (t *Translator) processGRPCRouteParentRefs(grpcRoute *GRPCRouteContext, res
 			routeStatus := GetRouteStatus(grpcRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				grpcRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionFalse,
 				gwapiv1.RouteReasonNoMatchingListenerHostname,
-				"There were no hostname intersections between the GRPCRoute and this parent ref's Listener(s).",
+				t.gatewayMsg(parentRef.GetGateway(), "There were no hostname intersections between the GRPCRoute and this parent ref's Listener(s)."),
 			)
 		}
 
@@ -952,11 +944,11 @@ func (t *Translator) processGRPCRouteParentRefs(grpcRoute *GRPCRouteContext, res
 			routeStatus := GetRouteStatus(grpcRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				grpcRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionTrue,
 				gwapiv1.RouteReasonAccepted,
-				"Route is accepted",
+				t.gatewayMsg(parentRef.GetGateway(), "Route is accepted"),
 			)
 		}
 
@@ -1413,14 +1405,6 @@ func (t *Translator) processTLSRouteParentRefs(tlsRoute *TLSRouteContext, resour
 			destName     = irRouteDestinationName(tlsRoute, -1 /*rule index*/)
 		)
 
-		// For gateway-driven conditions, use the Gateway's generation as observedGeneration
-		// Gateway-only edit produces a condition value that differs
-		// from the stale stored one, unblocking the watchable DeepEqual gate.
-		observedGeneration := tlsRoute.GetGeneration()
-		if gw := parentRef.GetGateway(); gw != nil && gw.GetGeneration() > 0 {
-			observedGeneration = gw.GetGeneration()
-		}
-
 		// compute backends
 		for _, rule := range tlsRoute.Spec.Rules {
 			for i := range rule.BackendRefs {
@@ -1521,11 +1505,11 @@ func (t *Translator) processTLSRouteParentRefs(tlsRoute *TLSRouteContext, resour
 			routeStatus := GetRouteStatus(tlsRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				tlsRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionFalse,
 				gwapiv1.RouteReasonNoMatchingListenerHostname,
-				"There were no hostname intersections between the TLSRoute and this parent ref's Listener(s).",
+				t.gatewayMsg(parentRef.GetGateway(), "There were no hostname intersections between the TLSRoute and this parent ref's Listener(s)."),
 			)
 		}
 
@@ -1540,11 +1524,11 @@ func (t *Translator) processTLSRouteParentRefs(tlsRoute *TLSRouteContext, resour
 			routeStatus := GetRouteStatus(tlsRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				tlsRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionTrue,
 				gwapiv1.RouteReasonAccepted,
-				"Route is accepted",
+				t.gatewayMsg(parentRef.GetGateway(), "Route is accepted"),
 			)
 		}
 	}
@@ -1604,14 +1588,6 @@ func (t *Translator) processUDPRouteParentRefs(udpRoute *UDPRouteContext, resour
 			destName     = irRouteDestinationName(udpRoute, -1 /*rule index*/)
 		)
 
-		// For gateway-driven conditions, use the Gateway's generation as observedGeneration
-		// Gateway-only edit produces a condition value that differs
-		// from the stale stored one, unblocking the watchable DeepEqual gate.
-		observedGeneration := udpRoute.GetGeneration()
-		if gw := parentRef.GetGateway(); gw != nil && gw.GetGeneration() > 0 {
-			observedGeneration = gw.GetGeneration()
-		}
-
 		for i := range udpRoute.Spec.Rules[0].BackendRefs {
 			settingName := irDestinationSettingName(destName, i)
 			backendRefCtx := DirectBackendRef{BackendRef: &udpRoute.Spec.Rules[0].BackendRefs[i]}
@@ -1689,23 +1665,23 @@ func (t *Translator) processUDPRouteParentRefs(udpRoute *UDPRouteContext, resour
 			routeStatus := GetRouteStatus(udpRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				udpRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionTrue,
 				gwapiv1.RouteReasonAccepted,
-				"Route is accepted",
+				t.gatewayMsg(parentRef.GetGateway(), "Route is accepted"),
 			)
 		}
 
 		if !accepted {
 			routeStatus := GetRouteStatus(udpRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				udpRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionFalse,
 				gwapiv1.RouteReasonUnsupportedValue,
-				"Multiple routes on the same UDP listener",
+				t.gatewayMsg(parentRef.GetGateway(), "Multiple routes on the same UDP listener"),
 			)
 		}
 	}
@@ -1765,14 +1741,6 @@ func (t *Translator) processTCPRouteParentRefs(tcpRoute *TCPRouteContext, resour
 			destName     = irRouteDestinationName(tcpRoute, -1 /*rule index*/)
 		)
 
-		// For gateway-driven conditions, use the Gateway's generation as observedGeneration
-		// Gateway-only edit produces a condition value that differs
-		// from the stale stored one, unblocking the watchable DeepEqual gate.
-		observedGeneration := tcpRoute.GetGeneration()
-		if gw := parentRef.GetGateway(); gw != nil && gw.GetGeneration() > 0 {
-			observedGeneration = gw.GetGeneration()
-		}
-
 		for i := range tcpRoute.Spec.Rules[0].BackendRefs {
 			settingName := irDestinationSettingName(destName, i)
 			backendRefCtx := DirectBackendRef{BackendRef: &tcpRoute.Spec.Rules[0].BackendRefs[i]}
@@ -1860,22 +1828,22 @@ func (t *Translator) processTCPRouteParentRefs(tcpRoute *TCPRouteContext, resour
 			routeStatus := GetRouteStatus(tcpRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				tcpRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionTrue,
 				gwapiv1.RouteReasonAccepted,
-				"Route is accepted",
+				t.gatewayMsg(parentRef.GetGateway(), "Route is accepted"),
 			)
 		}
 		if !accepted {
 			routeStatus := GetRouteStatus(tcpRoute)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRef.routeParentStatusIdx,
-				observedGeneration,
+				tcpRoute.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionFalse,
 				gwapiv1.RouteReasonUnsupportedValue,
-				"Multiple routes on the same TCP listener",
+				t.gatewayMsg(parentRef.GetGateway(), "Multiple routes on the same TCP listener"),
 			)
 		}
 
@@ -2281,7 +2249,7 @@ func (t *Translator) processAllowedListenersForParentRefs(
 	var relevantRoute bool
 	ns := gwapiv1.Namespace(routeContext.GetNamespace())
 	for _, parentRef := range GetParentReferences(routeContext) {
-		isRelevantParentRef, matchedGateway, selectedListeners := GetReferencedListeners(ns, parentRef, gateways)
+		isRelevantParentRef, selectedListeners := GetReferencedListeners(ns, parentRef, gateways)
 
 		// Parent ref is not to a Gateway that we control: skip it
 		if !isRelevantParentRef {
@@ -2293,23 +2261,15 @@ func (t *Translator) processAllowedListenersForParentRefs(
 		// Reset conditions since they will be recomputed during translation
 		parentRefCtx.ResetConditions(routeContext)
 
-		// For gateway-driven conditions, use the Gateway's generation as observedGeneration
-		// Gateway-only edit produces a condition value that differs
-		// from the stale stored one, unblocking the watchable DeepEqual gate.
-		observedGeneration := routeContext.GetGeneration()
-		if matchedGateway != nil && matchedGateway.GetGeneration() > 0 {
-			observedGeneration = matchedGateway.GetGeneration()
-		}
-
 		if len(selectedListeners) == 0 {
 			routeStatus := GetRouteStatus(routeContext)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRefCtx.routeParentStatusIdx,
-				observedGeneration,
+				routeContext.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionFalse,
 				gwapiv1.RouteReasonNoMatchingParent,
-				"No listeners match this parent ref",
+				t.gatewayMsg(parentRefCtx.GetGateway(), "No listeners match this parent ref"),
 			)
 			continue
 		}
@@ -2323,15 +2283,20 @@ func (t *Translator) processAllowedListenersForParentRefs(
 			}
 		}
 
+		var selectedGateway *GatewayContext
+		if len(selectedListeners) > 0 {
+			selectedGateway = selectedListeners[0].gateway
+		}
+
 		if len(allowedListeners) == 0 {
 			routeStatus := GetRouteStatus(routeContext)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRefCtx.routeParentStatusIdx,
-				observedGeneration,
+				routeContext.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionFalse,
 				gwapiv1.RouteReasonNotAllowedByListeners,
-				"No listeners included by this parent ref allowed this attachment.",
+				t.gatewayMsg(selectedGateway, "No listeners included by this parent ref allowed this attachment."),
 			)
 			continue
 		}
@@ -2341,23 +2306,23 @@ func (t *Translator) processAllowedListenersForParentRefs(
 			routeStatus := GetRouteStatus(routeContext)
 			status.SetRouteStatusCondition(routeStatus,
 				parentRefCtx.routeParentStatusIdx,
-				observedGeneration,
+				routeContext.GetGeneration(),
 				gwapiv1.RouteConditionAccepted,
 				metav1.ConditionFalse,
 				"NoReadyListeners",
-				"There are no ready listeners for this parent ref",
+				t.gatewayMsg(parentRefCtx.GetGateway(), "There are no ready listeners for this parent ref"),
 			)
 			continue
 		}
 
 		routeStatus := GetRouteStatus(routeContext)
 		status.SetRouteStatusCondition(routeStatus,
 			parentRefCtx.routeParentStatusIdx,
-			observedGeneration,
+			routeContext.GetGeneration(),
 			gwapiv1.RouteConditionAccepted,
 			metav1.ConditionTrue,
 			gwapiv1.RouteReasonAccepted,
-			"Route is accepted",
+			t.gatewayMsg(parentRefCtx.GetGateway(), "Route is accepted"),
 		)
 	}
 	return relevantRoute