Skip to content

bugfix: EG loglevel error for admin and metrics module#4340

Merged
zirain merged 3 commits intoenvoyproxy:mainfrom
qicz:fix4339
Sep 27, 2024
Merged

bugfix: EG loglevel error for admin and metrics module#4340
zirain merged 3 commits intoenvoyproxy:mainfrom
qicz:fix4339

Conversation

@qicz
Copy link
Copy Markdown
Member

@qicz qicz commented Sep 26, 2024

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #4339

Signed-off-by: qicz <qiczzhu@gmail.com>
@qicz qicz requested a review from a team as a code owner September 26, 2024 15:09
zirain
zirain previously approved these changes Sep 26, 2024
Signed-off-by: qicz <qiczzhu@gmail.com>
@qicz
Copy link
Copy Markdown
Member Author

qicz commented Sep 26, 2024

/retest

@codecov
Copy link
Copy Markdown

codecov bot commented Sep 26, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 65.95%. Comparing base (6eefb28) to head (4dcb615).
Report is 72 commits behind head on main.

Files with missing lines Patch % Lines
internal/metrics/register.go 0.00% 2 Missing ⚠️
internal/admin/server.go 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4340      +/-   ##
==========================================
- Coverage   65.98%   65.95%   -0.04%     
==========================================
  Files         197      197              
  Lines       23964    23965       +1     
==========================================
- Hits        15813    15805       -8     
- Misses       7025     7031       +6     
- Partials     1126     1129       +3     

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

Signed-off-by: qicz <qiczzhu@gmail.com>
@qicz qicz requested a review from arkodg September 26, 2024 23:27
@qicz
Copy link
Copy Markdown
Member Author

qicz commented Sep 27, 2024

/retest

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 !

@zirain zirain merged commit 9b161ee into envoyproxy:main Sep 27, 2024
guydc pushed a commit to guydc/gateway that referenced this pull request Oct 30, 2024
* 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>
guydc added a commit that referenced this pull request Oct 31, 2024
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

EG loglevel error for admin and metrics module

3 participants