Merge pull request #4522 from gjtempleton/CA-AWS-Instance-List-Update…

…-13-12-21-1.21 CA - AWS Instance List Update - 13/12/21 - 1.21
kubernetes · Dec 16, 2021 · 00c1211 · 00c1211
2 parents b45adf1 + 1026b58
commit 00c1211
Show file tree

Hide file tree

Showing 2 changed files with 91 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-11-29"
+	staticListLastUpdateTime       = "2021-12-13"
 )
 
 type response struct {

diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
@@ -1210,6 +1210,48 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     499712,
 		GPU:          0,
 	},
+	"im4gn": {
+		InstanceType: "im4gn",
+		VCPU:         64,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"im4gn.16xlarge": {
+		InstanceType: "im4gn.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+	},
+	"im4gn.2xlarge": {
+		InstanceType: "im4gn.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+	},
+	"im4gn.4xlarge": {
+		InstanceType: "im4gn.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+	},
+	"im4gn.8xlarge": {
+		InstanceType: "im4gn.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+	},
+	"im4gn.large": {
+		InstanceType: "im4gn.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+	},
+	"im4gn.xlarge": {
+		InstanceType: "im4gn.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
 	"inf1": {
 		InstanceType: "inf1",
 		VCPU:         96,
@@ -1240,6 +1282,42 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     8192,
 		GPU:          0,
 	},
+	"is4gen.2xlarge": {
+		InstanceType: "is4gen.2xlarge",
+		VCPU:         8,
+		MemoryMb:     49152,
+		GPU:          0,
+	},
+	"is4gen.4xlarge": {
+		InstanceType: "is4gen.4xlarge",
+		VCPU:         16,
+		MemoryMb:     98304,
+		GPU:          0,
+	},
+	"is4gen.8xlarge": {
+		InstanceType: "is4gen.8xlarge",
+		VCPU:         32,
+		MemoryMb:     196608,
+		GPU:          0,
+	},
+	"is4gen.large": {
+		InstanceType: "is4gen.large",
+		VCPU:         2,
+		MemoryMb:     12288,
+		GPU:          0,
+	},
+	"is4gen.medium": {
+		InstanceType: "is4gen.medium",
+		VCPU:         1,
+		MemoryMb:     6144,
+		GPU:          0,
+	},
+	"is4gen.xlarge": {
+		InstanceType: "is4gen.xlarge",
+		VCPU:         4,
+		MemoryMb:     24576,
+		GPU:          0,
+	},
 	"m1.large": {
 		InstanceType: "m1.large",
 		VCPU:         2,
@@ -2002,6 +2080,18 @@ var InstanceTypes = map[string]*InstanceType{
 		MemoryMb:     32768,
 		GPU:          0,
 	},
+	"mac2": {
+		InstanceType: "mac2",
+		VCPU:         12,
+		MemoryMb:     0,
+		GPU:          0,
+	},
+	"mac2.metal": {
+		InstanceType: "mac2.metal",
+		VCPU:         12,
+		MemoryMb:     16384,
+		GPU:          0,
+	},
 	"p2": {
 		InstanceType: "p2",
 		VCPU:         64,