[ipam/eni] Wait for ENI interface before CNI ADD route setup - #677
Closed
jaredledvina wants to merge 1 commit into
Closed
[ipam/eni] Wait for ENI interface before CNI ADD route setup#677jaredledvina wants to merge 1 commit into
jaredledvina wants to merge 1 commit into
Conversation
Signed-off-by: Jared Ledvina <jared.ledvina@datadoghq.com> (cherry picked from commit fe893a6) Signed-off-by: Jared Ledvina <jared.ledvina@datadoghq.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Backport of the ENI ifindex-by-MAC race fix onto
v1.19-dd. During CNI ADD on ENI IPAM, the plugin resolves the parent interface index by MAC before setting up masquerade reply routing; if the ENI netlink interface has not appeared yet, this silently leavesParentInterfaceIndexat 0 and breaks IPv4 masquerade routing. This waits (bounded backoff) for the ENI interface to appear before resolving the ifindex and before per-endpoint route setup.Resolved against the
v1.19-ddcode structure, where the masquerade ifindex logic lives inplugins/cilium-cni/cmd/endpoint.gorather thancmd.go.See #675 for full context and review discussion.