kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a1 and c5n instance types 

* Updated vpc_ip_resource_limits
* Ran `make update-machine-types`
This commit is contained in:
Justin Santa Barbara 2018-11-27 06:57:06 -05:00
parent 0c8e5579f2
commit 9a8100f74b
2 changed files with 134 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hack/machine_types/vpc_ip_resource_limit.go
View File

@ -32,6 +32,11 @@ package main
// InstanceENIsAvailable contains a mapping of instance types to the number of ENIs available which is described at // InstanceENIsAvailable contains a mapping of instance types to the number of ENIs available which is described at
// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
var InstanceENIsAvailable = map[string]int{ var InstanceENIsAvailable = map[string]int{
"a1.medium": 2,
"a1.large": 3,
"a1.xlarge": 4,
"a1.2xlarge": 4,
"a1.4xlarge": 8,
"c1.medium": 2, "c1.medium": 2,
"c1.xlarge": 4, "c1.xlarge": 4,
"c3.large": 3, "c3.large": 3,
@ -56,6 +61,12 @@ var InstanceENIsAvailable = map[string]int{
"c5d.4xlarge": 8, "c5d.4xlarge": 8,
"c5d.9xlarge": 8, "c5d.9xlarge": 8,
"c5d.18xlarge": 15, "c5d.18xlarge": 15,
"c5n.large": 3,
"c5n.xlarge": 4,
"c5n.2xlarge": 4,
"c5n.4xlarge": 8,
"c5n.9xlarge": 8,
"c5n.18xlarge": 15,
"cc2.8xlarge": 8, "cc2.8xlarge": 8,
"cr1.8xlarge": 8, "cr1.8xlarge": 8,
"d2.xlarge": 4, "d2.xlarge": 4,
@ -194,6 +205,11 @@ var InstanceENIsAvailable = map[string]int{
// InstanceIPsAvailable contains a mapping of instance types to the number of IPs per ENI // InstanceIPsAvailable contains a mapping of instance types to the number of IPs per ENI
// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
var InstanceIPsAvailable = map[string]int64{ var InstanceIPsAvailable = map[string]int64{
"a1.medium": 4,
"a1.large": 10,
"a1.xlarge": 15,
"a1.2xlarge": 15,
"a1.4xlarge": 30,
"c1.medium": 6, "c1.medium": 6,
"c1.xlarge": 15, "c1.xlarge": 15,
"c3.large": 10, "c3.large": 10,
@ -218,6 +234,12 @@ var InstanceIPsAvailable = map[string]int64{
"c5d.4xlarge": 30, "c5d.4xlarge": 30,
"c5d.9xlarge": 30, "c5d.9xlarge": 30,
"c5d.18xlarge": 50, "c5d.18xlarge": 50,
"c5n.large": 10,
"c5n.xlarge": 15,
"c5n.2xlarge": 15,
"c5n.4xlarge": 30,
"c5n.9xlarge": 30,
"c5n.18xlarge": 50,
"cc2.8xlarge": 30, "cc2.8xlarge": 30,
"cr1.8xlarge": 30, "cr1.8xlarge": 30,
"d2.xlarge": 15, "d2.xlarge": 15,

112
upup/pkg/fi/cloudup/awsup/machine_types.go
View File

@ -80,6 +80,57 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
// NOTE: Content below is auto generated by `make update-machine-types` // NOTE: Content below is auto generated by `make update-machine-types`
// BEGIN GENERATED CONTENT // BEGIN GENERATED CONTENT
// a1 family
{
Name: "a1.medium",
MemoryGB: 2,
ECU: 0,
Cores: 1,
InstanceENIs: 2,
InstanceIPsPerENI: 4,
EphemeralDisks: nil,
},
{
Name: "a1.large",
MemoryGB: 4,
ECU: 0,
Cores: 2,
InstanceENIs: 3,
InstanceIPsPerENI: 10,
EphemeralDisks: nil,
},
{
Name: "a1.xlarge",
MemoryGB: 8,
ECU: 0,
Cores: 4,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: nil,
},
{
Name: "a1.2xlarge",
MemoryGB: 16,
ECU: 0,
Cores: 8,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: nil,
},
{
Name: "a1.4xlarge",
MemoryGB: 32,
ECU: 0,
Cores: 16,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: nil,
},
// c1 family // c1 family
{ {
Name: "c1.medium", Name: "c1.medium",
@ -325,6 +376,67 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: []int{900, 900}, EphemeralDisks: []int{900, 900},
}, },
// c5n family
{
Name: "c5n.large",
MemoryGB: 5.25,
ECU: 0,
Cores: 2,
InstanceENIs: 3,
InstanceIPsPerENI: 10,
EphemeralDisks: nil,
},
{
Name: "c5n.xlarge",
MemoryGB: 10.5,
ECU: 0,
Cores: 4,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: nil,
},
{
Name: "c5n.2xlarge",
MemoryGB: 21,
ECU: 0,
Cores: 8,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: nil,
},
{
Name: "c5n.4xlarge",
MemoryGB: 42,
ECU: 0,
Cores: 16,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: nil,
},
{
Name: "c5n.9xlarge",
MemoryGB: 96,
ECU: 0,
Cores: 36,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: nil,
},
{
Name: "c5n.18xlarge",
MemoryGB: 192,
ECU: 0,
Cores: 72,
InstanceENIs: 15,
InstanceIPsPerENI: 50,
EphemeralDisks: nil,
},
// cc2 family // cc2 family
{ {
Name: "cc2.8xlarge", Name: "cc2.8xlarge",