From 41f52546bc4ab02138a4ec4d61bec3174c19f8cd Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 4 Jun 2015 10:51:30 -0400 Subject: [PATCH] AWS: Add d2 instance types Another family of instance types, I think the next-gen of hs1 --- pkg/cloudprovider/aws/aws.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/cloudprovider/aws/aws.go b/pkg/cloudprovider/aws/aws.go index 4d311faeb10..29cfff92c7c 100644 --- a/pkg/cloudprovider/aws/aws.go +++ b/pkg/cloudprovider/aws/aws.go @@ -805,6 +805,16 @@ func getResourcesByInstanceType(instanceType string) (*api.NodeResources, error) case "hs1.8xlarge": return makeNodeResources("hs1", 35, 117) + // d2: Dense instances (next-gen of hs1) + case "d2.xlarge": + return makeNodeResources("d2", 14, 30.5) + case "d2.2xlarge": + return makeNodeResources("d2", 28, 61) + case "d2.4xlarge": + return makeNodeResources("d2", 56, 122) + case "d2.8xlarge": + return makeNodeResources("d2", 116, 244) + // m1: General purpose case "m1.small": return makeNodeResources("m1", 1, 1.7)