From 2688b038cce97edc17cfb732d0acbcd9ec27b19d Mon Sep 17 00:00:00 2001
From: Hao Zhou <zhuhz@amazon.com>
Date: Wed, 11 Oct 2023 18:05:52 +0000
Subject: [PATCH] update EC2 supported instance types

---
 pkg/aws/vpc/limits.go | 788 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 694 insertions(+), 94 deletions(-)

diff --git a/pkg/aws/vpc/limits.go b/pkg/aws/vpc/limits.go
index 12e3fd03..41419c7f 100644
--- a/pkg/aws/vpc/limits.go
+++ b/pkg/aws/vpc/limits.go
@@ -17,7 +17,7 @@
 // so we can get this information at runtime.
 
 // Code generated by go generate; DO NOT EDIT.
-// This file was generated at 2023-09-05T20:09:30Z
+// This file was generated at 2023-10-11T18:04:32Z
 
 // WARNING: please add @ellistarn, @bwagner5, or @jonathan-innis from aws/karpenter to reviewers
 // if you are updating this file since Karpenter is depending on this file to calculate max pods.
@@ -1945,6 +1945,186 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
+	"c7a.12xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         114,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.16xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.24xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.2xlarge": {
+		Interface:               4,
+		IPv4PerInterface:        15,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         38,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 4,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.32xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.48xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.4xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         54,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.8xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         84,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.large": {
+		Interface:               3,
+		IPv4PerInterface:        10,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         9,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 3,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.medium": {
+		Interface:               2,
+		IPv4PerInterface:        4,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         4,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 2,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7a.metal-48xl": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "",
+		IsBareMetal: true,
+	},
+	"c7a.xlarge": {
+		Interface:               4,
+		IPv4PerInterface:        15,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         18,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 4,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
 	"c7g.12xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
@@ -2320,6 +2500,141 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
+	"c7i.12xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         114,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7i.16xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7i.24xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7i.2xlarge": {
+		Interface:               4,
+		IPv4PerInterface:        15,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         38,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 4,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7i.48xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7i.4xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         54,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7i.8xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         84,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7i.large": {
+		Interface:               3,
+		IPv4PerInterface:        10,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         9,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 3,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"c7i.xlarge": {
+		Interface:               4,
+		IPv4PerInterface:        15,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         18,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 4,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
 	"d2.2xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
@@ -2605,36 +2920,6 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "xen",
 		IsBareMetal: false,
 	},
-	"g2.2xlarge": {
-		Interface:               4,
-		IPv4PerInterface:        15,
-		IsTrunkingCompatible:    false,
-		BranchInterface:         0,
-		DefaultNetworkCardIndex: 0,
-		NetworkCards: []NetworkCard{
-			{
-				MaximumNetworkInterfaces: 4,
-				NetworkCardIndex:         0,
-			},
-		},
-		Hypervisor:  "xen",
-		IsBareMetal: false,
-	},
-	"g2.8xlarge": {
-		Interface:               8,
-		IPv4PerInterface:        30,
-		IsTrunkingCompatible:    false,
-		BranchInterface:         0,
-		DefaultNetworkCardIndex: 0,
-		NetworkCards: []NetworkCard{
-			{
-				MaximumNetworkInterfaces: 8,
-				NetworkCardIndex:         0,
-			},
-		},
-		Hypervisor:  "xen",
-		IsBareMetal: false,
-	},
 	"g3.16xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
@@ -6795,6 +7080,21 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "",
 		IsBareMetal: true,
 	},
+	"mac2-m2pro.metal": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         6,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "",
+		IsBareMetal: true,
+	},
 	"mac2.metal": {
 		Interface:               8,
 		IPv4PerInterface:        30,
@@ -8589,18 +8889,168 @@ var Limits = map[string]*VPCLimits{
 		Interface:               2,
 		IPv4PerInterface:        4,
 		IsTrunkingCompatible:    true,
-		BranchInterface:         4,
+		BranchInterface:         4,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 2,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r6gd.metal": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "",
+		IsBareMetal: true,
+	},
+	"r6gd.xlarge": {
+		Interface:               4,
+		IPv4PerInterface:        15,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         18,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 4,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r6i.12xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         114,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r6i.16xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r6i.24xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r6i.2xlarge": {
+		Interface:               4,
+		IPv4PerInterface:        15,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         38,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 4,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r6i.32xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r6i.4xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         54,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r6i.8xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         84,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r6i.large": {
+		Interface:               3,
+		IPv4PerInterface:        10,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         9,
 		DefaultNetworkCardIndex: 0,
 		NetworkCards: []NetworkCard{
 			{
-				MaximumNetworkInterfaces: 2,
+				MaximumNetworkInterfaces: 3,
 				NetworkCardIndex:         0,
 			},
 		},
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6gd.metal": {
+	"r6i.metal": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -8615,7 +9065,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "",
 		IsBareMetal: true,
 	},
-	"r6gd.xlarge": {
+	"r6i.xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
 		IsTrunkingCompatible:    true,
@@ -8630,7 +9080,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6i.12xlarge": {
+	"r6id.12xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -8645,7 +9095,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6i.16xlarge": {
+	"r6id.16xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -8660,7 +9110,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6i.24xlarge": {
+	"r6id.24xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -8675,7 +9125,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6i.2xlarge": {
+	"r6id.2xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
 		IsTrunkingCompatible:    true,
@@ -8690,7 +9140,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6i.32xlarge": {
+	"r6id.32xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -8705,7 +9155,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6i.4xlarge": {
+	"r6id.4xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -8720,7 +9170,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6i.8xlarge": {
+	"r6id.8xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -8735,7 +9185,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6i.large": {
+	"r6id.large": {
 		Interface:               3,
 		IPv4PerInterface:        10,
 		IsTrunkingCompatible:    true,
@@ -8750,7 +9200,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6i.metal": {
+	"r6id.metal": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -8765,7 +9215,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "",
 		IsBareMetal: true,
 	},
-	"r6i.xlarge": {
+	"r6id.xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
 		IsTrunkingCompatible:    true,
@@ -8780,7 +9230,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6id.12xlarge": {
+	"r6idn.12xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -8795,7 +9245,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6id.16xlarge": {
+	"r6idn.16xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -8810,7 +9260,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6id.24xlarge": {
+	"r6idn.24xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -8825,7 +9275,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6id.2xlarge": {
+	"r6idn.2xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
 		IsTrunkingCompatible:    true,
@@ -8840,22 +9290,27 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6id.32xlarge": {
-		Interface:               15,
+	"r6idn.32xlarge": {
+		Interface:               14,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
-		BranchInterface:         107,
+		BranchInterface:         108,
 		DefaultNetworkCardIndex: 0,
 		NetworkCards: []NetworkCard{
 			{
-				MaximumNetworkInterfaces: 15,
+				MaximumNetworkInterfaces: 7,
 				NetworkCardIndex:         0,
 			},
+
+			{
+				MaximumNetworkInterfaces: 7,
+				NetworkCardIndex:         1,
+			},
 		},
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6id.4xlarge": {
+	"r6idn.4xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -8870,7 +9325,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6id.8xlarge": {
+	"r6idn.8xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -8885,7 +9340,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6id.large": {
+	"r6idn.large": {
 		Interface:               3,
 		IPv4PerInterface:        10,
 		IsTrunkingCompatible:    true,
@@ -8900,22 +9355,27 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6id.metal": {
-		Interface:               15,
+	"r6idn.metal": {
+		Interface:               14,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
-		BranchInterface:         107,
+		BranchInterface:         108,
 		DefaultNetworkCardIndex: 0,
 		NetworkCards: []NetworkCard{
 			{
-				MaximumNetworkInterfaces: 15,
+				MaximumNetworkInterfaces: 7,
 				NetworkCardIndex:         0,
 			},
+
+			{
+				MaximumNetworkInterfaces: 7,
+				NetworkCardIndex:         1,
+			},
 		},
 		Hypervisor:  "",
 		IsBareMetal: true,
 	},
-	"r6id.xlarge": {
+	"r6idn.xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
 		IsTrunkingCompatible:    true,
@@ -8930,7 +9390,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6idn.12xlarge": {
+	"r6in.12xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -8945,7 +9405,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6idn.16xlarge": {
+	"r6in.16xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -8960,7 +9420,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6idn.24xlarge": {
+	"r6in.24xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -8975,7 +9435,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6idn.2xlarge": {
+	"r6in.2xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
 		IsTrunkingCompatible:    true,
@@ -8990,7 +9450,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6idn.32xlarge": {
+	"r6in.32xlarge": {
 		Interface:               14,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -9010,7 +9470,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6idn.4xlarge": {
+	"r6in.4xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -9025,7 +9485,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6idn.8xlarge": {
+	"r6in.8xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -9040,7 +9500,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6idn.large": {
+	"r6in.large": {
 		Interface:               3,
 		IPv4PerInterface:        10,
 		IsTrunkingCompatible:    true,
@@ -9055,7 +9515,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6idn.metal": {
+	"r6in.metal": {
 		Interface:               14,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -9075,7 +9535,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "",
 		IsBareMetal: true,
 	},
-	"r6idn.xlarge": {
+	"r6in.xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
 		IsTrunkingCompatible:    true,
@@ -9090,7 +9550,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6in.12xlarge": {
+	"r7a.12xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -9105,7 +9565,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6in.16xlarge": {
+	"r7a.16xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -9120,7 +9580,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6in.24xlarge": {
+	"r7a.24xlarge": {
 		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
@@ -9135,7 +9595,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6in.2xlarge": {
+	"r7a.2xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
 		IsTrunkingCompatible:    true,
@@ -9150,27 +9610,37 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6in.32xlarge": {
-		Interface:               14,
+	"r7a.32xlarge": {
+		Interface:               15,
 		IPv4PerInterface:        50,
 		IsTrunkingCompatible:    true,
-		BranchInterface:         108,
+		BranchInterface:         107,
 		DefaultNetworkCardIndex: 0,
 		NetworkCards: []NetworkCard{
 			{
-				MaximumNetworkInterfaces: 7,
+				MaximumNetworkInterfaces: 15,
 				NetworkCardIndex:         0,
 			},
-
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r7a.48xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
 			{
-				MaximumNetworkInterfaces: 7,
-				NetworkCardIndex:         1,
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
 			},
 		},
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6in.4xlarge": {
+	"r7a.4xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -9185,7 +9655,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6in.8xlarge": {
+	"r7a.8xlarge": {
 		Interface:               8,
 		IPv4PerInterface:        30,
 		IsTrunkingCompatible:    true,
@@ -9200,7 +9670,7 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6in.large": {
+	"r7a.large": {
 		Interface:               3,
 		IPv4PerInterface:        10,
 		IsTrunkingCompatible:    true,
@@ -9215,27 +9685,37 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
-	"r6in.metal": {
-		Interface:               14,
-		IPv4PerInterface:        50,
+	"r7a.medium": {
+		Interface:               2,
+		IPv4PerInterface:        4,
 		IsTrunkingCompatible:    true,
-		BranchInterface:         108,
+		BranchInterface:         4,
 		DefaultNetworkCardIndex: 0,
 		NetworkCards: []NetworkCard{
 			{
-				MaximumNetworkInterfaces: 7,
+				MaximumNetworkInterfaces: 2,
 				NetworkCardIndex:         0,
 			},
-
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r7a.metal-48xl": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
 			{
-				MaximumNetworkInterfaces: 7,
-				NetworkCardIndex:         1,
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
 			},
 		},
 		Hypervisor:  "",
 		IsBareMetal: true,
 	},
-	"r6in.xlarge": {
+	"r7a.xlarge": {
 		Interface:               4,
 		IPv4PerInterface:        15,
 		IsTrunkingCompatible:    true,
@@ -9505,6 +9985,126 @@ var Limits = map[string]*VPCLimits{
 		Hypervisor:  "nitro",
 		IsBareMetal: false,
 	},
+	"r7iz.12xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         114,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r7iz.16xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r7iz.2xlarge": {
+		Interface:               4,
+		IPv4PerInterface:        15,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         38,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 4,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r7iz.32xlarge": {
+		Interface:               15,
+		IPv4PerInterface:        50,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         107,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 15,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r7iz.4xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         54,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r7iz.8xlarge": {
+		Interface:               8,
+		IPv4PerInterface:        30,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         84,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 8,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r7iz.large": {
+		Interface:               3,
+		IPv4PerInterface:        10,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         9,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 3,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
+	"r7iz.xlarge": {
+		Interface:               4,
+		IPv4PerInterface:        15,
+		IsTrunkingCompatible:    true,
+		BranchInterface:         18,
+		DefaultNetworkCardIndex: 0,
+		NetworkCards: []NetworkCard{
+			{
+				MaximumNetworkInterfaces: 4,
+				NetworkCardIndex:         0,
+			},
+		},
+		Hypervisor:  "nitro",
+		IsBareMetal: false,
+	},
 	"t1.micro": {
 		Interface:               2,
 		IPv4PerInterface:        2,