diff --git a/hack/machine_types/vpc_ip_resource_limit.go b/hack/machine_types/vpc_ip_resource_limit.go index cd75ed57e3..10adf26616 100644 --- a/hack/machine_types/vpc_ip_resource_limit.go +++ b/hack/machine_types/vpc_ip_resource_limit.go @@ -32,6 +32,11 @@ package main // 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 var InstanceENIsAvailable = map[string]int{ + "a1.medium": 2, + "a1.large": 3, + "a1.xlarge": 4, + "a1.2xlarge": 4, + "a1.4xlarge": 8, "c1.medium": 2, "c1.xlarge": 4, "c3.large": 3, @@ -56,6 +61,12 @@ var InstanceENIsAvailable = map[string]int{ "c5d.4xlarge": 8, "c5d.9xlarge": 8, "c5d.18xlarge": 15, + "c5n.large": 3, + "c5n.xlarge": 4, + "c5n.2xlarge": 4, + "c5n.4xlarge": 8, + "c5n.9xlarge": 8, + "c5n.18xlarge": 15, "cc2.8xlarge": 8, "cr1.8xlarge": 8, "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 // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI var InstanceIPsAvailable = map[string]int64{ + "a1.medium": 4, + "a1.large": 10, + "a1.xlarge": 15, + "a1.2xlarge": 15, + "a1.4xlarge": 30, "c1.medium": 6, "c1.xlarge": 15, "c3.large": 10, @@ -218,6 +234,12 @@ var InstanceIPsAvailable = map[string]int64{ "c5d.4xlarge": 30, "c5d.9xlarge": 30, "c5d.18xlarge": 50, + "c5n.large": 10, + "c5n.xlarge": 15, + "c5n.2xlarge": 15, + "c5n.4xlarge": 30, + "c5n.9xlarge": 30, + "c5n.18xlarge": 50, "cc2.8xlarge": 30, "cr1.8xlarge": 30, "d2.xlarge": 15, diff --git a/upup/pkg/fi/cloudup/awsup/machine_types.go b/upup/pkg/fi/cloudup/awsup/machine_types.go index 07e5944e07..cb59804ee1 100644 --- a/upup/pkg/fi/cloudup/awsup/machine_types.go +++ b/upup/pkg/fi/cloudup/awsup/machine_types.go @@ -80,6 +80,57 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ // NOTE: Content below is auto generated by `make update-machine-types` // 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 { Name: "c1.medium", @@ -325,6 +376,67 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ 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 { Name: "cc2.8xlarge",