Fix issues with handling unmanaged ENIs with IPv6 only #3122
+90
−25
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?:
We have unmanaged trunk ENIs attached to our worker nodes which are designed for ipv6 only networks. These ENIs are tagged with
node.k8s.amazonaws.com/no_manage
, however the listing of attached ENIs happens before the IPAMD process filters those ENIs. As such, the metadata retrieval process fails when looking up the ipv4 address details for these ENIs, and causes theaws-k8s-agent
process to exit with an initialization failure.In this log,
eni-084b51xxxxxx
/0e:7c:f9:xx:xx:xx
is the aws-vpc-cni managed ENI, andeni-0b2cf8b6xxxxxx
/0e:f3:73:xx:xx:xx
is our managed eni:What does this PR do / Why do we need it?:
This PR:
trunk
ENI by only including enis with IPv4 addresses (this isn't much better than the currentselect any trunk
logic, but gets around the issue for now)Testing done on this change:
Added unit tests to cover the new paths. Running in our EKS cluster the ENIs are now retrieved successfully (In this log,
eni-084b51xxxxxx
/0e:7c:f9:xx:xx:xx
is the aws-vpc-cni managed ENI, andeni-0b2cf8b6xxxxxx
/0e:f3:73:xx:xx:xx
is our managed eni):Will this PR introduce any new dependencies?:
n/a
Will this break upgrades or downgrades? Has updating a running cluster been tested?:
Tested with upgrading inplace without issues
Does this change require updates to the CNI daemonset config files to work?:
n/a
Does this PR introduce any user-facing change?:
n/a
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.