multiple fixes to HTTPRequestRedirect filter

- Add `Filter` prefix to the struct to match other filters - Rename `Protocol` to `Scheme`
kubernetes-sigs · Sep 15, 2021 · fa92be6 · fa92be6
1 parent d540dee
commit fa92be6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/apis/v1alpha2/httproute_types.go b/apis/v1alpha2/httproute_types.go
@@ -506,7 +506,7 @@ type HTTPRouteFilter struct {
 	// Support: Core
 	//
 	// +optional
-	RequestRedirect *HTTPRequestRedirect `json:"requestRedirect,omitempty"`
+	RequestRedirect *HTTPRequestRedirectFilter `json:"requestRedirect,omitempty"`
 
 	// ExtensionRef is an optional, implementation-specific extension to the
 	// "filter" behavior.  For example, resource "myroutefilter" in group
@@ -646,17 +646,17 @@ type HTTPRequestHeaderFilter struct {
 	Remove []string `json:"remove,omitempty"`
 }
 
-// HTTPRequestRedirect defines configuration for the RequestRedirect filter.
-type HTTPRequestRedirect struct {
-	// Protocol is the protocol to be used in the value of the `Location`
+// HTTPRequestRedirectFilter defines configuration for the RequestRedirect filter.
+type HTTPRequestRedirectFilter struct {
+	// Scheme is the scheme to be used in the value of the `Location`
 	// header in the response.
-	// When empty, the protocol of the request is used.
+	// When empty, the scheme of the request is used.
 	//
 	// Support: Extended
 	//
 	// +optional
-	// +kubebuilder:validation:Enum=HTTP;HTTPS
-	Protocol *string `json:"protocol,omitempty"`
+	// +kubebuilder:validation:Enum=http;https
+	Scheme *string `json:"scheme,omitempty"`
 
 	// Hostname is the hostname to be used in the value of the `Location`
 	// header in the response.

diff --git a/apis/v1alpha2/zz_generated.deepcopy.go b/apis/v1alpha2/zz_generated.deepcopy.go
diff --git a/config/crd/v1alpha2/gateway.networking.k8s.io_httproutes.yaml b/config/crd/v1alpha2/gateway.networking.k8s.io_httproutes.yaml
diff --git a/examples/v1alpha2/http-redirect.yaml b/examples/v1alpha2/http-redirect.yaml
@@ -44,7 +44,7 @@ spec:
     - filters:
       - type: RequestRedirect
         requestRedirect:
-          protocol: HTTPS
+          scheme: https
 ---
 apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: HTTPRoute