From 615460ebe540bc3819d448eb19865b2cd16ff0f3 Mon Sep 17 00:00:00 2001
From: sturman <4456572+sturman@users.noreply.github.com>
Date: Fri, 29 Oct 2021 10:06:47 +0300
Subject: [PATCH] CA - AWS - Instance List Update 29-10-21 - 1.22 release
 branch

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

diff --git a/cluster-autoscaler/cloudprovider/aws/aws_util.go b/cluster-autoscaler/cloudprovider/aws/aws_util.go
index ea0e4a9f7d47..bb8c9ec343fb 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-10-03"
+	staticListLastUpdateTime       = "2021-10-29"
 	ec2Arm64Processors             = []string{"AWS Graviton Processor", "AWS Graviton2 Processor"}
 )
 
diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
index 3e2e81fb5092..2e5b01248fd8 100644
--- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
+++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
@@ -694,6 +694,76 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "arm64",
 	},
+	"c6i": {
+		InstanceType: "c6i",
+		VCPU:         128,
+		MemoryMb:     0,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c6i.12xlarge": {
+		InstanceType: "c6i.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c6i.16xlarge": {
+		InstanceType: "c6i.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c6i.24xlarge": {
+		InstanceType: "c6i.24xlarge",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c6i.2xlarge": {
+		InstanceType: "c6i.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c6i.32xlarge": {
+		InstanceType: "c6i.32xlarge",
+		VCPU:         128,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c6i.4xlarge": {
+		InstanceType: "c6i.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c6i.8xlarge": {
+		InstanceType: "c6i.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c6i.large": {
+		InstanceType: "c6i.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"c6i.xlarge": {
+		InstanceType: "c6i.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"cc2.8xlarge": {
 		InstanceType: "cc2.8xlarge",
 		VCPU:         32,
@@ -813,6 +883,20 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
+	"dl1": {
+		InstanceType: "dl1",
+		VCPU:         96,
+		MemoryMb:     0,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"dl1.24xlarge": {
+		InstanceType: "dl1.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"f1": {
 		InstanceType: "f1",
 		VCPU:         64,