Merge pull request kubernetes#4431 from sturman/CA-EC2-AWS-Instance-L…

…ist-Update-29-10-21-1.21 CA - AWS - Instance List Update 29-10-21 - 1.21 release branch
gandhipr · Nov 1, 2021 · 5547629 · 5547629
2 parents fc39466 + 2ce33e8
commit 5547629
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 1 deletion.
diff --git 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"
 )
 
 type response struct {

diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
@@ -598,6 +598,66 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     8192,
 		GPU:          0,
 	},
+	"c6i": {
+		InstanceType: "c6i",
+		VCPU:         128,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"c6i.12xlarge": {
+		InstanceType: "c6i.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+	},
+	"c6i.16xlarge": {
+		InstanceType: "c6i.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"c6i.24xlarge": {
+		InstanceType: "c6i.24xlarge",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"c6i.2xlarge": {
+		InstanceType: "c6i.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
+	"c6i.32xlarge": {
+		InstanceType: "c6i.32xlarge",
+		VCPU:         128,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"c6i.4xlarge": {
+		InstanceType: "c6i.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"c6i.8xlarge": {
+		InstanceType: "c6i.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"c6i.large": {
+		InstanceType: "c6i.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+	},
+	"c6i.xlarge": {
+		InstanceType: "c6i.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
 	"cc2.8xlarge": {
 		InstanceType: "cc2.8xlarge",
 		VCPU:         32,
@@ -700,6 +760,18 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     16384,
 		GPU:          0,
 	},
+	"dl1": {
+		InstanceType: "dl1",
+		VCPU:         96,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"dl1.24xlarge": {
+		InstanceType: "dl1.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+	},
 	"f1": {
 		InstanceType: "f1",
 		VCPU:         64,