Fix attachedRoutes computation

* Fixes: #2077 * Fixes: #1916 Signed-off-by: Arko Dasgupta <[email protected]>
envoyproxy · Oct 27, 2023 · c1fda33 · c1fda33
1 parent c3ee960
commit c1fda33
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go
@@ -583,9 +583,8 @@ func (t *Translator) processHTTPRouteParentRefListener(route RouteContext, route
 		// Theoretically there should only be one parent ref per
 		// Route that attaches to a given Listener, so fine to just increment here, but we
 		// might want to check to ensure we're not double-counting.
-		if len(routeRoutes) > 0 {
-			listener.IncrementAttachedRoutes()
-		}
+		listener.IncrementAttachedRoutes()
+
 	}
 
 	return hasHostnameIntersection
@@ -691,9 +690,7 @@ func (t *Translator) processTLSRouteParentRefs(tlsRoute *TLSRouteContext, resour
 			// Theoretically there should only be one parent ref per
 			// Route that attaches to a given Listener, so fine to just increment here, but we
 			// might want to check to ensure we're not double-counting.
-			if len(irListener.Destination.Settings) > 0 {
-				listener.IncrementAttachedRoutes()
-			}
+			listener.IncrementAttachedRoutes()
 		}
 
 		if !hasHostnameIntersection {
@@ -828,9 +825,7 @@ func (t *Translator) processUDPRouteParentRefs(udpRoute *UDPRouteContext, resour
 			// Theoretically there should only be one parent ref per
 			// Route that attaches to a given Listener, so fine to just increment here, but we
 			// might want to check to ensure we're not double-counting.
-			if len(irListener.Destination.Settings) > 0 {
-				listener.IncrementAttachedRoutes()
-			}
+			listener.IncrementAttachedRoutes()
 		}
 
 		// If no negative conditions have been set, the route is considered "Accepted=True".
@@ -965,9 +960,7 @@ func (t *Translator) processTCPRouteParentRefs(tcpRoute *TCPRouteContext, resour
 			// Theoretically there should only be one parent ref per
 			// Route that attaches to a given Listener, so fine to just increment here, but we
 			// might want to check to ensure we're not double-counting.
-			if len(irListener.Destination.Settings) > 0 {
-				listener.IncrementAttachedRoutes()
-			}
+			listener.IncrementAttachedRoutes()
 		}
 
 		// If no negative conditions have been set, the route is considered "Accepted=True".

diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go
@@ -50,7 +50,6 @@ func TestGatewayAPIConformance(t *testing.T) {
 		SkipTests: []string{
 			tests.HTTPRouteRewritePath.ShortName,
 			tests.GatewayStaticAddresses.ShortName,
-			tests.GatewayWithAttachedRoutes.ShortName,
 			tests.HTTPRouteBackendProtocolH2C.ShortName,
 		},
 		ExemptFeatures: suite.MeshCoreFeatures,

diff --git a/test/conformance/experimental_conformance_test.go b/test/conformance/experimental_conformance_test.go
@@ -99,7 +99,6 @@ func experimentalConformance(t *testing.T) {
 				SkipTests: []string{
 					tests.HTTPRouteRewritePath.ShortName,
 					tests.GatewayStaticAddresses.ShortName,
-					tests.GatewayWithAttachedRoutes.ShortName,
 					tests.HTTPRouteBackendProtocolH2C.ShortName,
 				},
 				ExemptFeatures: suite.MeshCoreFeatures,