From 7f1b3ba73eac774f36cdbdd02578c93beb899a76 Mon Sep 17 00:00:00 2001
From: GuyTempleton <guy.templeton@skyscanner.net>
Date: Thu, 2 Jun 2022 17:18:34 +0100
Subject: [PATCH] CA - AWS Cloud Provider - 1.20 Static Instance List Update
 02-06-2022

---
 .../cloudprovider/aws/aws_util.go             |   2 +-
 .../cloudprovider/aws/ec2_instance_types.go   | 468 ++++++++++++++++++
 2 files changed, 469 insertions(+), 1 deletion(-)

diff --git a/cluster-autoscaler/cloudprovider/aws/aws_util.go b/cluster-autoscaler/cloudprovider/aws/aws_util.go
index 8001457430f3..8176f96ba07a 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       = "2021-12-13"
+	staticListLastUpdateTime       = "2022-06-02"
 )
 
 type response struct {
diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
index dc5fb55fe8e7..dc6a6032ae0c 100644
--- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
+++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
@@ -418,6 +418,78 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     10752,
 		GPU:          0,
 	},
+	"c6a": {
+		InstanceType: "c6a",
+		VCPU:         192,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"c6a.12xlarge": {
+		InstanceType: "c6a.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+	},
+	"c6a.16xlarge": {
+		InstanceType: "c6a.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"c6a.24xlarge": {
+		InstanceType: "c6a.24xlarge",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"c6a.2xlarge": {
+		InstanceType: "c6a.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"c6a.32xlarge": {
+		InstanceType: "c6a.32xlarge",
+		VCPU:         128,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"c6a.48xlarge": {
+		InstanceType: "c6a.48xlarge",
+		VCPU:         192,
+		MemoryMb:     393216,
+		GPU:          0,
+	},
+	"c6a.4xlarge": {
+		InstanceType: "c6a.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"c6a.8xlarge": {
+		InstanceType: "c6a.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"c6a.large": {
+		InstanceType: "c6a.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+	},
+	"c6a.metal": {
+		InstanceType: "c6a.metal",
+		VCPU:         192,
+		MemoryMb:     393216,
+		GPU:          0,
+	},
+	"c6a.xlarge": {
+		InstanceType: "c6a.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
 	"c6g": {
 		InstanceType: "c6g",
 		VCPU:         64,
@@ -664,6 +736,126 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     8192,
 		GPU:          0,
 	},
+	"c6id": {
+		InstanceType: "c6id",
+		VCPU:         128,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"c6id.12xlarge": {
+		InstanceType: "c6id.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+	},
+	"c6id.16xlarge": {
+		InstanceType: "c6id.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"c6id.24xlarge": {
+		InstanceType: "c6id.24xlarge",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"c6id.2xlarge": {
+		InstanceType: "c6id.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"c6id.32xlarge": {
+		InstanceType: "c6id.32xlarge",
+		VCPU:         128,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"c6id.4xlarge": {
+		InstanceType: "c6id.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"c6id.8xlarge": {
+		InstanceType: "c6id.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"c6id.large": {
+		InstanceType: "c6id.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+	},
+	"c6id.metal": {
+		InstanceType: "c6id.metal",
+		VCPU:         128,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"c6id.xlarge": {
+		InstanceType: "c6id.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
+	"c7g": {
+		InstanceType: "c7g",
+		VCPU:         64,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"c7g.12xlarge": {
+		InstanceType: "c7g.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+	},
+	"c7g.16xlarge": {
+		InstanceType: "c7g.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"c7g.2xlarge": {
+		InstanceType: "c7g.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"c7g.4xlarge": {
+		InstanceType: "c7g.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"c7g.8xlarge": {
+		InstanceType: "c7g.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"c7g.large": {
+		InstanceType: "c7g.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+	},
+	"c7g.medium": {
+		InstanceType: "c7g.medium",
+		VCPU:         1,
+		MemoryMb:     2048,
+		GPU:          0,
+	},
+	"c7g.xlarge": {
+		InstanceType: "c7g.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
 	"cc2.8xlarge": {
 		InstanceType: "cc2.8xlarge",
 		VCPU:         32,
@@ -1060,6 +1252,12 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     131072,
 		GPU:          0,
 	},
+	"hpc6a.48xlarge": {
+		InstanceType: "hpc6a.48xlarge",
+		VCPU:         96,
+		MemoryMb:     393216,
+		GPU:          0,
+	},
 	"hs1.8xlarge": {
 		InstanceType: "hs1.8xlarge",
 		VCPU:         16,
@@ -1210,6 +1408,60 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     499712,
 		GPU:          0,
 	},
+	"i4i": {
+		InstanceType: "i4i",
+		VCPU:         128,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"i4i.16xlarge": {
+		InstanceType: "i4i.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+	},
+	"i4i.2xlarge": {
+		InstanceType: "i4i.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"i4i.32xlarge": {
+		InstanceType: "i4i.32xlarge",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+	},
+	"i4i.4xlarge": {
+		InstanceType: "i4i.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"i4i.8xlarge": {
+		InstanceType: "i4i.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"i4i.large": {
+		InstanceType: "i4i.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"i4i.metal": {
+		InstanceType: "i4i.metal",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+	},
+	"i4i.xlarge": {
+		InstanceType: "i4i.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
 	"im4gn": {
 		InstanceType: "im4gn",
 		VCPU:         64,
@@ -1876,6 +2128,12 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     8192,
 		GPU:          0,
 	},
+	"m6a.metal": {
+		InstanceType: "m6a.metal",
+		VCPU:         192,
+		MemoryMb:     786432,
+		GPU:          0,
+	},
 	"m6a.xlarge": {
 		InstanceType: "m6a.xlarge",
 		VCPU:         4,
@@ -2068,6 +2326,72 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     16384,
 		GPU:          0,
 	},
+	"m6id": {
+		InstanceType: "m6id",
+		VCPU:         128,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"m6id.12xlarge": {
+		InstanceType: "m6id.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"m6id.16xlarge": {
+		InstanceType: "m6id.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"m6id.24xlarge": {
+		InstanceType: "m6id.24xlarge",
+		VCPU:         96,
+		MemoryMb:     393216,
+		GPU:          0,
+	},
+	"m6id.2xlarge": {
+		InstanceType: "m6id.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"m6id.32xlarge": {
+		InstanceType: "m6id.32xlarge",
+		VCPU:         128,
+		MemoryMb:     524288,
+		GPU:          0,
+	},
+	"m6id.4xlarge": {
+		InstanceType: "m6id.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"m6id.8xlarge": {
+		InstanceType: "m6id.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"m6id.large": {
+		InstanceType: "m6id.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
+	"m6id.metal": {
+		InstanceType: "m6id.metal",
+		VCPU:         128,
+		MemoryMb:     524288,
+		GPU:          0,
+	},
+	"m6id.xlarge": {
+		InstanceType: "m6id.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
 	"mac1": {
 		InstanceType: "mac1",
 		VCPU:         12,
@@ -2164,6 +2488,18 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     1179648,
 		GPU:          8,
 	},
+	"p4de": {
+		InstanceType: "p4de",
+		VCPU:         96,
+		MemoryMb:     0,
+		GPU:          8,
+	},
+	"p4de.24xlarge": {
+		InstanceType: "p4de.24xlarge",
+		VCPU:         96,
+		MemoryMb:     1179648,
+		GPU:          8,
+	},
 	"r3": {
 		InstanceType: "r3",
 		VCPU:         32,
@@ -3046,6 +3382,12 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     25165824,
 		GPU:          0,
 	},
+	"u-3tb1.56xlarge": {
+		InstanceType: "u-3tb1.56xlarge",
+		VCPU:         224,
+		MemoryMb:     3145728,
+		GPU:          0,
+	},
 	"u-6tb1": {
 		InstanceType: "u-6tb1",
 		VCPU:         448,
@@ -3232,6 +3574,132 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     65536,
 		GPU:          0,
 	},
+	"x2idn": {
+		InstanceType: "x2idn",
+		VCPU:         128,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"x2idn.16xlarge": {
+		InstanceType: "x2idn.16xlarge",
+		VCPU:         64,
+		MemoryMb:     1048576,
+		GPU:          0,
+	},
+	"x2idn.24xlarge": {
+		InstanceType: "x2idn.24xlarge",
+		VCPU:         96,
+		MemoryMb:     1572864,
+		GPU:          0,
+	},
+	"x2idn.32xlarge": {
+		InstanceType: "x2idn.32xlarge",
+		VCPU:         128,
+		MemoryMb:     2097152,
+		GPU:          0,
+	},
+	"x2idn.metal": {
+		InstanceType: "x2idn.metal",
+		VCPU:         128,
+		MemoryMb:     2097152,
+		GPU:          0,
+	},
+	"x2iedn": {
+		InstanceType: "x2iedn",
+		VCPU:         128,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"x2iedn.16xlarge": {
+		InstanceType: "x2iedn.16xlarge",
+		VCPU:         64,
+		MemoryMb:     2097152,
+		GPU:          0,
+	},
+	"x2iedn.24xlarge": {
+		InstanceType: "x2iedn.24xlarge",
+		VCPU:         96,
+		MemoryMb:     3145728,
+		GPU:          0,
+	},
+	"x2iedn.2xlarge": {
+		InstanceType: "x2iedn.2xlarge",
+		VCPU:         8,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"x2iedn.32xlarge": {
+		InstanceType: "x2iedn.32xlarge",
+		VCPU:         128,
+		MemoryMb:     4194304,
+		GPU:          0,
+	},
+	"x2iedn.4xlarge": {
+		InstanceType: "x2iedn.4xlarge",
+		VCPU:         16,
+		MemoryMb:     524288,
+		GPU:          0,
+	},
+	"x2iedn.8xlarge": {
+		InstanceType: "x2iedn.8xlarge",
+		VCPU:         32,
+		MemoryMb:     1048576,
+		GPU:          0,
+	},
+	"x2iedn.metal": {
+		InstanceType: "x2iedn.metal",
+		VCPU:         128,
+		MemoryMb:     4194304,
+		GPU:          0,
+	},
+	"x2iedn.xlarge": {
+		InstanceType: "x2iedn.xlarge",
+		VCPU:         4,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"x2iezn": {
+		InstanceType: "x2iezn",
+		VCPU:         48,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"x2iezn.12xlarge": {
+		InstanceType: "x2iezn.12xlarge",
+		VCPU:         48,
+		MemoryMb:     1572864,
+		GPU:          0,
+	},
+	"x2iezn.2xlarge": {
+		InstanceType: "x2iezn.2xlarge",
+		VCPU:         8,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"x2iezn.4xlarge": {
+		InstanceType: "x2iezn.4xlarge",
+		VCPU:         16,
+		MemoryMb:     524288,
+		GPU:          0,
+	},
+	"x2iezn.6xlarge": {
+		InstanceType: "x2iezn.6xlarge",
+		VCPU:         24,
+		MemoryMb:     786432,
+		GPU:          0,
+	},
+	"x2iezn.8xlarge": {
+		InstanceType: "x2iezn.8xlarge",
+		VCPU:         32,
+		MemoryMb:     1048576,
+		GPU:          0,
+	},
+	"x2iezn.metal": {
+		InstanceType: "x2iezn.metal",
+		VCPU:         48,
+		MemoryMb:     1572864,
+		GPU:          0,
+	},
 	"z1d": {
 		InstanceType: "z1d",
 		VCPU:         48,