Return success from CNI DEL when IPAMD is unreachable #2350
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
orsenthil
reviewed
Apr 24, 2023
orsenthil
reviewed
Apr 24, 2023
jayanthvn
reviewed
Apr 24, 2023
jayanthvn
reviewed
Apr 24, 2023
jayanthvn
reviewed
Apr 24, 2023
| for _, allocation := range checkpoint.Allocations { | ||
| if err := ds.validateAllocationByPodVethExistence(allocation, hostNSLinks); err != nil { | ||
| ds.log.Warnf("ignore IP allocation for %v:%v,%v due to %v", allocation.ContainerID, allocation.IPv4, allocation.IPv6, err) | ||
| ds.log.Warnf("stale IP allocation for ID(%v): IPv4(%v), IPv6(%v) due to %v", allocation.ContainerID, allocation.IPv4, allocation.IPv6, err) | ||
| staleAllocations = append(staleAllocations, allocation) |
There was a problem hiding this comment.
If we cleanup resources and then call IPAMD then this check wouldn't be needed..
There was a problem hiding this comment.
Right, but we can only do that if the pod was created by v1.12.1+. It would be great to remove this overhead in the future, but in the common case, there should never be any stale allocations to clean up
jayanthvn
reviewed
Apr 24, 2023
orsenthil
reviewed
Apr 24, 2023
jdn5126
force-pushed
the
cni_cleanup
branch
4 times, most recently
from
38f992d to
71df0fd
Compare
M00nF1sh
reviewed
May 1, 2023
M00nF1sh
reviewed
May 1, 2023
jdn5126
force-pushed
the
cni_cleanup
branch
3 times, most recently
from
508364a to
8d448c7
Compare
On IPAMD startup, prune IP rules for stale allocations
M00nF1sh
approved these changes
May 8, 2023
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.
What type of PR is this?
bug
Which issue does this PR fix:
#2331
What does this PR do / Why do we need it:
This PR modifies the VPC CNI pod deletion logic to return no error to the container-runtime when IPAMD is unreachable. This is needed for three primary reasons:
CNI Changes:
As before, the CNI will try to delete non-branch-ENI pods using PrevResult when IPAMD is not reachable. The difference is that CNI will now return no error in this case. Note that PrevResult will only be available for pods created with VPC CNI v1.12.1+. For pods created before this, IP rules will be leaked, and it is IPAMD's responsibility to cleanup these rules when it starts again.
IPAMD Changes:
On init, IPAMD identifies stale allocations and prunes IP rules for these stale allocations. IPAMD cannot be sure if CNI was able to prune those rules before the pod was deleted. Also, IPAMD does an additional state file write after pruning entries.
Misc:
I also did some refactoring of network utilities to avoid code duplication.
If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
N/A
Testing done on this change:
Added unit test coverage for stale IPAM allocations. Manually created a cluster and verified behavior when IPAMD is unreachable, plus upgrade/downgrade scenarios.
Automation added to e2e:
N/A
Will this PR introduce any new dependencies?:
N/A
Will this break upgrades or downgrades. Has updating a running cluster been tested?:
No, Yes
Does this change require updates to the CNI daemonset config files to work?:
No
Does this PR introduce any user-facing change?:
Yes
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.