From 73ec19c161a9b48bb77dff9ccb73c1cfebf73b50 Mon Sep 17 00:00:00 2001
From: Claes Mogren <mogren@amazon.com>
Date: Mon, 13 Jul 2020 11:27:31 -0700
Subject: [PATCH] Use limits from API

Fix for #1083.
---
 pkg/awsutils/gen_vpc_ip_limits.go     | 28 ---------------------------
 pkg/awsutils/vpc_ip_resource_limit.go |  6 +++---
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/pkg/awsutils/gen_vpc_ip_limits.go b/pkg/awsutils/gen_vpc_ip_limits.go
index d0f5fb440e..18cf74b9d1 100644
--- 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
index 0183097fa0..b3fd809fc8 100644
--- a/pkg/awsutils/vpc_ip_resource_limit.go
+++ b/pkg/awsutils/vpc_ip_resource_limit.go
@@ -12,7 +12,7 @@
 // permissions and limitations under the License.
 
 // Code generated by go generate; DO NOT EDIT.
-// This file was generated at 2020-06-01T13:53:29-07:00
+// This file was generated at 2020-07-13T11:26:46-07:00
 
 package awsutils
 
@@ -105,7 +105,7 @@ var InstanceENIsAvailable = map[string]int{
 	"g3.8xlarge":    8,
 	"g3s.xlarge":    4,
 	"g4dn.12xlarge": 8,
-	"g4dn.16xlarge": 15,
+	"g4dn.16xlarge": 4,
 	"g4dn.2xlarge":  3,
 	"g4dn.4xlarge":  3,
 	"g4dn.8xlarge":  4,
@@ -425,7 +425,7 @@ var InstanceIPsAvailable = map[string]int{
 	"g3.8xlarge":    30,
 	"g3s.xlarge":    15,
 	"g4dn.12xlarge": 30,
-	"g4dn.16xlarge": 50,
+	"g4dn.16xlarge": 15,
 	"g4dn.2xlarge":  10,
 	"g4dn.4xlarge":  10,
 	"g4dn.8xlarge":  15,