From 304d7229d5761563eaf3ae3b6b2bd24fac937b56 Mon Sep 17 00:00:00 2001 From: Alex Simenduev Date: Wed, 8 Nov 2017 10:50:38 +0200 Subject: [PATCH 1/2] Add support for C5 instance family --- upup/pkg/fi/cloudup/awsup/machine_types.go | 46 +++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/upup/pkg/fi/cloudup/awsup/machine_types.go b/upup/pkg/fi/cloudup/awsup/machine_types.go index 72fcbed94b..acc5565c77 100644 --- a/upup/pkg/fi/cloudup/awsup/machine_types.go +++ b/upup/pkg/fi/cloudup/awsup/machine_types.go @@ -279,7 +279,51 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ Cores: 32, EphemeralDisks: nil, }, - + + // c5 family + { + Name: "c5.large", + MemoryGB: 4, + ECU: 8, + Cores: 2, + EphemeralDisks: nil, + }, + { + Name: "c5.xlarge", + MemoryGB: 8, + ECU: 16, + Cores: 4, + EphemeralDisks: nil, + }, + { + Name: "c5.2xlarge", + MemoryGB: 16, + ECU: 31, + Cores: 8, + EphemeralDisks: nil, + }, + { + Name: "c5.4xlarge", + MemoryGB: 32, + ECU: 62, + Cores: 16, + EphemeralDisks: nil, + }, + { + Name: "c5.9xlarge", + MemoryGB: 72, + ECU: 139, + Cores: 36, + EphemeralDisks: nil, + }, + { + Name: "c5.18xlarge", + MemoryGB: 144, + ECU: 278, + Cores: 72, + EphemeralDisks: nil, + }, + // cc2 family { Name: "cc2.8xlarge", From a99844ffb94f43367b33ca7d66e116fd78028660 Mon Sep 17 00:00:00 2001 From: Alex Simenduev Date: Wed, 8 Nov 2017 12:20:53 +0200 Subject: [PATCH 2/2] machine_types: go formatting --- upup/pkg/fi/cloudup/awsup/machine_types.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/upup/pkg/fi/cloudup/awsup/machine_types.go b/upup/pkg/fi/cloudup/awsup/machine_types.go index acc5565c77..1960f79f6c 100644 --- a/upup/pkg/fi/cloudup/awsup/machine_types.go +++ b/upup/pkg/fi/cloudup/awsup/machine_types.go @@ -279,7 +279,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ Cores: 32, EphemeralDisks: nil, }, - + // c5 family { Name: "c5.large", @@ -315,15 +315,15 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ ECU: 139, Cores: 36, EphemeralDisks: nil, - }, + }, { Name: "c5.18xlarge", MemoryGB: 144, ECU: 278, Cores: 72, EphemeralDisks: nil, - }, - + }, + // cc2 family { Name: "cc2.8xlarge",