Merge pull request #1173 from robscott/wildcard-hostname-spec

Clarifying that wildcard hostname matching is suffix matching

Author: k8s-ci-robot

apis/v1alpha2/gateway_types.go

@@ -172,6 +172,10 @@ type Listener struct {
 	// accepted. For more information, refer to the Route specific Hostnames
 	// documentation.
 	//
+	// Hostnames that are prefixed with a wildcard label (`*.`) are interpreted
+	// as a suffix match. That means that a match for `*.example.com` would match
+	// both `test.example.com`, and `foo.test.example.com`, but not `example.com`.
+	//
 	// Support: Core
 	//
 	// +optional

apis/v1alpha2/httproute_types.go

@@ -74,8 +74,13 @@ type HTTPRouteSpec struct {
 	// * A Listener with `*.example.com` as the hostname matches HTTPRoutes
 	//   that have either not specified any hostnames or have specified at least
 	//   one hostname that matches the Listener hostname. For example,
-	//   `test.example.com` and `*.example.com` would both match. On the other
-	//   hand, `example.com` and `test.example.net` would not match.
+	//   `*.example.com`, `test.example.com`, and `foo.test.example.com` would
+	//   all match. On the other hand, `example.com` and `test.example.net` would
+	//   not match.
+	//
+	// Hostnames that are prefixed with a wildcard label (`*.`) are interpreted
+	// as a suffix match. That means that a match for `*.example.com` would match
+	// both `test.example.com`, and `foo.test.example.com`, but not `example.com`.
 	//
 	// If both the Listener and HTTPRoute have specified hostnames, any
 	// HTTPRoute hostnames that do not match the Listener hostname MUST be

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

@@ -66,7 +66,15 @@ var HTTPRouteListenerHostnameMatching = suite.ConformanceTest{
 			Backend:   "infra-backend-v3",
 			Namespace: ns,
 		}, {
-			Request:    http.ExpectedRequest{Host: "too.many.prefixes.bar.com", Path: "/"},
+			Request:   http.ExpectedRequest{Host: "multiple.prefixes.bar.com", Path: "/"},
+			Backend:   "infra-backend-v3",
+			Namespace: ns,
+		}, {
+			Request:   http.ExpectedRequest{Host: "multiple.prefixes.foo.com", Path: "/"},
+			Backend:   "infra-backend-v3",
+			Namespace: ns,
+		}, {
+			Request:    http.ExpectedRequest{Host: "foo.com", Path: "/"},
 			StatusCode: 404,
 		}, {
 			Request:    http.ExpectedRequest{Host: "no.matching.host", Path: "/"},

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

@@ -27,6 +27,13 @@ spec:
       namespaces:
         from: Same
     hostname: "*.bar.com"
+  - name: listener-4
+    port: 80
+    protocol: HTTP
+    allowedRoutes:
+      namespaces:
+        from: Same
+    hostname: "*.foo.com"
 ---
 apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: HTTPRoute
@@ -68,6 +75,9 @@ spec:
   - name: httproute-listener-hostname-matching
     namespace: gateway-conformance-infra
     sectionName: listener-3
+  - name: httproute-listener-hostname-matching
+    namespace: gateway-conformance-infra
+    sectionName: listener-4
   rules:
   - backendRefs:
     - name: infra-backend-v3