Merge pull request #7653 from mikesplain/machine_types_g4dn

Machine types g4dn

hack/machine_types/machine_types.go

@@ -181,7 +181,13 @@ func run() error {
 				if attributes["storage"] != "EBS only" {
 					storage := strings.Split(attributes["storage"], " ")
 					count := stringToInt(storage[0])
-					size := stringToInt(storage[2])
+					var size int
+					if storage[2] == "NVMe" {
+						count = 1
+						size = stringToInt(storage[0])
+					} else {
+						size = stringToInt(storage[2])
+					}
 
 					ephemeralDisks := []int{}
 					for i := 0; i < count; i++ {

hack/machine_types/vpc_ip_resource_limit.go

@@ -86,6 +86,12 @@ var InstanceENIsAvailable = map[string]int{
 	"g3.4xlarge":    8,
 	"g3.8xlarge":    8,
 	"g3.16xlarge":   15,
+	"g4dn.xlarge":   3,
+	"g4dn.2xlarge":  3,
+	"g4dn.4xlarge":  3,
+	"g4dn.8xlarge":  4,
+	"g4dn.12xlarge": 8,
+	"g4dn.16xlarge": 15,
 	"h1.2xlarge":    4,
 	"h1.4xlarge":    8,
 	"h1.8xlarge":    8,
@@ -308,6 +314,12 @@ var InstanceIPsAvailable = map[string]int64{
 	"g3.4xlarge":    30,
 	"g3.8xlarge":    30,
 	"g3.16xlarge":   50,
+	"g4dn.xlarge":   10,
+	"g4dn.2xlarge":  10,
+	"g4dn.4xlarge":  10,
+	"g4dn.8xlarge":  15,
+	"g4dn.12xlarge": 30,
+	"g4dn.16xlarge": 50,
 	"h1.2xlarge":    15,
 	"h1.4xlarge":    30,
 	"h1.8xlarge":    30,

upup/pkg/fi/cloudup/awsup/machine_types.go

@@ -640,6 +640,73 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		GPU:               true,
 	},
 
+	// g4dn family
+	{
+		Name:              "g4dn.xlarge",
+		MemoryGB:          16,
+		ECU:               0,
+		Cores:             4,
+		InstanceENIs:      3,
+		InstanceIPsPerENI: 10,
+		EphemeralDisks:    []int{125},
+		GPU:               true,
+	},
+
+	{
+		Name:              "g4dn.2xlarge",
+		MemoryGB:          32,
+		ECU:               0,
+		Cores:             8,
+		InstanceENIs:      3,
+		InstanceIPsPerENI: 10,
+		EphemeralDisks:    []int{225},
+		GPU:               true,
+	},
+
+	{
+		Name:              "g4dn.4xlarge",
+		MemoryGB:          64,
+		ECU:               0,
+		Cores:             16,
+		InstanceENIs:      3,
+		InstanceIPsPerENI: 10,
+		EphemeralDisks:    []int{225},
+		GPU:               true,
+	},
+
+	{
+		Name:              "g4dn.8xlarge",
+		MemoryGB:          128,
+		ECU:               0,
+		Cores:             32,
+		InstanceENIs:      4,
+		InstanceIPsPerENI: 15,
+		EphemeralDisks:    []int{900},
+		GPU:               true,
+	},
+
+	{
+		Name:              "g4dn.12xlarge",
+		MemoryGB:          192,
+		ECU:               0,
+		Cores:             48,
+		InstanceENIs:      8,
+		InstanceIPsPerENI: 30,
+		EphemeralDisks:    []int{900},
+		GPU:               true,
+	},
+
+	{
+		Name:              "g4dn.16xlarge",
+		MemoryGB:          256,
+		ECU:               0,
+		Cores:             64,
+		InstanceENIs:      15,
+		InstanceIPsPerENI: 50,
+		EphemeralDisks:    []int{900},
+		GPU:               true,
+	},
+
 	// h1 family
 	{
 		Name:              "h1.2xlarge",