Skip to content

feat: enhanced subnet discovery rebase from #3380#3463

Merged
haouc merged 22 commits intoaws:masterfrom
haouc:shehbaj/enhanced-subnet-discovery-rebase
Feb 18, 2026
Merged

feat: enhanced subnet discovery rebase from #3380#3463
haouc merged 22 commits intoaws:masterfrom
haouc:shehbaj/enhanced-subnet-discovery-rebase

Conversation

@haouc
Copy link
Copy Markdown
Contributor

@haouc haouc commented Sep 29, 2025

What type of PR is this?

Which issue does this PR fix?:

What does this PR do / Why do we need it?:
The is a feature PR and rebased from #3380

Testing done on this change:

Will this PR introduce any new dependencies?:

Will this break upgrades or downgrades? Has updating a running cluster been tested?:

Does this change require updates to the CNI daemonset config files to work?:

Does this PR introduce any user-facing change?:


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@github-actions
Copy link
Copy Markdown
Contributor

This pull request is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days

@github-actions github-actions Bot added the stale Issue or PR is stale label Nov 29, 2025
@jayanthvn jayanthvn removed the stale Issue or PR is stale label Dec 9, 2025
@haouc haouc force-pushed the shehbaj/enhanced-subnet-discovery-rebase branch 2 times, most recently from b42d116 to e105464 Compare December 29, 2025 23:41
@haouc haouc force-pushed the shehbaj/enhanced-subnet-discovery-rebase branch 4 times, most recently from 1bf9f7a to c4cef04 Compare January 21, 2026 22:33
Copy link
Copy Markdown
Contributor

@Pavani-Panakanti Pavani-Panakanti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the rollback behavior to previous versions which won't have this feature ?

  • Will there be any leaked ENI's that were created in secondary subnets as older version of CNI will not be aware of these ?
  • Will there be any leaked pod ips which were assigned from secondary subnet ENI's ?

Comment thread pkg/awsutils/awsutils.go
Comment thread pkg/awsutils/awsutils.go
Comment thread pkg/awsutils/awsutils.go Outdated
Comment thread pkg/awsutils/awsutils.go Outdated
Comment thread pkg/awsutils/awsutils.go
Comment thread pkg/ipamd/ipamd.go Outdated
Comment thread pkg/ipamd/ipamd.go Outdated
Comment thread pkg/ipamd/ipamd.go
Comment thread pkg/ipamd/ipamd.go
Comment thread pkg/ipamd/datastore/data_store.go
@haouc haouc force-pushed the shehbaj/enhanced-subnet-discovery-rebase branch from c4cef04 to 1ba4da9 Compare January 29, 2026 03:57
@haouc
Copy link
Copy Markdown
Contributor Author

haouc commented Jan 29, 2026

What is the rollback behavior to previous versions which won't have this feature ?

* Will there be any leaked ENI's that were created in secondary subnets as older version of CNI will not be aware of these ?

* Will there be any leaked pod ips which were assigned from secondary subnet ENI's ?

New ENIs have the same tags as today's ENIs and will be cleaned up by sweepers in case of leaking. Rollback will need downgrading the version and recycle nodes.

@haouc haouc force-pushed the shehbaj/enhanced-subnet-discovery-rebase branch 2 times, most recently from 66bdcad to 73a0b46 Compare January 30, 2026 23:05
Comment thread pkg/awsutils/awsutils.go Outdated
@Pavani-Panakanti
Copy link
Copy Markdown
Contributor

Added a comment, rest of the changes looks good to me

@yash97
Copy link
Copy Markdown
Contributor

yash97 commented Feb 5, 2026

can you also refer to this code coverage report https://app.codecov.io/github/aws/amazon-vpc-cni-k8s/pull/3463. I think in awsutils.go there many missed lines. If you have added them do consider adding unit test to them. Lets make sure we atleast cover critical or tricky parts.

@haouc haouc force-pushed the shehbaj/enhanced-subnet-discovery-rebase branch 3 times, most recently from 76ef0ad to b77ecd8 Compare February 16, 2026 17:54
@Pavani-Panakanti
Copy link
Copy Markdown
Contributor

Thanks Hao for the changes !!

@haouc haouc force-pushed the shehbaj/enhanced-subnet-discovery-rebase branch from b77ecd8 to a8d36df Compare February 18, 2026 17:15
@haouc haouc force-pushed the shehbaj/enhanced-subnet-discovery-rebase branch from a8d36df to 8ef611f Compare February 18, 2026 19:50
@haouc haouc merged commit e97bfe7 into aws:master Feb 18, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants