From 573f55464a344924504c74664ebd58051d24667b Mon Sep 17 00:00:00 2001
From: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Date: Wed, 12 May 2021 14:50:37 -0700
Subject: [PATCH] New instance types (#1463)

* New instance types update

* merge error
---
 misc/eni-max-pods.txt                 | 15 ++++++++++++++-
 pkg/awsutils/vpc_ip_resource_limit.go | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/misc/eni-max-pods.txt b/misc/eni-max-pods.txt
index 4ac9aa86b3..d01e42d526 100644
--- a/misc/eni-max-pods.txt
+++ b/misc/eni-max-pods.txt
@@ -11,7 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 #
-# This file was generated at 2021-01-24T12:55:41+11:00
+# This file was generated at 2021-05-11T19:31:10Z
 #
 # Mapping is calculated from AWS EC2 API using the following formula:
 # * First IP on each ENI is not used for pods
@@ -229,6 +229,7 @@ m5dn.2xlarge 58
 m5dn.4xlarge 234
 m5dn.8xlarge 234
 m5dn.large 29
+m5dn.metal 737
 m5dn.xlarge 58
 m5n.12xlarge 234
 m5n.16xlarge 737
@@ -237,6 +238,7 @@ m5n.2xlarge 58
 m5n.4xlarge 234
 m5n.8xlarge 234
 m5n.large 29
+m5n.metal 737
 m5n.xlarge 58
 m5zn.12xlarge 737
 m5zn.2xlarge 58
@@ -333,6 +335,7 @@ r5dn.2xlarge 58
 r5dn.4xlarge 234
 r5dn.8xlarge 234
 r5dn.large 29
+r5dn.metal 737
 r5dn.xlarge 58
 r5n.12xlarge 234
 r5n.16xlarge 737
@@ -341,6 +344,7 @@ r5n.2xlarge 58
 r5n.4xlarge 234
 r5n.8xlarge 234
 r5n.large 29
+r5n.metal 737
 r5n.xlarge 58
 r6g.12xlarge 234
 r6g.16xlarge 737
@@ -402,6 +406,15 @@ x1e.32xlarge 234
 x1e.4xlarge 58
 x1e.8xlarge 58
 x1e.xlarge 29
+x2gd.12xlarge 234
+x2gd.16xlarge 737
+x2gd.2xlarge 58
+x2gd.4xlarge 234
+x2gd.8xlarge 234
+x2gd.large 29
+x2gd.medium 8
+x2gd.metal 737
+x2gd.xlarge 58
 z1d.12xlarge 737
 z1d.2xlarge 58
 z1d.3xlarge 234
diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go
index e953b77fd0..38e74abc32 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 2021-01-24T12:55:41+11:00
+// This file was generated at 2021-05-11T19:31:10Z
 
 package awsutils
 
@@ -227,6 +227,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{
 	"m5dn.4xlarge":  {ENILimit: 8, IPv4Limit: 30},
 	"m5dn.8xlarge":  {ENILimit: 8, IPv4Limit: 30},
 	"m5dn.large":    {ENILimit: 3, IPv4Limit: 10},
+	"m5dn.metal":    {ENILimit: 15, IPv4Limit: 50},
 	"m5dn.xlarge":   {ENILimit: 4, IPv4Limit: 15},
 	"m5n.12xlarge":  {ENILimit: 8, IPv4Limit: 30},
 	"m5n.16xlarge":  {ENILimit: 15, IPv4Limit: 50},
@@ -235,6 +236,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{
 	"m5n.4xlarge":   {ENILimit: 8, IPv4Limit: 30},
 	"m5n.8xlarge":   {ENILimit: 8, IPv4Limit: 30},
 	"m5n.large":     {ENILimit: 3, IPv4Limit: 10},
+	"m5n.metal":     {ENILimit: 15, IPv4Limit: 50},
 	"m5n.xlarge":    {ENILimit: 4, IPv4Limit: 15},
 	"m5zn.12xlarge": {ENILimit: 15, IPv4Limit: 50},
 	"m5zn.2xlarge":  {ENILimit: 4, IPv4Limit: 15},
@@ -331,6 +333,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{
 	"r5dn.4xlarge":  {ENILimit: 8, IPv4Limit: 30},
 	"r5dn.8xlarge":  {ENILimit: 8, IPv4Limit: 30},
 	"r5dn.large":    {ENILimit: 3, IPv4Limit: 10},
+	"r5dn.metal":    {ENILimit: 15, IPv4Limit: 50},
 	"r5dn.xlarge":   {ENILimit: 4, IPv4Limit: 15},
 	"r5n.12xlarge":  {ENILimit: 8, IPv4Limit: 30},
 	"r5n.16xlarge":  {ENILimit: 15, IPv4Limit: 50},
@@ -339,6 +342,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{
 	"r5n.4xlarge":   {ENILimit: 8, IPv4Limit: 30},
 	"r5n.8xlarge":   {ENILimit: 8, IPv4Limit: 30},
 	"r5n.large":     {ENILimit: 3, IPv4Limit: 10},
+	"r5n.metal":     {ENILimit: 15, IPv4Limit: 50},
 	"r5n.xlarge":    {ENILimit: 4, IPv4Limit: 15},
 	"r6g.12xlarge":  {ENILimit: 8, IPv4Limit: 30},
 	"r6g.16xlarge":  {ENILimit: 15, IPv4Limit: 50},
@@ -400,6 +404,15 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{
 	"x1e.4xlarge":   {ENILimit: 4, IPv4Limit: 15},
 	"x1e.8xlarge":   {ENILimit: 4, IPv4Limit: 15},
 	"x1e.xlarge":    {ENILimit: 3, IPv4Limit: 10},
+	"x2gd.12xlarge": {ENILimit: 8, IPv4Limit: 30},
+	"x2gd.16xlarge": {ENILimit: 15, IPv4Limit: 50},
+	"x2gd.2xlarge":  {ENILimit: 4, IPv4Limit: 15},
+	"x2gd.4xlarge":  {ENILimit: 8, IPv4Limit: 30},
+	"x2gd.8xlarge":  {ENILimit: 8, IPv4Limit: 30},
+	"x2gd.large":    {ENILimit: 3, IPv4Limit: 10},
+	"x2gd.medium":   {ENILimit: 2, IPv4Limit: 4},
+	"x2gd.metal":    {ENILimit: 15, IPv4Limit: 50},
+	"x2gd.xlarge":   {ENILimit: 4, IPv4Limit: 15},
 	"z1d.12xlarge":  {ENILimit: 15, IPv4Limit: 50},
 	"z1d.2xlarge":   {ENILimit: 4, IPv4Limit: 15},
 	"z1d.3xlarge":   {ENILimit: 8, IPv4Limit: 30},