Merge pull request #2059 from k8s-infra-cherrypick-robot/cherry-pick-2054-to-release-0.7

[release-0.7] Add method matching to HTTPRoute matching precedence order

Author: k8s-ci-robot

apis/v1beta1/httproute_types.go

@@ -158,12 +158,13 @@ type HTTPRouteRule struct {
 	// Proxy or Load Balancer routing configuration generated from HTTPRoutes
 	// MUST prioritize matches based on the following criteria, continuing on
 	// ties. Across all rules specified on applicable Routes, precedence must be
-	// given to the match with the largest number of:
+	// given to the match having:
 	//
-	// * Characters in a matching "Exact" path match
-	// * Characters in a matching "Prefix" path match
-	// * Header matches.
-	// * Query param matches.
+	// * "Exact" path match.
+	// * "Prefix" path match with largest number of characters.
+	// * Method match.
+	// * Largest number of header matches.
+	// * Largest number of query param matches.
 	//
 	// Note: The precedence of RegularExpression path matches are implementation-specific.
 	//

config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml

@@ -118,7 +118,7 @@ var HTTPRouteMethodMatching = suite.ConformanceTest{
 			},
 			{
 				Request:   http.Request{Headers: map[string]string{"version": "four"}, Path: "/", Method: "PATCH"},
-				Backend:   "infra-backend-v3",
+				Backend:   "infra-backend-v2",
 				Namespace: ns,
 			},
 		}...)