Update limits for m6g, c6g and r6g

aws · May 28, 2020 · 1f320bb · 1f320bb
1 parent d82e653
commit 1f320bb
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -175,6 +175,7 @@ generate:
 	$(MAKE) format
 
 # Generate descriptors for supported ENI configurations.
+generate-limits: GOOS=
 generate-limits:
 	go run pkg/awsutils/gen_vpc_ip_limits.go
 

diff --git a/pkg/awsutils/gen_vpc_ip_limits.go b/pkg/awsutils/gen_vpc_ip_limits.go
@@ -113,19 +113,29 @@ func addManualLimits(limitMap map[string]ENILimit) map[string]ENILimit {
 		{"cr1.8xlarge", 8, 30},
 		{"g4dn.metal", 15, 50},
 		{"hs1.8xlarge", 8, 30},
-		{"m6g.12xlarge", 8, 30},
-		{"m6g.16xlarge", 15, 50},
-		{"m6g.2xlarge", 4, 15},
-		{"m6g.4xlarge", 8, 30},
-		{"m6g.8xlarge", 8, 30},
-		{"m6g.large", 3, 10},
-		{"m6g.medium", 2, 4},
-		{"m6g.xlarge", 4, 15},
 		{"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},
+		{"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