diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go index fe0ec085def7..fede82fba68d 100644 --- 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 index eeb8898ffc7b..dce91b6940c0 100644 --- 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 index fd4a5620973e..d128025dc0e3 100644 --- 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,