Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Filter Managed ENI. #2895

Merged
merged 10 commits into from
May 7, 2024
Merged

Filter Managed ENI. #2895

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
844c0aa
Filter Managed ENI.
orsenthil Apr 25, 2024
add21ce
Merge branch 'master' into fix_filter_managed_eni
orsenthil May 1, 2024
0f82f82
Fix go dependency with go-cose library.
orsenthil May 3, 2024
e18739f
Filter Managed ENI.
orsenthil Apr 25, 2024
65a3858
Updated ENI Infos.
orsenthil May 3, 2024
7b3da90
merge
orsenthil May 5, 2024
13da0e0
merge, resolve conflicts.
orsenthil May 5, 2024
30e9324
Fix the mock usage.
orsenthil May 5, 2024
fbf5590
Fix the import order.
orsenthil May 5, 2024
20cf0ac
Fix the unit tests.
orsenthil May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions pkg/awsutils/awsutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,15 +501,7 @@ func (cache *EC2InstanceMetadataCache) RefreshSGIDs(mac string) error {
cache.securityGroups.Set(sgIDs)

if !cache.useCustomNetworking && (addedSGsCount != 0 || deletedSGsCount != 0) {
allENIs, err := cache.GetAttachedENIs()
Copy link
Contributor

Choose a reason for hiding this comment

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

We need to fill the ENIs from datastore, else the eniIDs will always be null

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe this - https://github.com/aws/amazon-vpc-cni-k8s/blob/master/pkg/ipamd/datastore/data_store.go#L1192 or any other get function from datastore. Basically we will just use the ENIs from datastore instead of IMDS to sync SGs.

Copy link
Member Author

Choose a reason for hiding this comment

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

@jayanthvn - I have addressed the review comment, and add the test information. PTAL again. Thanks.

if err != nil {
return errors.Wrap(err, "DescribeAllENIs: failed to get local ENI metadata")
}

var eniIDs []string
for _, eni := range allENIs {
eniIDs = append(eniIDs, eni.ENIID)
}

newENIs := StringSet{}
newENIs.Set(eniIDs)
Expand Down
Loading