Merge remote-tracking branch 'origin/release-v2-dev' into feat/reference-grant-for-route

dspo · dspo · commit 7e362e47e9c5 · 2025-05-21T11:27:40.000+08:00
# Conflicts:
#	internal/controller/gateway_controller.go
#	internal/controller/utils.go
#	test/conformance/conformance_test.go
diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go
@@ -24,9 +24,7 @@ var skippedTestsForSSL = []string{
 	tests.HTTPRouteRedirectPortAndScheme.ShortName,
 }
 
-var skippedTestsForTraditionalRoutes = []string{
-	// TODO: HTTPRoute hostname intersection and listener hostname matching
-}
+var skippedTestsForTraditionalRoutes []string // TODO: HTTPRoute hostname intersection and listener hostname matching
 
 var gatewaySupportedFeatures = []features.FeatureName{
 	features.SupportGateway,

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,7 @@ var skippedTestsForSSL = []string{`
`24`	`24`	`tests.HTTPRouteRedirectPortAndScheme.ShortName,`
`25`	`25`	`}`
`26`	`26`
`27`		`-var skippedTestsForTraditionalRoutes = []string{`
`28`		`- // TODO: HTTPRoute hostname intersection and listener hostname matching`
`29`		`-}`
	`27`	`+var skippedTestsForTraditionalRoutes []string // TODO: HTTPRoute hostname intersection and listener hostname matching`
`30`	`28`
`31`	`29`	`var gatewaySupportedFeatures = []features.FeatureName{`
`32`	`30`	`features.SupportGateway,`