From 89bc60af3af8bb94705db47393115ed6321b4574 Mon Sep 17 00:00:00 2001 From: Harry Bagdi Date: Tue, 13 Jul 2021 16:53:37 -0700 Subject: [PATCH] fix support level for HTTPRequestHeaderFilter As noted in #655, a core filter with extended support fields is confusing and also seems to be incorrect. This patch drops the extended field from the filter and is a partial fix for the referenced issue. HTTPRequestMirroFilter has not been patch as GEP-718 could potentially simplify that. --- apis/v1alpha2/httproute_types.go | 6 ------ .../bases/gateway.networking.k8s.io_httproutes.yaml | 13 ++++++------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/apis/v1alpha2/httproute_types.go b/apis/v1alpha2/httproute_types.go index 3ae8d5c916..6c43a0933a 100644 --- a/apis/v1alpha2/httproute_types.go +++ b/apis/v1alpha2/httproute_types.go @@ -606,8 +606,6 @@ type HTTPRequestHeaderFilter struct { // GET /foo HTTP/1.1 // my-header: bar // - // Support: Extended - // // +optional Set []HTTPHeader `json:"set,omitempty"` @@ -627,8 +625,6 @@ type HTTPRequestHeaderFilter struct { // my-header: foo // my-header: bar // - // Support: Extended - // // +optional Add []HTTPHeader `json:"add,omitempty"` @@ -650,8 +646,6 @@ type HTTPRequestHeaderFilter struct { // GET /foo HTTP/1.1 // my-header2: bar // - // Support: Extended - // // +optional // +kubebuilder:validation:MaxItems=16 Remove []string `json:"remove,omitempty"` diff --git a/config/crd/bases/gateway.networking.k8s.io_httproutes.yaml b/config/crd/bases/gateway.networking.k8s.io_httproutes.yaml index ecc580435e..0096294b04 100644 --- a/config/crd/bases/gateway.networking.k8s.io_httproutes.yaml +++ b/config/crd/bases/gateway.networking.k8s.io_httproutes.yaml @@ -217,7 +217,7 @@ spec: name. \n Input: GET /foo HTTP/1.1 my-header: foo \n Config: add: {\"my-header\": \"bar\"} \n Output: GET /foo HTTP/1.1 my-header: foo my-header: - bar \n Support: Extended" + bar" items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. @@ -255,8 +255,7 @@ spec: \n Input: GET /foo HTTP/1.1 my-header1: foo \ my-header2: bar my-header3: baz \n Config: \ remove: [\"my-header1\", \"my-header3\"] \n Output: - \ GET /foo HTTP/1.1 my-header2: bar \n Support: - Extended" + \ GET /foo HTTP/1.1 my-header2: bar" items: type: string maxItems: 16 @@ -266,7 +265,7 @@ spec: given header (name, value) before the action. \n Input: GET /foo HTTP/1.1 my-header: foo \n Config: \ set: {\"my-header\": \"bar\"} \n Output: GET - /foo HTTP/1.1 my-header: bar \n Support: Extended" + /foo HTTP/1.1 my-header: bar" items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC 7230. @@ -519,7 +518,7 @@ spec: HTTP/1.1 my-header: foo \n Config: add: {\"my-header\": \"bar\"} \n Output: GET /foo HTTP/1.1 my-header: foo my-header: - bar \n Support: Extended" + bar" items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC @@ -561,7 +560,7 @@ spec: foo my-header2: bar my-header3: baz \n Config: remove: [\"my-header1\", \"my-header3\"] \n Output: GET /foo HTTP/1.1 my-header2: - bar \n Support: Extended" + bar" items: type: string maxItems: 16 @@ -572,7 +571,7 @@ spec: action. \n Input: GET /foo HTTP/1.1 my-header: foo \n Config: set: {\"my-header\": \"bar\"} \n Output: GET /foo HTTP/1.1 my-header: - bar \n Support: Extended" + bar" items: description: HTTPHeader represents an HTTP Header name and value as defined by RFC