v1.14 Backports 2024-03-25 #31585
Merged
v1.14 Backports 2024-03-25 #31585
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maintainer-s-little-helper
bot
added
backport/1.14
|
/test-backport-1.14 |
gandro
requested changes
Mar 25, 2024
[upstream commit a0ba133] This commit adds and implements a new endpoint batch deletion request. This allows the deletion of all endpoints associated with a particular containerID, which simplifies the CNI DEL logic for the CNI plugin if more than one endpoint are attached to a particular container. Co-authored-by: Tobias Klauser <tobias@isovalent.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Tobias Klauser <tobias@isovalent.com>
[upstream commit 7666581] This commit adds support for the batch delete API call in the endpoint deletion queue. The endpoint deletion queue is used to enqueue endpoint deletion requests in CNI DEL when cilium-agent is unavailable. Support for batch deletion in the deletion queue is particularly important, because if cilium-agent is unavailable, we cannot query it for endpoints which belong to a particular container. Before this commit, a endpoint deletion queue entry just contained a string that represented a unique endpoint identifier. To support more flexible batch deletion requests, we now instead serialize the full HTTP API `EndpointDeleteRequest` as JSON. The new format is more flexible, as it allows us to add more fields in the future. The old format (the endpoint ID as a plain string) is still supported for backwards-compatibility. Co-authored-by: Tobias Klauser <tobias@isovalent.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Tobias Klauser <tobias@isovalent.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
force-pushed
the
tam/backport-27351-1.14
branch
from
1d6a656
to
bdbf963
Compare
|
/test-backport-1.14 |
gandro
approved these changes
Mar 27, 2024
tklauser
approved these changes
Mar 27, 2024
There was a problem hiding this comment.
The PR description mentions that there were several conflicts but the commit messages don't contain any backporter notes section mentioning how they were resolved. If you recall the resolutions, would you mind adding a small section to each commit?
The changes themselves look good to me.
sayboras
added
the
ready-to-merge
squeed
approved these changes
Mar 28, 2024
maintainer-s-little-helper
bot
removed
the
ready-to-merge
learnitall
approved these changes
Mar 28, 2024
maintainer-s-little-helper
bot
added
the
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cni: Use batch endpoint deletion API in chaining plugin #31456 (@sayboras )it's not required anymoreOnce this PR is merged, a GitHub action will update the labels of these PRs: