-
Notifications
You must be signed in to change notification settings - Fork 360
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(translator): support disabling X-RateLimit headers (#3397)
* feat(translator): support disabling X-RateLimit headers Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> * bad copypasta Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> * use ClientTrafficPolicy.Spec.Headers Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> * add test case Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> * add test case in internal/gatewayapi/testdata Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> * missing translation from CTP to IR Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> * fix docs Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> * e2e test Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> * e2e test Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> --------- Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com> Co-authored-by: Guy Daich <guy.daich@sap.com>
- Loading branch information
Showing
16 changed files
with
666 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.in.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| clientTrafficPolicies: | ||
| - apiVersion: gateway.envoyproxy.io/v1alpha1 | ||
| kind: ClientTrafficPolicy | ||
| metadata: | ||
| namespace: envoy-gateway | ||
| name: target-gateway-1 | ||
| spec: | ||
| headers: | ||
| enableEnvoyHeaders: true | ||
| disableRateLimitHeaders: true | ||
| targetRef: | ||
| group: gateway.networking.k8s.io | ||
| kind: Gateway | ||
| name: gateway-1 | ||
| gateways: | ||
| - apiVersion: gateway.networking.k8s.io/v1 | ||
| kind: Gateway | ||
| metadata: | ||
| namespace: envoy-gateway | ||
| name: gateway-1 | ||
| spec: | ||
| gatewayClassName: envoy-gateway-class | ||
| listeners: | ||
| - name: http-1 | ||
| protocol: HTTP | ||
| port: 80 | ||
| allowedRoutes: | ||
| namespaces: | ||
| from: Same | ||
| - name: http-2 | ||
| protocol: HTTP | ||
| port: 8080 | ||
| allowedRoutes: | ||
| namespaces: | ||
| from: Same |
154 changes: 154 additions & 0 deletions
154
internal/gatewayapi/testdata/clienttrafficpolicy-ratelimitheaders.out.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| clientTrafficPolicies: | ||
| - apiVersion: gateway.envoyproxy.io/v1alpha1 | ||
| kind: ClientTrafficPolicy | ||
| metadata: | ||
| creationTimestamp: null | ||
| name: target-gateway-1 | ||
| namespace: envoy-gateway | ||
| spec: | ||
| headers: | ||
| disableRateLimitHeaders: true | ||
| enableEnvoyHeaders: true | ||
| targetRef: | ||
| group: gateway.networking.k8s.io | ||
| kind: Gateway | ||
| name: gateway-1 | ||
| status: | ||
| ancestors: | ||
| - ancestorRef: | ||
| group: gateway.networking.k8s.io | ||
| kind: Gateway | ||
| name: gateway-1 | ||
| namespace: envoy-gateway | ||
| conditions: | ||
| - lastTransitionTime: null | ||
| message: Policy has been accepted. | ||
| reason: Accepted | ||
| status: "True" | ||
| type: Accepted | ||
| controllerName: gateway.envoyproxy.io/gatewayclass-controller | ||
| gateways: | ||
| - apiVersion: gateway.networking.k8s.io/v1 | ||
| kind: Gateway | ||
| metadata: | ||
| creationTimestamp: null | ||
| name: gateway-1 | ||
| namespace: envoy-gateway | ||
| spec: | ||
| gatewayClassName: envoy-gateway-class | ||
| listeners: | ||
| - allowedRoutes: | ||
| namespaces: | ||
| from: Same | ||
| name: http-1 | ||
| port: 80 | ||
| protocol: HTTP | ||
| - allowedRoutes: | ||
| namespaces: | ||
| from: Same | ||
| name: http-2 | ||
| port: 8080 | ||
| protocol: HTTP | ||
| status: | ||
| listeners: | ||
| - attachedRoutes: 0 | ||
| conditions: | ||
| - lastTransitionTime: null | ||
| message: Sending translated listener configuration to the data plane | ||
| reason: Programmed | ||
| status: "True" | ||
| type: Programmed | ||
| - lastTransitionTime: null | ||
| message: Listener has been successfully translated | ||
| reason: Accepted | ||
| status: "True" | ||
| type: Accepted | ||
| - lastTransitionTime: null | ||
| message: Listener references have been resolved | ||
| reason: ResolvedRefs | ||
| status: "True" | ||
| type: ResolvedRefs | ||
| name: http-1 | ||
| supportedKinds: | ||
| - group: gateway.networking.k8s.io | ||
| kind: HTTPRoute | ||
| - group: gateway.networking.k8s.io | ||
| kind: GRPCRoute | ||
| - attachedRoutes: 0 | ||
| conditions: | ||
| - lastTransitionTime: null | ||
| message: Sending translated listener configuration to the data plane | ||
| reason: Programmed | ||
| status: "True" | ||
| type: Programmed | ||
| - lastTransitionTime: null | ||
| message: Listener has been successfully translated | ||
| reason: Accepted | ||
| status: "True" | ||
| type: Accepted | ||
| - lastTransitionTime: null | ||
| message: Listener references have been resolved | ||
| reason: ResolvedRefs | ||
| status: "True" | ||
| type: ResolvedRefs | ||
| name: http-2 | ||
| supportedKinds: | ||
| - group: gateway.networking.k8s.io | ||
| kind: HTTPRoute | ||
| - group: gateway.networking.k8s.io | ||
| kind: GRPCRoute | ||
| infraIR: | ||
| envoy-gateway/gateway-1: | ||
| proxy: | ||
| listeners: | ||
| - address: null | ||
| name: envoy-gateway/gateway-1/http-1 | ||
| ports: | ||
| - containerPort: 10080 | ||
| name: http-80 | ||
| protocol: HTTP | ||
| servicePort: 80 | ||
| - address: null | ||
| name: envoy-gateway/gateway-1/http-2 | ||
| ports: | ||
| - containerPort: 8080 | ||
| name: http-8080 | ||
| protocol: HTTP | ||
| servicePort: 8080 | ||
| metadata: | ||
| labels: | ||
| gateway.envoyproxy.io/owning-gateway-name: gateway-1 | ||
| gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway | ||
| name: envoy-gateway/gateway-1 | ||
| xdsIR: | ||
| envoy-gateway/gateway-1: | ||
| accessLog: | ||
| text: | ||
| - path: /dev/stdout | ||
| http: | ||
| - address: 0.0.0.0 | ||
| headers: | ||
| disableRateLimitHeaders: true | ||
| enableEnvoyHeaders: true | ||
| withUnderscoresAction: RejectRequest | ||
| hostnames: | ||
| - '*' | ||
| isHTTP2: false | ||
| name: envoy-gateway/gateway-1/http-1 | ||
| path: | ||
| escapedSlashesAction: UnescapeAndRedirect | ||
| mergeSlashes: true | ||
| port: 10080 | ||
| - address: 0.0.0.0 | ||
| headers: | ||
| disableRateLimitHeaders: true | ||
| enableEnvoyHeaders: true | ||
| withUnderscoresAction: RejectRequest | ||
| hostnames: | ||
| - '*' | ||
| isHTTP2: false | ||
| name: envoy-gateway/gateway-1/http-2 | ||
| path: | ||
| escapedSlashesAction: UnescapeAndRedirect | ||
| mergeSlashes: true | ||
| port: 8080 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
internal/xds/translator/testdata/in/xds-ir/ratelimit-disable-headers.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| http: | ||
| - name: "first-listener" | ||
| address: "0.0.0.0" | ||
| port: 10080 | ||
| hostnames: | ||
| - "*" | ||
| path: | ||
| mergeSlashes: true | ||
| escapedSlashesAction: UnescapeAndRedirect | ||
| headers: | ||
| disableRateLimitHeaders: true | ||
| routes: | ||
| - name: "first-route" | ||
| hostname: "*" | ||
| traffic: | ||
| rateLimit: | ||
| global: | ||
| rules: | ||
| - headerMatches: | ||
| - name: "x-user-id" | ||
| exact: "one" | ||
| limit: | ||
| requests: 5 | ||
| unit: second | ||
| pathMatch: | ||
| exact: "foo/bar" | ||
| destination: | ||
| name: "first-route-dest" | ||
| settings: | ||
| - endpoints: | ||
| - host: "1.2.3.4" | ||
| port: 50000 | ||
| - name: "second-route" | ||
| hostname: "*" | ||
| traffic: | ||
| rateLimit: | ||
| global: | ||
| rules: | ||
| - headerMatches: | ||
| - name: "x-user-id" | ||
| distinct: true | ||
| limit: | ||
| requests: 5 | ||
| unit: second | ||
| pathMatch: | ||
| exact: "example" | ||
| destination: | ||
| name: "second-route-dest" | ||
| settings: | ||
| - endpoints: | ||
| - host: "1.2.3.4" | ||
| port: 50000 | ||
| - name: "third-route" | ||
| hostname: "*" | ||
| traffic: | ||
| rateLimit: | ||
| global: | ||
| rules: | ||
| - limit: | ||
| requests: 5 | ||
| unit: second | ||
| pathMatch: | ||
| exact: "test" | ||
| destination: | ||
| name: "third-route-dest" | ||
| settings: | ||
| - endpoints: | ||
| - host: "1.2.3.4" | ||
| port: 50000 |
Oops, something went wrong.