From 5d2807bccd4439b706f71a9aa66777b4d5072883 Mon Sep 17 00:00:00 2001
From: GuyTempleton <guy.templeton@skyscanner.net>
Date: Sun, 3 Oct 2021 23:11:31 +0100
Subject: [PATCH] CA - AWS - Instance List Update 03-10-21 - 1.19 release
 branch

---
 .../cloudprovider/aws/aws_util.go             |   2 +-
 .../cloudprovider/aws/ec2_instance_types.go   | 630 ++++++++++++++++++
 .../aws/ec2_instance_types/gen.go             |   1 +
 3 files changed, 632 insertions(+), 1 deletion(-)

diff --git a/cluster-autoscaler/cloudprovider/aws/aws_util.go b/cluster-autoscaler/cloudprovider/aws/aws_util.go
index 62e0d31eff0e..db1b2f3b1564 100644
--- a/cluster-autoscaler/cloudprovider/aws/aws_util.go
+++ b/cluster-autoscaler/cloudprovider/aws/aws_util.go
@@ -39,7 +39,7 @@ var (
 	ec2MetaDataServiceUrl          = "http://169.254.169.254"
 	ec2PricingServiceUrlTemplate   = "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonEC2/current/%s/index.json"
 	ec2PricingServiceUrlTemplateCN = "https://pricing.cn-north-1.amazonaws.com.cn/offers/v1.0/cn/AmazonEC2/current/%s/index.json"
-	staticListLastUpdateTime       = "2019-10-14"
+	staticListLastUpdateTime       = "2021-10-03"
 )
 
 type response struct {
diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
index 0773f5d354d9..864b6531097a 100644
--- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
+++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
@@ -382,6 +382,126 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     8192,
 		GPU:          0,
 	},
