Automated cherry pick of #3467: Fix duplicate IP case for NetworkPolicy #3475
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
After a Node restarts, IP allocation storage used by host-local plugin is reset and all Pods on the Node will be recreated. It could happen that two Pods have same IP in K8s API if the Pod previously owning the IP hasn't been recreated and another Pod gets the IP assigned when it's recreated. This leads to an issue in NetworkPolicy as it calculated IPs to add and remove by getting added and removed Pods first, then getting IPs from the Pods. NetworkPolicy rule reconciler didn't handle this case correctly as it calculated added and removed Pods first, then got IPs to add and remove from the added and removed Pods. For example, if both Pod A and Pod B have IP 1.1.1.1, removing Pod B would cause IP 1.1.1.1 to be removed from dataplane. This patch changes to calculate IPs to add and remove based on the difference between the old IPs and the new IPs directly. Signed-off-by: Quan Tian <[email protected]>
tnqn
added
the
kind/cherry-pick
Codecov Report
@@ Coverage Diff @@
## release-1.2 #3475 +/- ##
================================================
+ Coverage 42.86% 60.71% +17.84%
================================================
Files 146 285 +139
Lines 18351 22432 +4081
================================================
+ Hits 7866 13619 +5753
+ Misses 9782 7376 -2406
- Partials 703 1437 +734
Flags with carried forward coverage won't be shown. Click here to find out more.
|
|
/test-all |
xliuxu
approved these changes
Mar 18, 2022
|
The e2e failure is caused by unrelated test cases |
|
/skip-e2e |
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.
Cherry pick of #3467 on release-1.2.
#3467: Fix duplicate IP case for NetworkPolicy
For details on the cherry pick process, see the cherry pick requests page.