Skip to content

Release v1.1.3 cherry-pick#4578

Merged
guydc merged 10 commits intoenvoyproxy:release/v1.1from
guydc:release-v1-1-3-cp
Oct 31, 2024
Merged

Release v1.1.3 cherry-pick#4578
guydc merged 10 commits intoenvoyproxy:release/v1.1from
guydc:release-v1-1-3-cp

Conversation

@guydc
Copy link
Copy Markdown
Contributor

@guydc guydc commented Oct 30, 2024

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Release Notes: Yes/No

dependabot bot and others added 8 commits October 30, 2024 13:46
…o 27.3.1+incompatible (envoyproxy#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

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>
…oxy#4337)

Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
(cherry picked from commit 14830c7)
Signed-off-by: Guy Daich <guy.daich@sap.com>
…sign gateway status. (envoyproxy#4345)

(cherry picked from commit 7babca9)
Signed-off-by: Guy Daich <guy.daich@sap.com>
* set invalid Listener.SupportedKinds to empty list

Fixes: envoyproxy#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>
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>
…voyproxy#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>
Signed-off-by: haorenfsa <haorenfsa@gmail.com>
Signed-off-by: Guy Daich <guy.daich@sap.com>
@guydc guydc requested a review from a team as a code owner October 30, 2024 18:49
@arkodg
Copy link
Copy Markdown
Contributor

arkodg commented Oct 30, 2024

thanks @guydc can we also cherry-pick #4377 in ?

@codecov
Copy link
Copy Markdown

codecov bot commented Oct 30, 2024

Codecov Report

Attention: Patch coverage is 80.28169% with 28 lines in your changes missing coverage. Please review.

Project coverage is 66.61%. Comparing base (f0f2275) to head (8eb531f).
Report is 1 commits behind head on release/v1.1.

Files with missing lines Patch % Lines
...tructure/kubernetes/ratelimit/resource_provider.go 61.29% 10 Missing and 2 partials ⚠️
...ternal/infrastructure/kubernetes/infra_resource.go 81.25% 4 Missing and 2 partials ⚠️
...frastructure/kubernetes/proxy/resource_provider.go 81.81% 5 Missing and 1 partial ⚠️
internal/metrics/register.go 0.00% 3 Missing ⚠️
internal/admin/server.go 50.00% 1 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release/v1.1    #4578      +/-   ##
================================================
- Coverage         66.99%   66.61%   -0.38%     
================================================
  Files               183      183              
  Lines             28038    28112      +74     
================================================
- Hits              18783    18727      -56     
- Misses             8168     8298     +130     
  Partials           1087     1087              

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

…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>
@guydc guydc force-pushed the release-v1-1-3-cp branch from 7339a2a to 828ab6c Compare October 31, 2024 20:04
@guydc
Copy link
Copy Markdown
Contributor Author

guydc commented Oct 31, 2024

Copy link
Copy Markdown
Contributor

@arkodg arkodg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks !

@guydc guydc merged commit 13fee13 into envoyproxy:release/v1.1 Oct 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants