From 63161aada11eaf979511c002b1ed4ec099bb06d1 Mon Sep 17 00:00:00 2001 From: Matt McClean <124083747+mmcclean-aws@users.noreply.github.com> Date: Wed, 22 Feb 2023 09:26:06 -0800 Subject: [PATCH 1/4] Added support for in2 instance types Added support for the AWS Inferentia 2 instance types based on the NeuronCore v2 chip architecture --- .../cloudprovider/aws/ec2_instance_types.go | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go index 5e3d04971cd3..b65fabcba5db 100644 --- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go +++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go @@ -1614,6 +1614,34 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, + "inf2.48xlarge": { + InstanceType: "inf2.48xlarge", + VCPU: 192, + MemoryMb: 786432, + GPU: 0, + Architecture: "amd64", + }, + "inf2.24xlarge": { + InstanceType: "inf2.24xlarge", + VCPU: 96, + MemoryMb: 393216, + GPU: 0, + Architecture: "amd64", + }, + "inf2.8xlarge": { + InstanceType: "inf2.8xlarge", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + Architecture: "amd64", + }, + "inf2.xlarge": { + InstanceType: "inf2.xlarge", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + Architecture: "amd64", + }, "is4gen.2xlarge": { InstanceType: "is4gen.2xlarge", VCPU: 8, From ee86ce4bf737af5bb18867bd7a225463ad5dfb76 Mon Sep 17 00:00:00 2001 From: Matt McClean Date: Wed, 22 Feb 2023 10:18:35 -0800 Subject: [PATCH 2/4] added inf2 instance types to ec2 api.go and api-2.json files --- .../aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json | 4 ++++ .../cloudprovider/aws/aws-sdk-go/service/ec2/api.go | 12 ++++++++++++ .../github.com/aws/aws-sdk-go/service/ec2/api.go | 12 ++++++++++++ .../github.com/aws/aws-sdk-go/service/ec2/api.go | 12 ++++++++++++ 4 files changed, 40 insertions(+) diff --git a/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json b/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json index be3fccbd480d..a7e5b55fb981 100755 --- a/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json +++ b/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json @@ -23923,6 +23923,10 @@ "inf1.2xlarge", "inf1.6xlarge", "inf1.24xlarge", + "inf2.xlarge", + "inf2.8xlarge", + "inf2.24xlarge", + "inf2.48xlarge", "is4gen.medium", "is4gen.large", "is4gen.xlarge", diff --git a/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/service/ec2/api.go b/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/service/ec2/api.go index dfeaa9f15b03..e93bbaba437b 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/service/ec2/api.go +++ b/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/service/ec2/api.go @@ -163607,6 +163607,18 @@ const ( // InstanceTypeInf124xlarge is a InstanceType enum value InstanceTypeInf124xlarge = "inf1.24xlarge" + // InstanceTypeInf2Xlarge is a InstanceType enum value + InstanceTypeInf2Xlarge = "inf2.xlarge" + + // InstanceTypeInf28xlarge is a InstanceType enum value + InstanceTypeInf28xlarge = "inf2.8xlarge" + + // InstanceTypeInf224xlarge is a InstanceType enum value + InstanceTypeInf224xlarge = "inf2.24xlarge" + + // InstanceTypeInf248xlarge is a InstanceType enum value + InstanceTypeInf248xlarge = "inf2.48xlarge" + // InstanceTypeIs4genMedium is a InstanceType enum value InstanceTypeIs4genMedium = "is4gen.medium" diff --git a/cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go b/cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go index 23be76a83ff7..9ce1e92badcc 100644 --- a/cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go +++ b/cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go @@ -171919,6 +171919,18 @@ const ( // InstanceTypeInf124xlarge is a InstanceType enum value InstanceTypeInf124xlarge = "inf1.24xlarge" + // InstanceTypeInf2Xlarge is a InstanceType enum value + InstanceTypeInf2Xlarge = "inf2.xlarge" + + // InstanceTypeInf28xlarge is a InstanceType enum value + InstanceTypeInf28xlarge = "inf2.8xlarge" + + // InstanceTypeInf224xlarge is a InstanceType enum value + InstanceTypeInf224xlarge = "inf2.24xlarge" + + // InstanceTypeInf248xlarge is a InstanceType enum value + InstanceTypeInf248xlarge = "inf2.48xlarge" + // InstanceTypeIs4genMedium is a InstanceType enum value InstanceTypeIs4genMedium = "is4gen.medium" diff --git a/vertical-pod-autoscaler/e2e/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go b/vertical-pod-autoscaler/e2e/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go index 8550cffea5e4..74848617aa92 100644 --- a/vertical-pod-autoscaler/e2e/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go +++ b/vertical-pod-autoscaler/e2e/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go @@ -127273,6 +127273,18 @@ const ( // InstanceTypeInf124xlarge is a InstanceType enum value InstanceTypeInf124xlarge = "inf1.24xlarge" + // InstanceTypeInf2Xlarge is a InstanceType enum value + InstanceTypeInf2Xlarge = "inf2.xlarge" + + // InstanceTypeInf28xlarge is a InstanceType enum value + InstanceTypeInf28xlarge = "inf2.8xlarge" + + // InstanceTypeInf224xlarge is a InstanceType enum value + InstanceTypeInf224xlarge = "inf2.24xlarge" + + // InstanceTypeInf248xlarge is a InstanceType enum value + InstanceTypeInf248xlarge = "inf2.48xlarge" + // InstanceTypeM6gMetal is a InstanceType enum value InstanceTypeM6gMetal = "m6g.metal" From 436c61841ac8bb80d3195632d5c97694b7cdfcaa Mon Sep 17 00:00:00 2001 From: Matt McClean Date: Mon, 6 Mar 2023 14:51:39 -0800 Subject: [PATCH 3/4] rolled back VPA files --- .../aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json | 4 ---- .../cloudprovider/aws/aws-sdk-go/service/ec2/api.go | 12 ------------ .../github.com/aws/aws-sdk-go/service/ec2/api.go | 12 ------------ .../github.com/aws/aws-sdk-go/service/ec2/api.go | 12 ------------ 4 files changed, 40 deletions(-) diff --git a/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json b/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json index a7e5b55fb981..be3fccbd480d 100755 --- a/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json +++ b/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/models/apis/ec2/2016-11-15/api-2.json @@ -23923,10 +23923,6 @@ "inf1.2xlarge", "inf1.6xlarge", "inf1.24xlarge", - "inf2.xlarge", - "inf2.8xlarge", - "inf2.24xlarge", - "inf2.48xlarge", "is4gen.medium", "is4gen.large", "is4gen.xlarge", diff --git a/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/service/ec2/api.go b/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/service/ec2/api.go index e93bbaba437b..dfeaa9f15b03 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/service/ec2/api.go +++ b/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/service/ec2/api.go @@ -163607,18 +163607,6 @@ const ( // InstanceTypeInf124xlarge is a InstanceType enum value InstanceTypeInf124xlarge = "inf1.24xlarge" - // InstanceTypeInf2Xlarge is a InstanceType enum value - InstanceTypeInf2Xlarge = "inf2.xlarge" - - // InstanceTypeInf28xlarge is a InstanceType enum value - InstanceTypeInf28xlarge = "inf2.8xlarge" - - // InstanceTypeInf224xlarge is a InstanceType enum value - InstanceTypeInf224xlarge = "inf2.24xlarge" - - // InstanceTypeInf248xlarge is a InstanceType enum value - InstanceTypeInf248xlarge = "inf2.48xlarge" - // InstanceTypeIs4genMedium is a InstanceType enum value InstanceTypeIs4genMedium = "is4gen.medium" diff --git a/cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go b/cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go index 9ce1e92badcc..23be76a83ff7 100644 --- a/cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go +++ b/cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go @@ -171919,18 +171919,6 @@ const ( // InstanceTypeInf124xlarge is a InstanceType enum value InstanceTypeInf124xlarge = "inf1.24xlarge" - // InstanceTypeInf2Xlarge is a InstanceType enum value - InstanceTypeInf2Xlarge = "inf2.xlarge" - - // InstanceTypeInf28xlarge is a InstanceType enum value - InstanceTypeInf28xlarge = "inf2.8xlarge" - - // InstanceTypeInf224xlarge is a InstanceType enum value - InstanceTypeInf224xlarge = "inf2.24xlarge" - - // InstanceTypeInf248xlarge is a InstanceType enum value - InstanceTypeInf248xlarge = "inf2.48xlarge" - // InstanceTypeIs4genMedium is a InstanceType enum value InstanceTypeIs4genMedium = "is4gen.medium" diff --git a/vertical-pod-autoscaler/e2e/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go b/vertical-pod-autoscaler/e2e/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go index 74848617aa92..8550cffea5e4 100644 --- a/vertical-pod-autoscaler/e2e/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go +++ b/vertical-pod-autoscaler/e2e/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go @@ -127273,18 +127273,6 @@ const ( // InstanceTypeInf124xlarge is a InstanceType enum value InstanceTypeInf124xlarge = "inf1.24xlarge" - // InstanceTypeInf2Xlarge is a InstanceType enum value - InstanceTypeInf2Xlarge = "inf2.xlarge" - - // InstanceTypeInf28xlarge is a InstanceType enum value - InstanceTypeInf28xlarge = "inf2.8xlarge" - - // InstanceTypeInf224xlarge is a InstanceType enum value - InstanceTypeInf224xlarge = "inf2.24xlarge" - - // InstanceTypeInf248xlarge is a InstanceType enum value - InstanceTypeInf248xlarge = "inf2.48xlarge" - // InstanceTypeM6gMetal is a InstanceType enum value InstanceTypeM6gMetal = "m6g.metal" From fdfd4e6f50abfa74ba1fb898df2febbc9734b678 Mon Sep 17 00:00:00 2001 From: Matt McClean <124083747+mmcclean-aws@users.noreply.github.com> Date: Wed, 8 Mar 2023 11:55:40 -0800 Subject: [PATCH 4/4] Removed whitespace Co-authored-by: Guy Templeton --- cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go index b65fabcba5db..a9af34c37052 100644 --- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go +++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go @@ -1641,7 +1641,7 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, Architecture: "amd64", - }, + }, "is4gen.2xlarge": { InstanceType: "is4gen.2xlarge", VCPU: 8,