From 5de5b899258b68f4d0dccab990c57f0c0c987ef9 Mon Sep 17 00:00:00 2001
From: Claes Mogren <mogren@amazon.com>
Date: Mon, 1 Jul 2019 17:49:46 -0700
Subject: [PATCH] Adding new m5 and r5 instances (#518)

* Adding new m5 and r5 instances

* Bump IP limits for some large instances
---
 pkg/awsutils/vpc_ip_resource_limit.go | 34 +++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go
index f4338a006f..52b88930c8 100644
--- a/pkg/awsutils/vpc_ip_resource_limit.go
+++ b/pkg/awsutils/vpc_ip_resource_limit.go
@@ -112,13 +112,17 @@ var InstanceENIsAvailable = map[string]int{
 	"m5.xlarge":     4,
 	"m5.2xlarge":    4,
 	"m5.4xlarge":    8,
+	"m5.8xlarge":    8,
 	"m5.12xlarge":   8,
+	"m5.16xlarge":   15,
 	"m5.24xlarge":   15,
 	"m5a.large":     3,
 	"m5a.xlarge":    4,
 	"m5a.2xlarge":   4,
 	"m5a.4xlarge":   8,
+	"m5a.8xlarge":   8,
 	"m5a.12xlarge":  8,
+	"m5a.16xlarge":  15,
 	"m5a.24xlarge":  15,
 	"m5ad.large":    3,
 	"m5ad.xlarge":   4,
@@ -130,7 +134,9 @@ var InstanceENIsAvailable = map[string]int{
 	"m5d.xlarge":    4,
 	"m5d.2xlarge":   4,
 	"m5d.4xlarge":   8,
+	"m5d.8xlarge":   8,
 	"m5d.12xlarge":  8,
+	"m5d.16xlarge":  15,
 	"m5d.24xlarge":  15,
 	"p2.xlarge":     4,
 	"p2.8xlarge":    8,
@@ -154,13 +160,17 @@ var InstanceENIsAvailable = map[string]int{
 	"r5.xlarge":     4,
 	"r5.2xlarge":    4,
 	"r5.4xlarge":    8,
+	"r5.8xlarge":    8,
 	"r5.12xlarge":   8,
+	"r5.16xlarge":   15,
 	"r5.24xlarge":   15,
 	"r5a.large":     3,
 	"r5a.xlarge":    4,
 	"r5a.2xlarge":   4,
 	"r5a.4xlarge":   8,
+	"r5a.8xlarge":   8,
 	"r5a.12xlarge":  8,
+	"r5a.16xlarge":  15,
 	"r5a.24xlarge":  15,
 	"r5ad.large":    3,
 	"r5ad.xlarge":   4,
@@ -172,7 +182,9 @@ var InstanceENIsAvailable = map[string]int{
 	"r5d.xlarge":    4,
 	"r5d.2xlarge":   4,
 	"r5d.4xlarge":   8,
+	"r5d.8xlarge":   8,
 	"r5d.12xlarge":  8,
+	"r5d.16xlarge":  15,
 	"r5d.24xlarge":  15,
 	"t1.micro":      2,
 	"t2.nano":       2,
@@ -314,13 +326,17 @@ var InstanceIPsAvailable = map[string]int{
 	"m5.xlarge":     15,
 	"m5.2xlarge":    15,
 	"m5.4xlarge":    30,
+	"m5.8xlarge":    30,
 	"m5.12xlarge":   30,
-	"m5.24xlarge":   31,
+	"m5.16xlarge":   50,
+	"m5.24xlarge":   50,
 	"m5a.large":     10,
 	"m5a.xlarge":    15,
 	"m5a.2xlarge":   15,
 	"m5a.4xlarge":   30,
+	"m5a.8xlarge":   30,
 	"m5a.12xlarge":  30,
+	"m5a.16xlarge":  50,
 	"m5a.24xlarge":  50,
 	"m5ad.large":    10,
 	"m5ad.xlarge":   15,
@@ -332,15 +348,17 @@ var InstanceIPsAvailable = map[string]int{
 	"m5d.xlarge":    15,
 	"m5d.2xlarge":   15,
 	"m5d.4xlarge":   30,
+	"m5d.8xlarge":   30,
 	"m5d.12xlarge":  30,
-	"m5d.24xlarge":  31,
+	"m5d.16xlarge":  50,
+	"m5d.24xlarge":  50,
 	"p2.xlarge":     15,
 	"p2.8xlarge":    30,
 	"p2.16xlarge":   30,
 	"p3.2xlarge":    15,
 	"p3.8xlarge":    30,
 	"p3.16xlarge":   30,
-	"p3dn.24xlarge": 31,
+	"p3dn.24xlarge": 50,
 	"r3.large":      10,
 	"r3.xlarge":     15,
 	"r3.2xlarge":    15,
@@ -356,13 +374,17 @@ var InstanceIPsAvailable = map[string]int{
 	"r5.xlarge":     15,
 	"r5.2xlarge":    15,
 	"r5.4xlarge":    30,
+	"r5.8xlarge":    30,
 	"r5.12xlarge":   30,
-	"r5.24xlarge":   31,
+	"r5.16xlarge":   50,
+	"r5.24xlarge":   50,
 	"r5a.large":     10,
 	"r5a.xlarge":    15,
 	"r5a.2xlarge":   15,
 	"r5a.4xlarge":   30,
+	"r5a.8xlarge":   30,
 	"r5a.12xlarge":  30,
+	"r5a.16xlarge":  50,
 	"r5a.24xlarge":  50,
 	"r5ad.large":    10,
 	"r5ad.xlarge":   15,
@@ -374,7 +396,9 @@ var InstanceIPsAvailable = map[string]int{
 	"r5d.xlarge":    15,
 	"r5d.2xlarge":   15,
 	"r5d.4xlarge":   30,
+	"r5d.8xlarge":   30,
 	"r5d.12xlarge":  30,
+	"r5d.16xlarge":  50,
 	"r5d.24xlarge":  50,
 	"t1.micro":      2,
 	"t2.nano":       2,
@@ -414,5 +438,5 @@ var InstanceIPsAvailable = map[string]int{
 	"z1d.2xlarge":   15,
 	"z1d.3xlarge":   30,
 	"z1d.6xlarge":   30,
-	"z1d.12xlarge":  31,
+	"z1d.12xlarge":  50,
 }