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

Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,6 @@ replace golang.org/x/crypto => golang.org/x/crypto v0.17.0

// Cannot be removed until all dependencies use net library v0.23.0 or higher
replace golang.org/x/net => golang.org/x/net v0.23.0

// Version of go-cose v1.2.0 and v1.2.1 have been deprecated in favor v1.1.0
replace github.com/veraison/go-cose => github.com/veraison/go-cose v1.1.0
Copy link
Member Author

Choose a reason for hiding this comment

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

This is a dependency update, it was required to use with my editor to find dependencies correctly. I can bring it separately (or with this PR itself). #2905

16 changes: 8 additions & 8 deletions pkg/awsutils/awsutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import (
"sync"
"time"

"github.com/aws/amazon-vpc-cni-k8s/pkg/ipamd/datastore"

"github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils/awssession"
"github.com/aws/amazon-vpc-cni-k8s/pkg/ec2wrapper"
"github.com/aws/amazon-vpc-cni-k8s/pkg/utils/eventrecorder"
Expand Down Expand Up @@ -168,7 +170,7 @@ type APIs interface {
IsPrimaryENI(eniID string) bool

//RefreshSGIDs
RefreshSGIDs(mac string) error
RefreshSGIDs(mac string, store *datastore.DataStore) error

//GetInstanceHypervisorFamily returns the hypervisor family for the instance
GetInstanceHypervisorFamily() string
Expand Down Expand Up @@ -474,7 +476,7 @@ func (cache *EC2InstanceMetadataCache) initWithEC2Metadata(ctx context.Context)
}

// RefreshSGIDs retrieves security groups
func (cache *EC2InstanceMetadataCache) RefreshSGIDs(mac string) error {
func (cache *EC2InstanceMetadataCache) RefreshSGIDs(mac string, store *datastore.DataStore) error {
ctx := context.TODO()

sgIDs, err := cache.imds.GetSecurityGroupIDs(ctx, mac)
Expand All @@ -501,14 +503,12 @@ 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")
}
eniInfos := store.GetENIInfos()

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

for eniID := range eniInfos.ENIs {
eniIDs = append(eniIDs, eniID)
}

newENIs := StringSet{}
Expand Down
10 changes: 6 additions & 4 deletions pkg/awsutils/mocks/awsutils_mocks.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/ipamd/ipamd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,14 +507,14 @@ func (c *IPAMContext) nodeInit() error {
// 1. after managed/unmanaged ENIs have been determined
// 2. before any new ENIs are attached
if c.enableIPv4 && !c.disableENIProvisioning {
if err := c.awsClient.RefreshSGIDs(primaryENIMac); err != nil {
if err := c.awsClient.RefreshSGIDs(primaryENIMac, c.dataStore); err != nil {
return err
}

// Refresh security groups and VPC CIDR blocks in the background
// Ignoring errors since we will retry in 30s
go wait.Forever(func() {
c.awsClient.RefreshSGIDs(primaryENIMac)
c.awsClient.RefreshSGIDs(primaryENIMac, c.dataStore)
}, 30*time.Second)
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/ipamd/ipamd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func TestNodeInit(t *testing.T) {
m.network.EXPECT().SetupHostNetwork(cidrs, "", &primaryIP, false, true, false).Return(nil)
m.network.EXPECT().CleanUpStaleAWSChains(true, false).Return(nil)
m.awsutils.EXPECT().GetPrimaryENI().AnyTimes().Return(primaryENIid)
m.awsutils.EXPECT().RefreshSGIDs(gomock.Any()).AnyTimes().Return(nil)
m.awsutils.EXPECT().RefreshSGIDs(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)

eniMetadataSlice := []awsutils.ENIMetadata{eni1, eni2}
resp := awsutils.DescribeAllENIsResult{
Expand Down Expand Up @@ -243,7 +243,7 @@ func TestNodeInitwithPDenabledIPv4Mode(t *testing.T) {
m.network.EXPECT().SetupHostNetwork(cidrs, "", &primaryIP, false, true, false).Return(nil)
m.network.EXPECT().CleanUpStaleAWSChains(true, false).Return(nil)
m.awsutils.EXPECT().GetPrimaryENI().AnyTimes().Return(primaryENIid)
m.awsutils.EXPECT().RefreshSGIDs(gomock.Any()).AnyTimes().Return(nil)
m.awsutils.EXPECT().RefreshSGIDs(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)

eniMetadataSlice := []awsutils.ENIMetadata{eni1, eni2}
resp := awsutils.DescribeAllENIsResult{
Expand Down
Loading