fix: ratelimit not working with both headers and cidr matches by shawnh2 · Pull Request #4377 · envoyproxy/gateway

shawnh2 · 2024-10-01T04:22:37Z

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #4351

…for one rule Signed-off-by: shawnh2 <shawnhxh@outlook.com>

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

codecov · 2024-10-01T04:29:09Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.85%. Comparing base (26ec49a) to head (6c2b20f).
Report is 49 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4377      +/-   ##
==========================================
+ Coverage   65.83%   65.85%   +0.01%     
==========================================
  Files         203      203              
  Lines       30699    30700       +1     
==========================================
+ Hits        20212    20216       +4     
+ Misses       9335     9333       -2     
+ Partials     1152     1151       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

internal/xds/translator/ratelimit.go

arkodg

LGTM thanks !

internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml

internal/xds/translator/ratelimit.go

zhaohuabing

LGTM. Thanks for the fix! Could you also modify the headerMatch in the test and add an example in the comment to help future readers to better understand the code?

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

shawnh2 · 2024-10-20T14:48:41Z

/retest

…roxy#4377) * fix ratelimit descriptors do not respect both headers and cidr match for one rule Signed-off-by: shawnh2 <shawnhxh@outlook.com> * fix gen-check and lint Signed-off-by: shawnh2 <shawnhxh@outlook.com> * fix ratelimit e2e test Signed-off-by: shawnh2 <shawnhxh@outlook.com> * add more comment and update test case Signed-off-by: shawnh2 <shawnhxh@outlook.com> --------- Signed-off-by: shawnh2 <shawnhxh@outlook.com> Co-authored-by: Huabing Zhao <zhaohuabing@gmail.com> (cherry picked from commit 66c0b51) Signed-off-by: Guy Daich <guy.daich@sap.com>