+	"c6gd": {
+		InstanceType: "c6gd",
+		VCPU:         64,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"c6gd.12xlarge": {
+		InstanceType: "c6gd.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+	},
+	"c6gd.16xlarge": {
+		InstanceType: "c6gd.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"c6gd.2xlarge": {
+		InstanceType: "c6gd.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"c6gd.4xlarge": {
+		InstanceType: "c6gd.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"c6gd.8xlarge": {
+		InstanceType: "c6gd.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"c6gd.large": {
+		InstanceType: "c6gd.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+	},
+	"c6gd.medium": {
+		InstanceType: "c6gd.medium",
+		VCPU:         1,
+		MemoryMb:     2048,
+		GPU:          0,
+	},
+	"c6gd.metal": {
+		InstanceType: "c6gd.metal",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"c6gd.xlarge": {
+		InstanceType: "c6gd.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
+	"c6gn": {
+		InstanceType: "c6gn",
+		VCPU:         64,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"c6gn.12xlarge": {
+		InstanceType: "c6gn.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+	},
+	"c6gn.16xlarge": {
+		InstanceType: "c6gn.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"c6gn.2xlarge": {
+		InstanceType: "c6gn.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"c6gn.4xlarge": {
+		InstanceType: "c6gn.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"c6gn.8xlarge": {
+		InstanceType: "c6gn.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"c6gn.large": {
+		InstanceType: "c6gn.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+	},
+	"c6gn.medium": {
+		InstanceType: "c6gn.medium",
+		VCPU:         1,
+		MemoryMb:     2048,
+		GPU:          0,
+	},
+	"c6gn.metal": {
+		InstanceType: "c6gn.metal",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"c6gn.xlarge": {
+		InstanceType: "c6gn.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
 	"cc2.8xlarge": {
 		InstanceType: "cc2.8xlarge",
 		VCPU:         32,
@@ -424,6 +544,66 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     31232,
 		GPU:          0,
 	},
+	"d3.2xlarge": {
+		InstanceType: "d3.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"d3.4xlarge": {
+		InstanceType: "d3.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"d3.8xlarge": {
+		InstanceType: "d3.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"d3.xlarge": {
+		InstanceType: "d3.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"d3en.12xlarge": {
+		InstanceType: "d3en.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"d3en.2xlarge": {
+		InstanceType: "d3en.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"d3en.4xlarge": {
+		InstanceType: "d3en.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"d3en.6xlarge": {
+		InstanceType: "d3en.6xlarge",
+		VCPU:         24,
+		MemoryMb:     98304,
+		GPU:          0,
+	},
+	"d3en.8xlarge": {
+		InstanceType: "d3en.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"d3en.xlarge": {
+		InstanceType: "d3en.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
 	"f1": {
 		InstanceType: "f1",
 		VCPU:         64,
@@ -496,6 +676,42 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     31232,
 		GPU:          1,
 	},
+	"g4ad": {
+		InstanceType: "g4ad",
+		VCPU:         192,
+		MemoryMb:     0,
+		GPU:          2,
+	},
+	"g4ad.16xlarge": {
+		InstanceType: "g4ad.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          4,
+	},
+	"g4ad.2xlarge": {
+		InstanceType: "g4ad.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          1,
+	},
+	"g4ad.4xlarge": {
+		InstanceType: "g4ad.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          1,
+	},
+	"g4ad.8xlarge": {
+		InstanceType: "g4ad.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          2,
+	},
+	"g4ad.xlarge": {
+		InstanceType: "g4ad.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          1,
+	},
 	"g4dn": {
 		InstanceType: "g4dn",
 		VCPU:         96,
@@ -604,6 +820,12 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     249856,
 		GPU:          0,
 	},
+	"i2.large": {
+		InstanceType: "i2.large",
+		VCPU:         2,
+		MemoryMb:     15360,
+		GPU:          0,
+	},
 	"i2.xlarge": {
 		InstanceType: "i2.xlarge",
 		VCPU:         4,
@@ -1192,6 +1414,54 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     16384,
 		GPU:          0,
 	},
+	"m5zn": {
+		InstanceType: "m5zn",
+		VCPU:         48,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"m5zn.12xlarge": {
+		InstanceType: "m5zn.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"m5zn.2xlarge": {
+		InstanceType: "m5zn.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"m5zn.3xlarge": {
+		InstanceType: "m5zn.3xlarge",
+		VCPU:         12,
+		MemoryMb:     49152,
+		GPU:          0,
+	},
+	"m5zn.6xlarge": {
+		InstanceType: "m5zn.6xlarge",
+		VCPU:         24,
+		MemoryMb:     98304,
+		GPU:          0,
+	},
+	"m5zn.large": {
+		InstanceType: "m5zn.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
+	"m5zn.metal": {
+		InstanceType: "m5zn.metal",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"m5zn.xlarge": {
+		InstanceType: "m5zn.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
 	"m6g": {
 		InstanceType: "m6g",
 		VCPU:         64,
@@ -1252,6 +1522,138 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     16384,
 		GPU:          0,
 	},
+	"m6gd": {
+		InstanceType: "m6gd",
+		VCPU:         64,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"m6gd.12xlarge": {
+		InstanceType: "m6gd.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"m6gd.16xlarge": {
+		InstanceType: "m6gd.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"m6gd.2xlarge": {
+		InstanceType: "m6gd.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"m6gd.4xlarge": {
+		InstanceType: "m6gd.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"m6gd.8xlarge": {
+		InstanceType: "m6gd.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"m6gd.large": {
+		InstanceType: "m6gd.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
+	"m6gd.medium": {
+		InstanceType: "m6gd.medium",
+		VCPU:         1,
+		MemoryMb:     4096,
+		GPU:          0,
+	},
+	"m6gd.metal": {
+		InstanceType: "m6gd.metal",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"m6gd.xlarge": {
+		InstanceType: "m6gd.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"m6i": {
+		InstanceType: "m6i",
+		VCPU:         128,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"m6i.12xlarge": {
+		InstanceType: "m6i.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"m6i.16xlarge": {
+		InstanceType: "m6i.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"m6i.24xlarge": {
+		InstanceType: "m6i.24xlarge",
+		VCPU:         96,
+		MemoryMb:     393216,
+		GPU:          0,
+	},
+	"m6i.2xlarge": {
+		InstanceType: "m6i.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"m6i.32xlarge": {
+		InstanceType: "m6i.32xlarge",
+		VCPU:         128,
+		MemoryMb:     524288,
+		GPU:          0,
+	},
+	"m6i.4xlarge": {
+		InstanceType: "m6i.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"m6i.8xlarge": {
+		InstanceType: "m6i.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"m6i.large": {
+		InstanceType: "m6i.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
+	"m6i.xlarge": {
+		InstanceType: "m6i.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"mac1": {
+		InstanceType: "mac1",
+		VCPU:         12,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"mac1.metal": {
+		InstanceType: "mac1.metal",
+		VCPU:         12,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
 	"p2": {
 		InstanceType: "p2",
 		VCPU:         64,
@@ -1312,6 +1714,18 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     786432,
 		GPU:          8,
 	},
+	"p4d": {
+		InstanceType: "p4d",
+		VCPU:         96,
+		MemoryMb:     0,
+		GPU:          8,
+	},
+	"p4d.24xlarge": {
+		InstanceType: "p4d.24xlarge",
+		VCPU:         96,
+		MemoryMb:     1179648,
+		GPU:          8,
+	},
 	"r3": {
 		InstanceType: "r3",
 		VCPU:         32,
@@ -1546,6 +1960,66 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     32768,
 		GPU:          0,
 	},
+	"r5b": {
+		InstanceType: "r5b",
+		VCPU:         96,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"r5b.12xlarge": {
+		InstanceType: "r5b.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+	},
+	"r5b.16xlarge": {
+		InstanceType: "r5b.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+	},
+	"r5b.24xlarge": {
+		InstanceType: "r5b.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+	},
+	"r5b.2xlarge": {
+		InstanceType: "r5b.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"r5b.4xlarge": {
+		InstanceType: "r5b.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"r5b.8xlarge": {
+		InstanceType: "r5b.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"r5b.large": {
+		InstanceType: "r5b.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"r5b.metal": {
+		InstanceType: "r5b.metal",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+	},
+	"r5b.xlarge": {
+		InstanceType: "r5b.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
 	"r5d": {
 		InstanceType: "r5d",
 		VCPU:         96,
@@ -1834,6 +2308,12 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     16384,
 		GPU:          0,
 	},
+	"t3": {
+		InstanceType: "t3",
+		VCPU:         8,
+		MemoryMb:     0,
+		GPU:          0,
+	},
 	"t3.2xlarge": {
 		InstanceType: "t3.2xlarge",
 		VCPU:         8,
@@ -1918,12 +2398,60 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     16384,
 		GPU:          0,
 	},
+	"t4g.2xlarge": {
+		InstanceType: "t4g.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"t4g.large": {
+		InstanceType: "t4g.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
+	"t4g.medium": {
+		InstanceType: "t4g.medium",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+	},
+	"t4g.micro": {
+		InstanceType: "t4g.micro",
+		VCPU:         2,
+		MemoryMb:     1024,
+		GPU:          0,
+	},
+	"t4g.nano": {
+		InstanceType: "t4g.nano",
+		VCPU:         2,
+		MemoryMb:     512,
+		GPU:          0,
+	},
+	"t4g.small": {
+		InstanceType: "t4g.small",
+		VCPU:         2,
+		MemoryMb:     2048,
+		GPU:          0,
+	},
+	"t4g.xlarge": {
+		InstanceType: "t4g.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
 	"u-12tb1": {
 		InstanceType: "u-12tb1",
 		VCPU:         448,
 		MemoryMb:     0,
 		GPU:          0,
 	},
+	"u-12tb1.112xlarge": {
+		InstanceType: "u-12tb1.112xlarge",
+		VCPU:         448,
+		MemoryMb:     12582912,
+		GPU:          0,
+	},
 	"u-12tb1.metal": {
 		InstanceType: "u-12tb1.metal",
 		VCPU:         448,
@@ -1960,6 +2488,18 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     0,
 		GPU:          0,
 	},
+	"u-6tb1.112xlarge": {
+		InstanceType: "u-6tb1.112xlarge",
+		VCPU:         448,
+		MemoryMb:     6291456,
+		GPU:          0,
+	},
+	"u-6tb1.56xlarge": {
+		InstanceType: "u-6tb1.56xlarge",
+		VCPU:         224,
+		MemoryMb:     6291456,
+		GPU:          0,
+	},
 	"u-6tb1.metal": {
 		InstanceType: "u-6tb1.metal",
 		VCPU:         448,
@@ -1972,12 +2512,42 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     0,
 		GPU:          0,
 	},
+	"u-9tb1.112xlarge": {
+		InstanceType: "u-9tb1.112xlarge",
+		VCPU:         448,
+		MemoryMb:     9437184,
+		GPU:          0,
+	},
 	"u-9tb1.metal": {
 		InstanceType: "u-9tb1.metal",
 		VCPU:         448,
 		MemoryMb:     9437184,
 		GPU:          0,
 	},
+	"vt1": {
+		InstanceType: "vt1",
+		VCPU:         96,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"vt1.24xlarge": {
+		InstanceType: "vt1.24xlarge",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"vt1.3xlarge": {
+		InstanceType: "vt1.3xlarge",
+		VCPU:         12,
+		MemoryMb:     24576,
+		GPU:          0,
+	},
+	"vt1.6xlarge": {
+		InstanceType: "vt1.6xlarge",
+		VCPU:         24,
+		MemoryMb:     49152,
+		GPU:          0,
+	},
 	"x1": {
 		InstanceType: "x1",
 		VCPU:         128,
@@ -2038,6 +2608,66 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     124928,
 		GPU:          0,
 	},
+	"x2gd": {
+		InstanceType: "x2gd",
+		VCPU:         64,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"x2gd.12xlarge": {
+		InstanceType: "x2gd.12xlarge",
+		VCPU:         48,
+		MemoryMb:     786432,
+		GPU:          0,
+	},
+	"x2gd.16xlarge": {
+		InstanceType: "x2gd.16xlarge",
+		VCPU:         64,
+		MemoryMb:     1048576,
+		GPU:          0,
+	},
+	"x2gd.2xlarge": {
+		InstanceType: "x2gd.2xlarge",
+		VCPU:         8,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"x2gd.4xlarge": {
+		InstanceType: "x2gd.4xlarge",
+		VCPU:         16,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"x2gd.8xlarge": {
+		InstanceType: "x2gd.8xlarge",
+		VCPU:         32,
+		MemoryMb:     524288,
+		GPU:          0,
+	},
+	"x2gd.large": {
+		InstanceType: "x2gd.large",
+		VCPU:         2,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"x2gd.medium": {
+		InstanceType: "x2gd.medium",
+		VCPU:         1,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"x2gd.metal": {
+		InstanceType: "x2gd.metal",
+		VCPU:         64,
+		MemoryMb:     1048576,
+		GPU:          0,
+	},
+	"x2gd.xlarge": {
+		InstanceType: "x2gd.xlarge",
+		VCPU:         4,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
 	"z1d": {
 		InstanceType: "z1d",
 		VCPU:         48,
diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go
index 0b2839980941..74fe1a887a14 100644
--- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go
+++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go
@@ -46,6 +46,7 @@ limitations under the License.
 
 package aws
 
+// InstanceType is spec of EC2 instance
 type InstanceType struct {
 	InstanceType string
 	VCPU         int64