Skip to content
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.

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

[v1.14] Author Backport of #31380 #31656

Merged
merged 1 commit into from Apr 5, 2024

Conversation

marseel
Copy link
Contributor

@marseel marseel commented Mar 28, 2024

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

 31380

[ upstream commit c198503 ]

[ backporter's note: allocateIDForNode no longer returns error ]

When we run out of IDs to allocate for nodes, we were propagating zero
ID to bpf map.
Now we just simply return error and not modify bpf map instead.
Also clean up incorrectly mapped nodeids on startup in case that
happened.

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
@marseel marseel 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 Mar 28, 2024
@marseel marseel requested a review from a team as a code owner March 28, 2024 13:27
@marseel
Copy link
Contributor Author

marseel commented Mar 28, 2024

/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 5, 2024
@julianwiedmann julianwiedmann merged commit 20c2cc5 into cilium:v1.14 Apr 5, 2024
59 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants