Merge branch 'kubernetes-sigs:main' into test-name-fix

apis/v1alpha2/httproute_types.go

@@ -93,6 +93,19 @@ type HTTPRouteSpec struct {
 	// implementation must raise an 'Accepted' Condition with a status of
 	// `False` in the corresponding RouteParentStatus.
 	//
+	// If a Route (A) of type HTTPRoute or GRPCRoute is attached to a
+	// Listener and that listener already has another Route (B) of the other
+	// type attached and the intersection of the hostnames of A and B is
+	// non-empty, then the implementation MUST accept exactly one of these two
+	// routes, determined by the following criteria, in order:
+	//
+	// * The oldest Route based on creation timestamp.
+	// * The Route appearing first in alphabetical order by
+	//   "{namespace}/{name}".
+	//
+	// The rejected Route MUST raise an 'Accepted' condition with a status of
+	// 'False' in the corresponding RouteParentStatus.
+	//
 	// Support: Core
 	//
 	// +optional
@@ -326,14 +339,14 @@ const (
 // HTTPHeaderName is the name of an HTTP header.
 //
 // Valid values include:
-//
 // * "Authorization"
 // * "Set-Cookie"
 //
 // Invalid values include:
 //
 // * ":method" - ":" is an invalid character. This means that HTTP/2 pseudo
 //   headers are not currently supported by this type.
+//
 // * "/invalid" - "/" is an invalid character
 //
 // +kubebuilder:validation:MinLength=1

apis/v1alpha2/shared_types.go

@@ -333,7 +333,8 @@ type RouteStatus struct {
 //
 // 1. IPs are not allowed.
 // 2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
-//    label must appear by itself as the first label.
+//
+//	label must appear by itself as the first label.
 //
 // Hostname can be "precise" which is a domain name without the terminating
 // dot of a network host (e.g. "foo.example.com") or "wildcard", which is a