Add 307 / 308 Redirect Status Code Support

apis/v1/httproute_types.go

@@ -1224,7 +1224,7 @@ type HTTPRequestRedirectFilter struct {
 	//
 	// +optional
 	// +kubebuilder:default=302
-	// +kubebuilder:validation:Enum=301;302
+	// +kubebuilder:validation:Enum=301;302;307;308
 	StatusCode *int `json:"statusCode,omitempty"`
 }
 

conformance/tests/httproute-redirect-host-and-status.go

@@ -72,6 +72,30 @@ var HTTPRouteRedirectHostAndStatus = suite.ConformanceTest{
 					Host: "example.org",
 				},
 				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/host-and-temporary",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 307,
+				},
+				RedirectRequest: &roundtripper.RedirectRequest{
+					Host: "example.org",
+				},
+				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/host-and-permanent",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 308,
+				},
+				RedirectRequest: &roundtripper.RedirectRequest{
+					Host: "example.org",
+				},
+				Namespace: ns,
 			},
 		}
 		for i := range testCases {

conformance/tests/httproute-redirect-host-and-status.yaml

@@ -24,4 +24,21 @@ spec:
       requestRedirect:
         statusCode: 301
         hostname: example.org
-
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /host-and-temporary
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        statusCode: 307
+        hostname: example.org
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /host-and-permanent
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        statusCode: 308
+        hostname: example.org

conformance/tests/httproute-redirect-path.go

@@ -98,6 +98,30 @@ var HTTPRouteRedirectPath = suite.ConformanceTest{
 					Path: "/replacement-prefix",
 				},
 				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/path-and-temporary",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 307,
+				},
+				RedirectRequest: &roundtripper.RedirectRequest{
+					Path: "/replacement-prefix",
+				},
+				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/path-and-permanent",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 308,
+				},
+				RedirectRequest: &roundtripper.RedirectRequest{
+					Path: "/replacement-prefix",
+				},
+				Namespace: ns,
 			}, {
 				Request: http.Request{
 					Path:             "/full-path-and-host",
@@ -123,6 +147,30 @@ var HTTPRouteRedirectPath = suite.ConformanceTest{
 					Path: "/replacement-full",
 				},
 				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/full-path-and-temporary",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 307,
+				},
+				RedirectRequest: &roundtripper.RedirectRequest{
+					Path: "/replacement-full",
+				},
+				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/full-path-and-permanent",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 308,
+				},
+				RedirectRequest: &roundtripper.RedirectRequest{
+					Path: "/replacement-full",
+				},
+				Namespace: ns,
 			},
 		}
 		for i := range testCases {

conformance/tests/httproute-redirect-path.yaml

@@ -49,6 +49,28 @@ spec:
           type: ReplacePrefixMatch
           replacePrefixMatch: /replacement-prefix
         statusCode: 301
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /path-and-temporary
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        path:
+          type: ReplacePrefixMatch
+          replacePrefixMatch: /replacement-prefix
+        statusCode: 307
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /path-and-permanent
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        path:
+          type: ReplacePrefixMatch
+          replacePrefixMatch: /replacement-prefix
+        statusCode: 308
   - matches:
     - path:
         type: PathPrefix
@@ -71,3 +93,25 @@ spec:
           type: ReplaceFullPath
           replaceFullPath: /replacement-full
         statusCode: 301
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /full-path-and-temporary
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        path:
+          type: ReplaceFullPath
+          replaceFullPath: /replacement-full
+        statusCode: 307
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /full-path-and-permanent
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        path:
+          type: ReplaceFullPath
+          replaceFullPath: /replacement-full
+        statusCode: 308

conformance/tests/httproute-redirect-port.go

@@ -99,6 +99,32 @@ var HTTPRouteRedirectPort = suite.ConformanceTest{
 					Host: "example.org",
 				},
 				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/port-and-temporary",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 307,
+				},
+				RedirectRequest: &roundtripper.RedirectRequest{
+					Port: "8083",
+					Host: "example.org",
+				},
+				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/port-and-permanent",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 308,
+				},
+				RedirectRequest: &roundtripper.RedirectRequest{
+					Port: "8083",
+					Host: "example.org",
+				},
+				Namespace: ns,
 			},
 		}
 		for i := range testCases {

conformance/tests/httproute-redirect-port.yaml

@@ -43,3 +43,23 @@ spec:
         port: 8083
         hostname: example.org
         statusCode: 302
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /port-and-temporary
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        port: 8083
+        hostname: example.org
+        statusCode: 307
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /port-and-permanent
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        port: 8083
+        hostname: example.org
+        statusCode: 308

conformance/tests/httproute-redirect-scheme.go

@@ -99,6 +99,27 @@ var HTTPRouteRedirectScheme = suite.ConformanceTest{
 					Host:   "example.org",
 				},
 				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/scheme-and-temporary",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 307,
+				},
+				RedirectRequest: &roundtripper.RedirectRequest{
+					Scheme: "https",
+					Host:   "example.org",
+				},
+				Namespace: ns,
+			}, {
+				Request: http.Request{
+					Path:             "/scheme-and-permanent",
+					UnfollowRedirect: true,
+				},
+				Response: http.Response{
+					StatusCode: 308,
+				},
 			},
 		}
 		for i := range testCases {

conformance/tests/httproute-redirect-scheme.yaml

@@ -33,6 +33,15 @@ spec:
       requestRedirect:
         scheme: "https"
         statusCode: 301
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /scheme-and-temporary
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        scheme: "https"
+        statusCode: 307
   - matches:
     - path:
         type: PathPrefix
@@ -43,4 +52,13 @@ spec:
         scheme: "https"
         statusCode: 302
         hostname: example.org
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /scheme-and-permanent
+    filters:
+    - type: RequestRedirect
+      requestRedirect:
+        scheme: "https"
+        statusCode: 308