Merge pull request #275 from hmizuma/instance_mapping

Update instance ENI and IP mapping table
aws · Dec 21, 2018 · 5cce382 · 5cce382
2 parents fb2d96a + d2616b1
commit 5cce382
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/pkg/awsutils/awsutils_test.go b/pkg/awsutils/awsutils_test.go
@@ -536,14 +536,14 @@ func TestAllocAllIPAddress(t *testing.T) {
 
 	assert.NoError(t, err)
 
-	// the expected addresses for r4.16xlarge
+	// the expected addresses for c5n.18xlarge
 	input = &ec2.AssignPrivateIpAddressesInput{
 		NetworkInterfaceId:             aws.String("eni-id"),
 		SecondaryPrivateIpAddressCount: aws.Int64(49),
 	}
 	mockEC2.EXPECT().AssignPrivateIpAddresses(input).Return(nil, nil)
 
-	ins = &EC2InstanceMetadataCache{ec2SVC: mockEC2, instanceType: "r4.16xlarge"}
+	ins = &EC2InstanceMetadataCache{ec2SVC: mockEC2, instanceType: "c5n.18xlarge"}
 
 	err = ins.AllocAllIPAddress("eni-id")
 
@@ -561,7 +561,7 @@ func TestAllocIPAddresses(t *testing.T) {
 	}
 	mockEC2.EXPECT().AssignPrivateIpAddresses(input).Return(nil, nil)
 
-	ins := &EC2InstanceMetadataCache{ec2SVC: mockEC2, instanceType: "r4.16xlarge"}
+	ins := &EC2InstanceMetadataCache{ec2SVC: mockEC2, instanceType: "c5n.18xlarge"}
 
 	err := ins.AllocIPAddresses("eni-id", 5)
 
@@ -574,7 +574,7 @@ func TestAllocIPAddresses(t *testing.T) {
 	}
 	mockEC2.EXPECT().AssignPrivateIpAddresses(input).Return(nil, nil)
 
-	ins = &EC2InstanceMetadataCache{ec2SVC: mockEC2, instanceType: "r4.16xlarge"}
+	ins = &EC2InstanceMetadataCache{ec2SVC: mockEC2, instanceType: "c5n.18xlarge"}
 
 	err = ins.AllocIPAddresses("eni-id", 49)
 

diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go
@@ -16,6 +16,11 @@ package awsutils
 // InstanceENIsAvailable contains a mapping of instance types to the number of ENIs available which is described at
 // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
 var InstanceENIsAvailable = map[string]int{
+	"a1.medium":     2,
+	"a1.large":      3,
+	"a1.xlarge":     4,
+	"a1.2xlarge":    4,
+	"a1.4xlarge":    8,
 	"c1.medium":     2,
 	"c1.xlarge":     4,
 	"c3.large":      3,
@@ -40,6 +45,12 @@ var InstanceENIsAvailable = map[string]int{
 	"c5d.4xlarge":   8,
 	"c5d.9xlarge":   8,
 	"c5d.18xlarge":  15,
+	"c5n.large":     3,
+	"c5n.xlarge":    4,
+	"c5n.2xlarge":   4,
+	"c5n.4xlarge":   8,
+	"c5n.9xlarge":   8,
+	"c5n.18xlarge":  15,
 	"cc2.8xlarge":   8,
 	"cr1.8xlarge":   8,
 	"d2.xlarge":     4,
@@ -179,6 +190,11 @@ var InstanceENIsAvailable = map[string]int{
 // InstanceIPsAvailable contains a mapping of instance types to the number of IPs per ENI
 // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
 var InstanceIPsAvailable = map[string]int64{
+	"a1.medium":     4,
+	"a1.large":      10,
+	"a1.xlarge":     15,
+	"a1.2xlarge":    15,
+	"a1.4xlarge":    30,
 	"c1.medium":     6,
 	"c1.xlarge":     15,
 	"c3.large":      10,
@@ -203,6 +219,12 @@ var InstanceIPsAvailable = map[string]int64{
 	"c5d.4xlarge":   30,
 	"c5d.9xlarge":   30,
 	"c5d.18xlarge":  50,
+	"c5n.large":     10,
+	"c5n.xlarge":    15,
+	"c5n.2xlarge":   15,
+	"c5n.4xlarge":   30,
+	"c5n.9xlarge":   30,
+	"c5n.18xlarge":  50,
 	"cc2.8xlarge":   30,
 	"cr1.8xlarge":   30,
 	"d2.xlarge":     15,
@@ -211,17 +233,17 @@ var InstanceIPsAvailable = map[string]int64{
 	"d2.8xlarge":    30,
 	"f1.2xlarge":    15,
 	"f1.4xlarge":    30,
-	"f1.16xlarge":   50,
+	"f1.16xlarge":   24,
 	"g2.2xlarge":    15,
 	"g2.8xlarge":    30,
 	"g3s.xlarge":    15,
 	"g3.4xlarge":    30,
 	"g3.8xlarge":    30,
-	"g3.16xlarge":   50,
+	"g3.16xlarge":   24,
 	"h1.2xlarge":    15,
 	"h1.4xlarge":    30,
 	"h1.8xlarge":    30,
-	"h1.16xlarge":   50,
+	"h1.16xlarge":   24,
 	"hs1.8xlarge":   30,
 	"i2.xlarge":     15,
 	"i2.2xlarge":    15,
@@ -232,7 +254,7 @@ var InstanceIPsAvailable = map[string]int64{
 	"i3.2xlarge":    15,
 	"i3.4xlarge":    30,
 	"i3.8xlarge":    30,
-	"i3.16xlarge":   50,
+	"i3.16xlarge":   24,
 	"i3.metal":      50,
 	"m1.small":      4,
 	"m1.medium":     6,
@@ -286,7 +308,7 @@ var InstanceIPsAvailable = map[string]int64{
 	"r4.2xlarge":    15,
 	"r4.4xlarge":    30,
 	"r4.8xlarge":    30,
-	"r4.16xlarge":   50,
+	"r4.16xlarge":   24,
 	"r5.large":      10,
 	"r5.xlarge":     15,
 	"r5.2xlarge":    15,