* build(deps): bump github.com/docker/docker from 27.2.0+incompatible to 27.3.1+incompatible (#4303) build(deps): bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.2.0+incompatible to 27.3.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v27.2.0...v27.3.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Huabing Zhao <zhaohuabing@gmail.com> (cherry picked from commit cd4e9b1) Signed-off-by: Guy Daich <guy.daich@sap.com> * bugfix: EG loglevel error for admin and metrics module (#4340) * bugfix: EG loglevel error for admin and metrics module Signed-off-by: qicz <qiczzhu@gmail.com> * fix ut Signed-off-by: qicz <qiczzhu@gmail.com> * polish Signed-off-by: qicz <qiczzhu@gmail.com> --------- Signed-off-by: qicz <qiczzhu@gmail.com> (cherry picked from commit 9b161ee) Signed-off-by: Guy Daich <guy.daich@sap.com> * fix: some status updates are discarded by the status updater (#4337) Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com> (cherry picked from commit 14830c7) Signed-off-by: Guy Daich <guy.daich@sap.com> * fix: Unsupported listener protocol type error for nil supportKinds assign gateway status. (#4345) (cherry picked from commit 7babca9) Signed-off-by: Guy Daich <guy.daich@sap.com> * set invalid Listener.SupportedKinds to empty list (#4352) * set invalid Listener.SupportedKinds to empty list Fixes: #4216 Relates to https://kubernetes.slack.com/archives/CR0H13KGA/p1727457195236889 Signed-off-by: Arko Dasgupta <arko@tetrate.io> * lint Signed-off-by: Arko Dasgupta <arko@tetrate.io> --------- Signed-off-by: Arko Dasgupta <arko@tetrate.io> (cherry picked from commit 2fdf069) Signed-off-by: Guy Daich <guy.daich@sap.com> * bugfix: ignore some unnecessary requests to apiserver. (#4362) Signed-off-by: qicz <qiczzhu@gmail.com> Co-authored-by: zirain <zirain2009@gmail.com> (cherry picked from commit fe1e8bd) Signed-off-by: Guy Daich <guy.daich@sap.com> * fix: rateLimitDeployment ignoring pod labels and annotation merge (#4228) * fix labels and annotation merges for rate limit deployment Signed-off-by: Oscar Boher <oscar.boher@scopely.com> * fix tests and label merge Signed-off-by: Oscar Boher <oscar.boher@scopely.com> * fix annotation merge if prometheus was disabled and annotations were defined Signed-off-by: Oscar Boher <oscar.boher@scopely.com> * renamed labels and annotations to specify they apply to pods only Signed-off-by: Oscar Boher <oscar.boher@scopely.com> * linter Signed-off-by: Oscar Boher <oscar.boher@scopely.com> * fix resource provider tests to new annotation behavior Signed-off-by: Oscar Boher <oscar.boher@scopely.com> * go linter Signed-off-by: Oscar Boher <oscar.boher@scopely.com> * fix gen-check Signed-off-by: Oscar Boher <oscar.boher@scopely.com> * pod labels selector comment Signed-off-by: Oscar Boher <oscar.boher@scopely.com> --------- Signed-off-by: Oscar Boher <oscar.boher@scopely.com> Co-authored-by: zirain <zirain2009@gmail.com> Co-authored-by: Arko Dasgupta <arkodg@users.noreply.github.com> (cherry picked from commit cf84927) Signed-off-by: Guy Daich <guy.daich@sap.com> * fix dashboard typos (#4422) Signed-off-by: haorenfsa <haorenfsa@gmail.com> Signed-off-by: Guy Daich <guy.daich@sap.com> * fix: ratelimit not working with both headers and cidr matches (#4377) * fix ratelimit descriptors do not respect both headers and cidr match for one rule Signed-off-by: shawnh2 <shawnhxh@outlook.com> * fix gen-check and lint Signed-off-by: shawnh2 <shawnhxh@outlook.com> * fix ratelimit e2e test Signed-off-by: shawnh2 <shawnhxh@outlook.com> * add more comment and update test case Signed-off-by: shawnh2 <shawnhxh@outlook.com> --------- Signed-off-by: shawnh2 <shawnhxh@outlook.com> Co-authored-by: Huabing Zhao <zhaohuabing@gmail.com> (cherry picked from commit 66c0b51) Signed-off-by: Guy Daich <guy.daich@sap.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Guy Daich <guy.daich@sap.com> Signed-off-by: qicz <qiczzhu@gmail.com> Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com> Signed-off-by: Arko Dasgupta <arko@tetrate.io> Signed-off-by: Oscar Boher <oscar.boher@scopely.com> Signed-off-by: haorenfsa <haorenfsa@gmail.com> Signed-off-by: shawnh2 <shawnhxh@outlook.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Huabing Zhao <zhaohuabing@gmail.com> Co-authored-by: qi <qiczzhu@gmail.com> Co-authored-by: Arko Dasgupta <arkodg@users.noreply.github.com> Co-authored-by: zirain <zirain2009@gmail.com> Co-authored-by: Oscar Boher <oscar.boher@scopely.com> Co-authored-by: shaoyue <haorenfsa@gmail.com> Co-authored-by: sh2 <shawnhxh@outlook.com>

shawnh2 added 3 commits October 1, 2024 12:01

fix ratelimit descriptors do not respect both headers and cidr match …

0b64a6c

…for one rule Signed-off-by: shawnh2 <shawnhxh@outlook.com>

Merge branch 'main' of github.com:envoyproxy/gateway into fix-rl

79aecac

fix gen-check and lint

a5fb19f

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

shawnh2 requested a review from a team as a code owner October 1, 2024 04:22

shawnh2 added 2 commits October 8, 2024 21:52

Merge branch 'main' of github.com:envoyproxy/gateway into fix-rl

36902a4

fix ratelimit e2e test

3760327

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

arkodg reviewed Oct 10, 2024

View reviewed changes

internal/xds/translator/ratelimit.go Show resolved Hide resolved

arkodg reviewed Oct 10, 2024

View reviewed changes

internal/xds/translator/ratelimit.go Outdated Show resolved Hide resolved

arkodg reviewed Oct 10, 2024

View reviewed changes

internal/xds/translator/ratelimit.go Outdated Show resolved Hide resolved

arkodg previously approved these changes Oct 18, 2024

View reviewed changes

arkodg requested review from a team October 18, 2024 02:08

zhaohuabing reviewed Oct 18, 2024

View reviewed changes

internal/xds/translator/testdata/in/ratelimit-config/header-and-cidr-matches.yaml Show resolved Hide resolved

zhaohuabing reviewed Oct 18, 2024

View reviewed changes

internal/xds/translator/ratelimit.go Show resolved Hide resolved

zhaohuabing previously approved these changes Oct 18, 2024

View reviewed changes

shawnh2 added 2 commits October 19, 2024 15:55

add more comment and update test case

53cd6f5

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

resolve conflicts

d7553b3

Signed-off-by: shawnh2 <shawnhxh@outlook.com>

shawnh2 dismissed stale reviews from zhaohuabing and arkodg via d7553b3 October 19, 2024 07:58

shawnh2 requested review from a team, arkodg and zhaohuabing October 19, 2024 07:58

zhaohuabing approved these changes Oct 19, 2024

View reviewed changes

Merge branch 'main' into fix-rl

6c2b20f

arkodg approved these changes Oct 21, 2024

View reviewed changes

arkodg merged commit 66c0b51 into envoyproxy:main Oct 21, 2024

shawnh2 deleted the fix-rl branch October 22, 2024 00:26

arkodg added the cherrypick/release-v1.1.3 label Oct 30, 2024

arkodg mentioned this pull request Oct 30, 2024

Release v1.1.3 cherry-pick #4578

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: ratelimit not working with both headers and cidr matches #4377

fix: ratelimit not working with both headers and cidr matches #4377
arkodg merged 8 commits intoenvoyproxy:mainfrom
shawnh2:fix-rl

shawnh2 commented Oct 1, 2024

Uh oh!

codecov bot commented Oct 1, 2024 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

arkodg left a comment

Uh oh!

Uh oh!

Uh oh!

zhaohuabing left a comment •

edited

Loading

Uh oh!

shawnh2 commented Oct 20, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

shawnh2 commented Oct 1, 2024

Uh oh!

codecov bot commented Oct 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

arkodg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

zhaohuabing left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shawnh2 commented Oct 20, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Oct 1, 2024 •

edited

Loading

zhaohuabing left a comment •

edited

Loading