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

Remove references to unused metadata owner-id #1111

Merged
merged 1 commit into from
Aug 4, 2020
Merged

Remove references to unused metadata owner-id #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions pkg/awsutils/awsutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ const (
maxENIEC2APIRetries = 12
maxENIBackoffDelay = time.Minute
eniDescriptionPrefix = "aws-K8S-"
metadataOwnerID = "/owner-id"

// AllocENI need to choose a first free device number between 0 and maxENI
maxENIs = 128
Expand Down Expand Up @@ -171,7 +170,6 @@ type EC2InstanceMetadataCache struct {
primaryENImac string
availabilityZone string
region string
accountID string

ec2Metadata ec2metadata.EC2Metadata
ec2SVC ec2wrapper.EC2
Expand Down Expand Up @@ -458,17 +456,6 @@ func (cache *EC2InstanceMetadataCache) setPrimaryENI() error {
}
log.Debugf("Found device-number: %d ", deviceNum)

if cache.accountID == "" {
ownerID, err := cache.ec2Metadata.GetMetadata(metadataMACPath + eniMAC + metadataOwnerID)
if err != nil {
awsAPIErrInc("GetMetadata", err)
log.Errorf("Failed to retrieve owner ID from instance metadata %v", err)
return errors.Wrap(err, "set primary ENI: failed to retrieve ownerID")
}
log.Debugf("Found account ID: %s", ownerID)
cache.accountID = ownerID
}

eni, err := cache.ec2Metadata.GetMetadata(metadataMACPath + eniMAC + metadataInterface)
if err != nil {
awsAPIErrInc("GetMetadata", err)
Expand Down
31 changes: 6 additions & 25 deletions pkg/awsutils/awsutils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ const (
subnetID = "subnet-6b245523"
vpcCIDR = "10.0.0.0/16"
subnetCIDR = "10.0.1.0/24"
accountID = "694065802095"
primaryeniID = "eni-00000000"
eniID = "eni-5731da78"
eniAttachID = "eni-attach-beb21856"
Expand All @@ -55,7 +54,6 @@ const (
eni2PrivateIP = "10.0.0.2"
eni2AttachID = "eni-attach-fafdfafd"
eni2ID = "eni-12341234"
ownerID = "i-0946d8a24922d2852"
)

func setup(t *testing.T) (*gomock.Controller,
Expand All @@ -82,7 +80,6 @@ func TestInitWithEC2metadata(t *testing.T) {
mockMetadata.EXPECT().GetMetadata(metadataMAC).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataDeviceNum).Return(eni1Device, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataOwnerID).Return("1234", nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataInterface).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataSGs).Return(sgs, nil).AnyTimes()
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataSubnetID).Return(subnetID, nil).AnyTimes()
Expand Down Expand Up @@ -113,7 +110,6 @@ func TestInitWithEC2metadataSubnetErr(t *testing.T) {
mockMetadata.EXPECT().GetMetadata(metadataMAC).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataDeviceNum).Return(eni1Device, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataOwnerID).Return("1234", nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataInterface).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataSubnetID).Return(subnetID, errors.New("Error on Subnet"))

Expand All @@ -135,7 +131,6 @@ func TestInitWithEC2metadataSGErr(t *testing.T) {
mockMetadata.EXPECT().GetMetadata(metadataMAC).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataDeviceNum).Return(eni1Device, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataOwnerID).Return("1234", nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataInterface).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataSubnetID).Return(subnetID, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataSGs).Return(sgs, errors.New("Error on SG"))
Expand Down Expand Up @@ -230,7 +225,6 @@ func TestSetPrimaryENs(t *testing.T) {

gomock.InOrder(
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataDeviceNum).Return(eni1Device, nil),
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataOwnerID).Return(ownerID, nil),
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataInterface).Return(primaryeniID, nil),
)

Expand Down Expand Up @@ -282,13 +276,11 @@ func TestAWSGetFreeDeviceNumberNoDevice(t *testing.T) {

// test no free index
ec2ENIs := make([]*ec2.InstanceNetworkInterface, 0)
ownerID := accountID

for i := 0; i < maxENIs; i++ {
var deviceNums [maxENIs]int64
deviceNums[i] = int64(i)
ec2ENI := &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNums[i]},
OwnerId: &ownerID}
ec2ENI := &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNums[i]}}
ec2ENIs = append(ec2ENIs, ec2ENI)
}
result := &ec2.DescribeInstancesOutput{
Expand Down Expand Up @@ -419,7 +411,6 @@ func TestTagEni(t *testing.T) {
mockMetadata.EXPECT().GetMetadata(metadataMAC).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataDeviceNum).Return(eni1Device, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataOwnerID).Return("1234", nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataInterface).Return(primaryMAC, nil)
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataSGs).Return(sgs, nil).AnyTimes()
mockMetadata.EXPECT().GetMetadata(metadataMACPath+primaryMAC+metadataSubnetID).Return(subnetID, nil)
Expand Down Expand Up @@ -497,15 +488,11 @@ func TestAllocENI(t *testing.T) {
// 2 ENIs, uses device number 0 3, expect to find free at 1
ec2ENIs := make([]*ec2.InstanceNetworkInterface, 0)
deviceNum1 := int64(0)
ownerID := accountID
ec2ENI := &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNum1},
OwnerId: &ownerID}
ec2ENI := &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNum1}}
ec2ENIs = append(ec2ENIs, ec2ENI)

deviceNum2 := int64(3)
ownerID = accountID
ec2ENI = &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNum2},
OwnerId: &ownerID}
ec2ENI = &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNum2}}
ec2ENIs = append(ec2ENIs, ec2ENI)

result := &ec2.DescribeInstancesOutput{
Expand Down Expand Up @@ -534,13 +521,11 @@ func TestAllocENINoFreeDevice(t *testing.T) {

// test no free index
ec2ENIs := make([]*ec2.InstanceNetworkInterface, 0)
ownerID := accountID

for i := 0; i < maxENIs; i++ {
var deviceNums [maxENIs]int64
deviceNums[i] = int64(i)
ec2ENI := &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNums[i]},
OwnerId: &ownerID}
ec2ENI := &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNums[i]}}
ec2ENIs = append(ec2ENIs, ec2ENI)
}
result := &ec2.DescribeInstancesOutput{
Expand All @@ -565,15 +550,11 @@ func TestAllocENIMaxReached(t *testing.T) {
// 2 ENIs, uses device number 0 3, expect to find free at 1
ec2ENIs := make([]*ec2.InstanceNetworkInterface, 0)
deviceNum1 := int64(0)
ownerID := accountID
ec2ENI := &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNum1},
OwnerId: &ownerID}
ec2ENI := &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNum1}}
ec2ENIs = append(ec2ENIs, ec2ENI)

deviceNum2 := int64(3)
ownerID = accountID
ec2ENI = &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNum2},
OwnerId: &ownerID}
ec2ENI = &ec2.InstanceNetworkInterface{Attachment: &ec2.InstanceNetworkInterfaceAttachment{DeviceIndex: &deviceNum2}}
ec2ENIs = append(ec2ENIs, ec2ENI)

result := &ec2.DescribeInstancesOutput{
Expand Down