Skip to content

Commit

Permalink
Merge pull request #6837 from mikesplain/add_t3a_family
Browse files Browse the repository at this point in the history
Add t3a family
  • Loading branch information
k8s-ci-robot authored Apr 26, 2019
2 parents 8b72574 + 148bbd9 commit 78f5b2c
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 0 deletions.
14 changes: 14 additions & 0 deletions hack/machine_types/vpc_ip_resource_limit.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,13 @@ var InstanceENIsAvailable = map[string]int{
"t3.large": 3,
"t3.xlarge": 4,
"t3.2xlarge": 4,
"t3a.nano": 2,
"t3a.micro": 2,
"t3a.small": 3,
"t3a.medium": 3,
"t3a.large": 3,
"t3a.xlarge": 4,
"t3a.2xlarge": 4,
"u-6tb1.metal": 5,
"u-9tb1.metal": 5,
"u-12tb1.metal": 5,
Expand Down Expand Up @@ -391,6 +398,13 @@ var InstanceIPsAvailable = map[string]int64{
"t3.large": 12,
"t3.xlarge": 15,
"t3.2xlarge": 15,
"t3a.nano": 2,
"t3a.micro": 2,
"t3a.small": 4,
"t3a.medium": 6,
"t3a.large": 12,
"t3a.xlarge": 15,
"t3a.2xlarge": 15,
"u-6tb1.metal": 30,
"u-9tb1.metal": 30,
"u-12tb1.metal": 30,
Expand Down
78 changes: 78 additions & 0 deletions upup/pkg/fi/cloudup/awsup/machine_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -1826,6 +1826,84 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
Burstable: true,
},

// t3a family
{
Name: "t3a.nano",
MemoryGB: 0.5,
ECU: 0 * BurstableCreditsToECUS,
Cores: 2,
InstanceENIs: 2,
InstanceIPsPerENI: 2,
EphemeralDisks: nil,
Burstable: true,
},

{
Name: "t3a.micro",
MemoryGB: 1,
ECU: 0 * BurstableCreditsToECUS,
Cores: 2,
InstanceENIs: 2,
InstanceIPsPerENI: 2,
EphemeralDisks: nil,
Burstable: true,
},

{
Name: "t3a.small",
MemoryGB: 2,
ECU: 0 * BurstableCreditsToECUS,
Cores: 2,
InstanceENIs: 3,
InstanceIPsPerENI: 4,
EphemeralDisks: nil,
Burstable: true,
},

{
Name: "t3a.medium",
MemoryGB: 4,
ECU: 0 * BurstableCreditsToECUS,
Cores: 2,
InstanceENIs: 3,
InstanceIPsPerENI: 6,
EphemeralDisks: nil,
Burstable: true,
},

{
Name: "t3a.large",
MemoryGB: 8,
ECU: 0 * BurstableCreditsToECUS,
Cores: 2,
InstanceENIs: 3,
InstanceIPsPerENI: 12,
EphemeralDisks: nil,
Burstable: true,
},

{
Name: "t3a.xlarge",
MemoryGB: 16,
ECU: 0 * BurstableCreditsToECUS,
Cores: 4,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: nil,
Burstable: true,
},

{
Name: "t3a.2xlarge",
MemoryGB: 32,
ECU: 0 * BurstableCreditsToECUS,
Cores: 8,
InstanceENIs: 4,
InstanceIPsPerENI: 15,
EphemeralDisks: nil,
Burstable: true,
},

// x1 family
{
Name: "x1.16xlarge",
Expand Down

0 comments on commit 78f5b2c

Please sign in to comment.