v1.17 Backports 2025-05-28 #39765
Merged
v1.17 Backports 2025-05-28 #39765
Conversation
This file contains hidden or 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
[ upstream commit 0b6adf6 ] In #35298 endpoints got the parentIfIndex field to store the parent interface index, which is used to ensure endpoint traffic is routed out of the parent interface when set. This interface index is given to the agent by the CNI plugin and stored in the endpoint object. However, when the agent is restarted, it has to restore endpoint state from disk. The parentIfIndex field was not being stored or restored, so after a restart the parentIfIndex would be set to 0, which would cause the agent to not route traffic out of the parent interface. This commit adds the parentIfIndex field to the endpoint state serialization and deserialization process, so that it is stored and restored correctly. Signed-off-by: Dylan Reimerink <dylan.reimerink@isovalent.com> Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
[ upstream commit 9f73dd2 ] When converting a CIDR match to labels, we expand the zero-prefix (0.0.0.0/0) match to both the cidr and the `reserved:world` label. (This is because the world identities don't have CIDR labels.) However, a refactor broke this for CIDRRule entries, which should otherwise work the same. Fixes: 481ed87 Fixes: #39656 Signed-off-by: Casey Callendrello <cdc@isovalent.com> Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
squeed
approved these changes
May 28, 2025
|
/test |
dylandreimerink
approved these changes
May 28, 2025
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.
Once this PR is merged, a GitHub action will update the labels of these PRs: