Open
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
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?
feature #3564
Which issue does this PR fix?:
This PR addresses the need for customers to attach ENIs from different VPCs to their EC2 instances for pod networking. This enables scenarios where:
What does this PR do / Why do we need it?:
This PR adds multi-VPC ENI support to the AWS VPC CNI plugin, allowing users to specify a target VPC ID in the ENIConfig custom resource. When configured, IPAMD will create ENIs in the specified VPC rather than the instance's primary VPC.
Key changes:
Backward compatibility:
Testing done on this change:
Test scenarios:
Logs and output:
When using multi-VPC configuration:
2026-01-10T...: Using multi-VPC configuration with VPC: vpc-0987654321fedcba
2026-01-10T...: Creating ENI with security groups: [sg-...] in subnet: subnet-... VPC: vpc-0987654321fedcba
2026-01-10T...: DataStore add an ENI eni-xxx in VPC vpc-0987654321fedcba
When vpcId is not specified (default behavior):
2026-01-10T...: Creating ENI with security groups: [sg-...] in subnet: subnet-... VPC: vpc-primaryvpc
Will this PR introduce any new dependencies?:
AWS API calls:
No new external dependencies - uses existing IMDS client and EC2 API interfaces.
Will this break upgrades or downgrades? Has updating a running cluster been tested?:
No breaking changes.
Upgrade path (existing cluster → new version):
Downgrade path (new version → previous version):
Cluster update testing:
Does this change require updates to the CNI daemonset config files to work?:
No. This change is fully backward compatible and works with a simple image update via kubectl patch or rolling daemonset update. The new vpcId field is optional and only needs to be added to ENIConfig custom resources if users want to enable multi-VPC functionality.
Does this PR introduce any user-facing change?:
Yes. Users can now specify a VPC ID in their ENIConfig resources to create ENIs in different VPCs.
Added multi-VPC ENI support: ENIConfig custom resource now accepts an optional
vpcIdfield to create ENIs in VPCs different from the instance's primary VPC. This enables cross-VPC pod networking scenarios for multi-tenant and hybrid architectures. The field is optional and defaults to the instance's VPC for backward compatibility. Seeexamples/eniconfig-multi-vpc.yamlfor configuration examples.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.