8000 v1.14 backports 2024-04-11 by tommyp1ckles · Pull Request #31907 · cilium/cilium · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

v1.14 backports 2024-04-11 #31907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 24, 2024
Merged

v1.14 backports 2024-04-11 #31907

merged 1 commit into from
Apr 24, 2024

Conversation

tommyp1ckles
Copy link
Contributor
@tommyp1ckles tommyp1ckles commented Apr 11, 2024 •
edited
Loading

Once this PR is merged, a GitHub action will update the labels of these PRs:

 31214

@tommyp1ckles
operator: fix errors/warnings metric.
573e815 
[ upstream commit f61651f ]

[ Backporter's notes: Resolved conflict by moving metric register code to old function ]

This was broken during transition of pkg/metrics to integrate with Hive where relevant operator metrics where never initialized.
This adds a init func specific for operator and cleans up the "flush" logic used as a work around for errors/warnings emitted prior to agent starting (in the case of the operator).

Addresses: cilium#29525

Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>
@tommyp1ckles tommyp1ckles requested a review from a team as a code owner April 11, 2024 19:33
@tommyp1ckles tommyp1ckles added kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Apr 11, 2024
@tommyp1ckles tommyp1ckles marked this pull request as draft April 11, 2024 19:40
@tommyp1ckles
Copy link
Contributor Author

/test-backport-v1.14

@tommyp1ckles tommyp1ckles marked this pull request as ready for review April 11, 2024 19:45
@tommyp1ckles
Copy link
Contributor Author

/test-backport-1.14

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 23, 2024
@julianwiedmann julianwiedmann merged commit 824d61d into cilium:v1.14 Apr 24, 2024
This was referenced Apr 29, 2024
Closed
Closed
Closed
Merged
@nebril nebril mentioned this pull request May 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ti-mo ti-mo ti-mo approved these changes

Assignees
No one assigned
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
No open projects
cilium v1.14.11
Status: Released
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tommyp1ckles @ti-mo @julianwiedmann
0