Skip to content

Commit

Permalink
Merge pull request #850 from hbagdi/feat/drop-impl-specific
Browse files Browse the repository at this point in the history
httproute: drop ImplementationSpecific match types
  • Loading branch information
k8s-ci-robot authored Sep 6, 2021
2 parents 817f1b6 + 2b0df71 commit 7789b91
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 36 deletions.
32 changes: 13 additions & 19 deletions apis/v1alpha2/httproute_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ type HTTPRouteRule struct {
// * "Exact"
// * "Prefix"
// * "RegularExpression"
// * "ImplementationSpecific"
//
// Prefix and Exact paths must be syntactically valid:
//
Expand All @@ -220,15 +219,14 @@ type HTTPRouteRule struct {
// - For prefix paths, a trailing '/' character in the Path is ignored,
// e.g. /abc and /abc/ specify the same match.
//
// +kubebuilder:validation:Enum=Exact;Prefix;RegularExpression;ImplementationSpecific
// +kubebuilder:validation:Enum=Exact;Prefix;RegularExpression
type PathMatchType string

// PathMatchType constants.
const (
PathMatchExact PathMatchType = "Exact"
PathMatchPrefix PathMatchType = "Prefix"
PathMatchRegularExpression PathMatchType = "RegularExpression"
PathMatchImplementationSpecific PathMatchType = "ImplementationSpecific"
PathMatchExact PathMatchType = "Exact"
PathMatchPrefix PathMatchType = "Prefix"
PathMatchRegularExpression PathMatchType = "RegularExpression"
)

// HTTPPathMatch describes how to select a HTTP route by matching the HTTP request path.
Expand All @@ -237,7 +235,7 @@ type HTTPPathMatch struct {
//
// Support: Core (Exact, Prefix)
//
// Support: Custom (RegularExpression, ImplementationSpecific)
// Support: Custom (RegularExpression)
//
// Since RegularExpression PathType has custom conformance, implementations
// can support POSIX, PCRE or any other dialects of regular expressions.
Expand All @@ -261,16 +259,14 @@ type HTTPPathMatch struct {
//
// * "Exact"
// * "RegularExpression"
// * "ImplementationSpecific"
//
// +kubebuilder:validation:Enum=Exact;RegularExpression;ImplementationSpecific
// +kubebuilder:validation:Enum=Exact;RegularExpression
type HeaderMatchType string

// HeaderMatchType constants.
const (
HeaderMatchExact HeaderMatchType = "Exact"
HeaderMatchRegularExpression HeaderMatchType = "RegularExpression"
HeaderMatchImplementationSpecific HeaderMatchType = "ImplementationSpecific"
HeaderMatchExact HeaderMatchType = "Exact"
HeaderMatchRegularExpression HeaderMatchType = "RegularExpression"
)

// HTTPHeaderName is the name of an HTTP header.
Expand Down Expand Up @@ -298,7 +294,7 @@ type HTTPHeaderMatch struct {
//
// Support: Core (Exact)
//
// Support: Custom (RegularExpression, ImplementationSpecific)
// Support: Custom (RegularExpression)
//
// Since RegularExpression PathType has custom conformance, implementations
// can support POSIX, PCRE or any other dialects of regular expressions.
Expand Down Expand Up @@ -337,16 +333,14 @@ type HTTPHeaderMatch struct {
//
// * "Exact"
// * "RegularExpression"
// * "ImplementationSpecific"
//
// +kubebuilder:validation:Enum=Exact;RegularExpression;ImplementationSpecific
// +kubebuilder:validation:Enum=Exact;RegularExpression
type QueryParamMatchType string

// QueryParamMatchType constants.
const (
QueryParamMatchExact QueryParamMatchType = "Exact"
QueryParamMatchRegularExpression QueryParamMatchType = "RegularExpression"
QueryParamMatchImplementationSpecific QueryParamMatchType = "ImplementationSpecific"
QueryParamMatchExact QueryParamMatchType = "Exact"
QueryParamMatchRegularExpression QueryParamMatchType = "RegularExpression"
)

// HTTPQueryParamMatch describes how to select a HTTP route by matching HTTP
Expand All @@ -356,7 +350,7 @@ type HTTPQueryParamMatch struct {
//
// Support: Extended (Exact)
//
// Support: Custom (RegularExpression, ImplementationSpecific)
// Support: Custom (RegularExpression)
//
// Since RegularExpression QueryParamMatchType has custom conformance,
// implementations can support POSIX, PCRE or any other dialects of regular
Expand Down
31 changes: 14 additions & 17 deletions config/crd/v1alpha2/gateway.networking.k8s.io_httproutes.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7789b91

Please sign in to comment.