Use limits from API

Fix for #1083.
aws · Jul 13, 2020 · 650313f · 650313f
1 parent 3c20ff4
commit 650313f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 31 deletions.
diff --git a/pkg/awsutils/gen_vpc_ip_limits.go b/pkg/awsutils/gen_vpc_ip_limits.go
@@ -109,24 +109,14 @@ func main() {
 // addManualLimits has the list of faulty or missing instance types
 func addManualLimits(limitMap map[string]ENILimit) map[string]ENILimit {
 	manuallyAddedLimits := []ENILimit{
-		{"g4dn.16xlarge", 15, 50}, // Wrong value in the API
 		{"cr1.8xlarge", 8, 30},
-		{"g4dn.metal", 15, 50},
 		{"hs1.8xlarge", 8, 30},
 		{"u-12tb1.metal", 5, 30},
 		{"u-18tb1.metal", 15, 50},
 		{"u-24tb1.metal", 15, 50},
 		{"u-6tb1.metal", 5, 30},
 		{"u-9tb1.metal", 5, 30},
-		{"c5a.12xlarge", 8, 30},
-		{"c5a.16xlarge", 15, 50},
-		{"c5a.24xlarge", 15, 50},
-		{"c5a.2xlarge", 4, 15},
-		{"c5a.4xlarge", 8, 30},
-		{"c5a.8xlarge", 8, 30},
-		{"c5a.large", 3, 10},
 		{"c5a.metal", 15, 50},
-		{"c5a.xlarge", 4, 15},
 		{"c5ad.12xlarge", 8, 30},
 		{"c5ad.16xlarge", 15, 50},
 		{"c5ad.24xlarge", 15, 50},
@@ -136,24 +126,6 @@ func addManualLimits(limitMap map[string]ENILimit) map[string]ENILimit {
 		{"c5ad.large", 3, 10},
 		{"c5ad.metal", 15, 50},
 		{"c5ad.xlarge", 4, 15},
-		{"c6g.medium", 2, 4},
-		{"c6g.large", 3, 10},
-		{"c6g.xlarge", 4, 15},
-		{"c6g.2xlarge", 4, 15},
-		{"c6g.4xlarge", 8, 30},
-		{"c6g.8xlarge", 8, 30},
-		{"c6g.12xlarge", 8, 30},
-		{"c6g.16xlarge", 15, 50},
-		{"c6g.metal", 15, 50},
-		{"r6g.medium", 2, 4},
-		{"r6g.large", 3, 10},
-		{"r6g.xlarge", 4, 15},
-		{"r6g.2xlarge", 4, 15},
-		{"r6g.4xlarge", 8, 30},
-		{"r6g.8xlarge", 8, 30},
-		{"r6g.12xlarge", 8, 30},
-		{"r6g.16xlarge", 15, 50},
-		{"r6g.metal", 15, 50},
 	}
 	for _, eniLimit := range manuallyAddedLimits {
 		limitMap[eniLimit.InstanceType] = newENILimit(eniLimit.InstanceType, eniLimit.ENILimit, eniLimit.IPLimit)

diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go