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

Merge pull request #6724 from mikesplain/update_instance_types 

Update instances types
This commit is contained in:
Kubernetes Prow Robot 2019-04-04 19:29:18 -07:00 committed by GitHub
parent 017c5ef15a db6c0eb02c
commit 74c880f12e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 147 additions and 1 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

@ -135,6 +135,18 @@ var InstanceENIsAvailable = map[string]int{
"m5d.12xlarge": 8,
"m5d.24xlarge": 15,
"m5d.metal": 15,
"m5ad.12xlarge": 8,
"m5ad.xlarge": 4,
"r5ad.large": 3,
"m5ad.4xlarge": 8,
"m5ad.large": 3,
"r5ad.24xlarge": 15,
"r5ad.12xlarge": 8,
"m5ad.24xlarge": 15,
"r5ad.2xlarge": 4,
"m5ad.2xlarge": 4,
"r5ad.xlarge": 4,
"r5ad.4xlarge": 8,
"p2.xlarge": 4,
"p2.8xlarge": 8,
"p2.16xlarge": 8,
@ -314,6 +326,18 @@ var InstanceIPsAvailable = map[string]int64{
"m5d.12xlarge": 30,
"m5d.24xlarge": 50,
"m5d.metal": 50,
"m5ad.12xlarge": 30,
"m5ad.xlarge": 15,
"r5ad.large": 10,
"m5ad.4xlarge": 30,
"m5ad.large": 10,
"r5ad.24xlarge": 50,
"r5ad.12xlarge": 30,
"m5ad.24xlarge": 50,
"r5ad.2xlarge": 15,
"m5ad.2xlarge": 15,
"r5ad.xlarge": 15,
"r5ad.4xlarge": 30,
"p2.xlarge": 15,
"p2.8xlarge": 30,
"p2.16xlarge": 30,

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

@ -1070,6 +1070,67 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
// m5ad family
{
Name: "m5ad.large",
MemoryGB: 8,
ECU: 0,
Cores: 2,
InstanceENIs: 3,
InstanceIPsPerENI: 10,
EphemeralDisks: []int{75},
},
{
Name: "m5ad.xlarge",
MemoryGB: 16,
ECU: 0,
Cores: 4,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: []int{150},
},
{
Name: "m5ad.2xlarge",
MemoryGB: 32,
ECU: 0,
Cores: 8,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: []int{300},
},
{
Name: "m5ad.4xlarge",
MemoryGB: 64,
ECU: 0,
Cores: 16,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: []int{300, 300},
},
{
Name: "m5ad.12xlarge",
MemoryGB: 192,
ECU: 0,
Cores: 48,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: []int{900, 900},
},
{
Name: "m5ad.24xlarge",
MemoryGB: 384,
ECU: 0,
Cores: 96,
InstanceENIs: 15,
InstanceIPsPerENI: 50,
EphemeralDisks: []int{900, 900, 900, 900},
},
// m5d family
{
Name: "m5d.large",
@ -1337,7 +1398,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
{
Name: "r5.large",
MemoryGB: 16,
ECU: 10,
ECU: 9,
Cores: 2,
InstanceENIs: 3,
InstanceIPsPerENI: 10,
@ -1465,6 +1526,67 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
EphemeralDisks: nil,
},
// r5ad family
{
Name: "r5ad.large",
MemoryGB: 16,
ECU: 0,
Cores: 2,
InstanceENIs: 3,
InstanceIPsPerENI: 10,
EphemeralDisks: []int{75},
},
{
Name: "r5ad.xlarge",
MemoryGB: 32,
ECU: 0,
Cores: 4,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: []int{150},
},
{
Name: "r5ad.2xlarge",
MemoryGB: 64,
ECU: 0,
Cores: 8,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: []int{300},
},
{
Name: "r5ad.4xlarge",
MemoryGB: 128,
ECU: 0,
Cores: 16,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: []int{300, 300},
},
{
Name: "r5ad.12xlarge",
MemoryGB: 384,
ECU: 0,
Cores: 48,
InstanceENIs: 8,
InstanceIPsPerENI: 30,
EphemeralDisks: []int{900, 900},
},
{
Name: "r5ad.24xlarge",
MemoryGB: 768,
ECU: 0,
Cores: 96,
InstanceENIs: 15,
InstanceIPsPerENI: 50,
EphemeralDisks: []int{900, 900, 900, 900},
},
// r5d family
{
Name: "r5d.large",