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

Merge pull request #7195 from rekcah78/add_new_m5_r5_instances 

update instances list with make update-machine-types
This commit is contained in:
Kubernetes Prow Robot 2019-07-09 09:32:02 -07:00 committed by GitHub
parent 3636ae310b 2cc94d53ab
commit 21b5e3b3f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 144 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hack/machine_types/vpc_ip_resource_limit.go
View File

@ -129,20 +129,26 @@ var InstanceENIsAvailable = map[string]int{
"m5.xlarge": 4,
"m5.2xlarge": 4,
"m5.4xlarge": 8,
"m5.8xlarge": 8,
"m5.12xlarge": 8,
"m5.16xlarge": 15,
"m5.24xlarge": 15,
"m5.metal": 15,
"m5a.large": 3,
"m5a.xlarge": 4,
"m5a.2xlarge": 4,
"m5a.4xlarge": 8,
"m5a.8xlarge": 8,
"m5a.12xlarge": 8,
"m5a.16xlarge": 15,
"m5a.24xlarge": 15,
"m5d.large": 3,
"m5d.xlarge": 4,
"m5d.2xlarge": 4,
"m5d.4xlarge": 8,
"m5d.8xlarge": 8,
"m5d.12xlarge": 8,
"m5d.16xlarge": 15,
"m5d.24xlarge": 15,
"m5d.metal": 15,
"m5ad.12xlarge": 8,
@ -179,20 +185,26 @@ var InstanceENIsAvailable = map[string]int{
"r5.xlarge": 4,
"r5.2xlarge": 4,
"r5.4xlarge": 8,
"r5.8xlarge": 8,
"r5.12xlarge": 8,
"r5.16xlarge": 15,
"r5.24xlarge": 15,
"r5.metal": 15,
"r5a.large": 3,
"r5a.xlarge": 4,
"r5a.2xlarge": 4,
"r5a.4xlarge": 8,
"r5a.8xlarge": 8,
"r5a.12xlarge": 8,
"r5a.16xlarge": 15,
"r5a.24xlarge": 15,
"r5d.large": 3,
"r5d.xlarge": 4,
"r5d.2xlarge": 4,
"r5d.4xlarge": 8,
"r5d.8xlarge": 8,
"r5d.12xlarge": 8,
"r5d.16xlarge": 15,
"r5d.24xlarge": 15,
"r5d.metal": 15,
"t1.micro": 2,
@ -337,20 +349,26 @@ var InstanceIPsAvailable = map[string]int64{
"m5.xlarge": 15,
"m5.2xlarge": 15,
"m5.4xlarge": 30,
"m5.8xlarge": 30,
"m5.12xlarge": 30,
"m5.16xlarge": 30,
"m5.24xlarge": 50,
"m5.metal": 50,
"m5a.large": 10,
"m5a.xlarge": 15,
"m5a.2xlarge": 15,
"m5a.4xlarge": 30,
"m5a.8xlarge": 30,
"m5a.12xlarge": 30,
"m5a.16xlarge": 30,
"m5a.24xlarge": 50,
"m5d.large": 10,
"m5d.xlarge": 15,
"m5d.2xlarge": 15,
"m5d.4xlarge": 30,
"m5d.8xlarge": 30,
"m5d.12xlarge": 30,
"m5d.16xlarge": 30,
"m5d.24xlarge": 50,
"m5d.metal": 50,
"m5ad.12xlarge": 30,
@ -387,20 +405,26 @@ var InstanceIPsAvailable = map[string]int64{
"r5.xlarge": 15,
"r5.2xlarge": 15,
"r5.4xlarge": 30,
"r5.8xlarge": 30,
"r5.12xlarge": 30,
"r5.16xlarge": 50,
"r5.24xlarge": 50,
"r5.metal": 50,
"r5a.large": 10,
"r5a.xlarge": 15,
"r5a.2xlarge": 15,
"r5a.4xlarge": 30,
"r5a.8xlarge": 30,
"r5a.12xlarge": 30,
"r5a.16xlarge": 50,
"r5a.24xlarge": 50,
"r5d.large": 10,
"r5d.xlarge": 15,
"r5d.2xlarge": 15,
"r5d.4xlarge": 30,
"r5d.8xlarge": 30,
"r5d.12xlarge": 30,
"r5d.16xlarge": 50,
"r5d.24xlarge": 50,
"r5d.metal": 50,
"t1.micro": 2,

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

@ -1093,6 +1093,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
{
Name: "m5.8xlarge",
MemoryGB: 128,
ECU: 131,
Cores: 32,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: nil,
},
{
Name: "m5.12xlarge",
MemoryGB: 192,
@ -1103,6 +1113,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
{
Name: "m5.16xlarge",
MemoryGB: 256,
ECU: 262,
Cores: 64,
InstanceENIs: 15,
InstanceIPsPerENI: 30,
EphemeralDisks: nil,
},
{
Name: "m5.24xlarge",
MemoryGB: 384,
@ -1164,6 +1184,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
{
Name: "m5a.8xlarge",
MemoryGB: 128,
ECU: 0,
Cores: 32,
InstanceENIs: 0,
InstanceIPsPerENI: 0,
EphemeralDisks: nil,
},
{
Name: "m5a.12xlarge",
MemoryGB: 192,
@ -1174,6 +1204,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
{
Name: "m5a.16xlarge",
MemoryGB: 256,
ECU: 0,
Cores: 64,
InstanceENIs: 15,
InstanceIPsPerENI: 30,
EphemeralDisks: nil,
},
{
Name: "m5a.24xlarge",
MemoryGB: 384,
@ -1286,6 +1326,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: []int{300, 300},
},
{
Name: "m5d.8xlarge",
MemoryGB: 128,
ECU: 131,
Cores: 32,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: []int{600, 600},
},
{
Name: "m5d.12xlarge",
MemoryGB: 192,
@ -1296,6 +1346,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: []int{900, 900},
},
{
Name: "m5d.16xlarge",
MemoryGB: 256,
ECU: 262,
Cores: 64,
InstanceENIs: 15,
InstanceIPsPerENI: 30,
EphemeralDisks: []int{600, 600, 600, 600},
},
{
Name: "m5d.24xlarge",
MemoryGB: 384,
@ -1549,6 +1609,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
{
Name: "r5.8xlarge",
MemoryGB: 256,
ECU: 131,
Cores: 32,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: nil,
},
{
Name: "r5.12xlarge",
MemoryGB: 384,
@ -1559,6 +1629,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
{
Name: "r5.16xlarge",
MemoryGB: 512,
ECU: 262,
Cores: 64,
InstanceENIs: 15,
InstanceIPsPerENI: 50,
EphemeralDisks: nil,
},
{
Name: "r5.24xlarge",
MemoryGB: 768,
@ -1620,6 +1700,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
{
Name: "r5a.8xlarge",
MemoryGB: 256,
ECU: 0,
Cores: 32,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: nil,
},
{
Name: "r5a.12xlarge",
MemoryGB: 384,
@ -1630,6 +1720,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
{
Name: "r5a.16xlarge",
MemoryGB: 512,
ECU: 0,
Cores: 64,
InstanceENIs: 15,
InstanceIPsPerENI: 50,
EphemeralDisks: nil,
},
{
Name: "r5a.24xlarge",
MemoryGB: 768,
@ -1742,6 +1842,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: []int{300, 300},
},
{
Name: "r5d.8xlarge",
MemoryGB: 256,
ECU: 131,
Cores: 32,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: []int{600, 600},
},
{
Name: "r5d.12xlarge",
MemoryGB: 384,
@ -1752,6 +1862,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: []int{900, 900},
},
{
Name: "r5d.16xlarge",
MemoryGB: 512,
ECU: 262,
Cores: 64,
InstanceENIs: 15,
InstanceIPsPerENI: 50,
EphemeralDisks: []int{600, 600, 600, 600},
},
{
Name: "r5d.24xlarge",
MemoryGB: 768,