Skip to content

Commit 3f08e03

Browse files
authored
Merge pull request #1874 from robscott/gep-726-standard
Graduating GEP-726 (Path Redirects and Rewrites) to standard
2 parents 994659d + fa2bb5e commit 3f08e03

14 files changed

+484
-95
lines changed

apis/v1beta1/httproute_types.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ type HTTPRouteFilter struct {
583583
// Reason of `UnsupportedValue`.
584584
//
585585
// +unionDiscriminator
586-
// +kubebuilder:validation:Enum=RequestHeaderModifier;RequestMirror;RequestRedirect;ExtensionRef
586+
// +kubebuilder:validation:Enum=RequestHeaderModifier;RequestMirror;RequestRedirect;URLRewrite;ExtensionRef
587587
// <gateway:experimental:validation:Enum=RequestHeaderModifier;ResponseHeaderModifier;RequestMirror;RequestRedirect;URLRewrite;ExtensionRef>
588588
Type HTTPRouteFilterType `json:"type"`
589589

@@ -625,7 +625,6 @@ type HTTPRouteFilter struct {
625625
//
626626
// Support: Extended
627627
//
628-
// <gateway:experimental>
629628
// +optional
630629
URLRewrite *HTTPURLRewriteFilter `json:"urlRewrite,omitempty"`
631630

@@ -658,6 +657,7 @@ const (
658657
// Support in HTTPRouteRule: Extended
659658
//
660659
// Support in HTTPBackendRef: Extended
660+
//
661661
// <gateway:experimental>
662662
HTTPRouteFilterResponseHeaderModifier HTTPRouteFilterType = "ResponseHeaderModifier"
663663

@@ -679,8 +679,6 @@ const (
679679
// Support in HTTPRouteRule: Extended
680680
//
681681
// Support in HTTPBackendRef: Extended
682-
//
683-
// <gateway:experimental>
684682
HTTPRouteFilterURLRewrite HTTPRouteFilterType = "URLRewrite"
685683

686684
// HTTPRouteFilterRequestMirror can be used to mirror HTTP requests to a
@@ -817,7 +815,6 @@ const (
817815
)
818816

819817
// HTTPPathModifier defines configuration for path modifiers.
820-
// <gateway:experimental>
821818
type HTTPPathModifier struct {
822819
// Type defines the type of path modifier. Additional types may be
823820
// added in a future release of the API.
@@ -829,14 +826,12 @@ type HTTPPathModifier struct {
829826
// Accepted Condition for the Route to `status: False`, with a
830827
// Reason of `UnsupportedValue`.
831828
//
832-
// <gateway:experimental>
833829
// +kubebuilder:validation:Enum=ReplaceFullPath;ReplacePrefixMatch
834830
Type HTTPPathModifierType `json:"type"`
835831

836832
// ReplaceFullPath specifies the value with which to replace the full path
837833
// of a request during a rewrite or redirect.
838834
//
839-
// <gateway:experimental>
840835
// +kubebuilder:validation:MaxLength=1024
841836
// +optional
842837
ReplaceFullPath *string `json:"replaceFullPath,omitempty"`
@@ -851,7 +846,6 @@ type HTTPPathModifier struct {
851846
// ignored. For example, the paths `/abc`, `/abc/`, and `/abc/def` would all
852847
// match the prefix `/abc`, but the path `/abcd` would not.
853848
//
854-
// <gateway:experimental>
855849
// +kubebuilder:validation:MaxLength=1024
856850
// +optional
857851
ReplacePrefixMatch *string `json:"replacePrefixMatch,omitempty"`
@@ -892,7 +886,6 @@ type HTTPRequestRedirectFilter struct {
892886
//
893887
// Support: Extended
894888
//
895-
// <gateway:experimental>
896889
// +optional
897890
Path *HTTPPathModifier `json:"path,omitempty"`
898891

@@ -935,23 +928,19 @@ type HTTPRequestRedirectFilter struct {
935928
// MUST NOT be used on the same Route rule as a HTTPRequestRedirect filter.
936929
//
937930
// Support: Extended
938-
//
939-
// <gateway:experimental>
940931
type HTTPURLRewriteFilter struct {
941932
// Hostname is the value to be used to replace the Host header value during
942933
// forwarding.
943934
//
944935
// Support: Extended
945936
//
946-
// <gateway:experimental>
947937
// +optional
948938
Hostname *PreciseHostname `json:"hostname,omitempty"`
949939

950940
// Path defines a path rewrite.
951941
//
952942
// Support: Extended
953943
//
954-
// <gateway:experimental>
955944
// +optional
956945
Path *HTTPPathModifier `json:"path,omitempty"`
957946
}

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

Lines changed: 52 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 420 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)