From d6a513cb845d525cbf2657d1ea48621194d1cb3d Mon Sep 17 00:00:00 2001
From: Mike Splain <mike.splain@gmail.com>
Date: Wed, 8 May 2019 22:48:59 -0400
Subject: [PATCH] Add i3en

---
 hack/machine_types/vpc_ip_resource_limit.go | 14 ++++
 upup/pkg/fi/cloudup/awsup/machine_types.go  | 71 +++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/hack/machine_types/vpc_ip_resource_limit.go b/hack/machine_types/vpc_ip_resource_limit.go
index 6a74ba5fe28df..01aef7a9de112 100644
--- a/hack/machine_types/vpc_ip_resource_limit.go
+++ b/hack/machine_types/vpc_ip_resource_limit.go
@@ -98,6 +98,13 @@ var InstanceENIsAvailable = map[string]int{
 	"i3.8xlarge":    8,
 	"i3.16xlarge":   15,
 	"i3.metal":      15,
+	"i3en.large":    3,
+	"i3en.xlarge":   4,
+	"i3en.2xlarge":  4,
+	"i3en.3xlarge":  4,
+	"i3en.6xlarge":  8,
+	"i3en.12xlarge": 8,
+	"i3en.24xlarge": 15,
 	"m1.small":      2,
 	"m1.medium":     2,
 	"m1.large":      3,
@@ -289,6 +296,13 @@ var InstanceIPsAvailable = map[string]int64{
 	"i3.8xlarge":    30,
 	"i3.16xlarge":   50,
 	"i3.metal":      50,
+	"i3en.large":    10,
+	"i3en.xlarge":   15,
+	"i3en.2xlarge":  15,
+	"i3en.3xlarge":  15,
+	"i3en.6xlarge":  30,
+	"i3en.12xlarge": 30,
+	"i3en.24xlarge": 50,
 	"m1.small":      4,
 	"m1.medium":     6,
 	"m1.large":      10,
diff --git a/upup/pkg/fi/cloudup/awsup/machine_types.go b/upup/pkg/fi/cloudup/awsup/machine_types.go
index 5ab75f73878fb..3db6358b5a0d9 100644
--- a/upup/pkg/fi/cloudup/awsup/machine_types.go
+++ b/upup/pkg/fi/cloudup/awsup/machine_types.go
@@ -764,6 +764,77 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		EphemeralDisks:    []int{1900, 1900, 1900, 1900, 1900, 1900, 1900, 1900},
 	},
 
+	// i3en family
+	{
+		Name:              "i3en.large",
+		MemoryGB:          16,
+		ECU:               0,
+		Cores:             2,
+		InstanceENIs:      3,
+		InstanceIPsPerENI: 10,
+		EphemeralDisks:    nil,
+	},
+
+	{
+		Name:              "i3en.xlarge",
+		MemoryGB:          32,
+		ECU:               0,
+		Cores:             4,
+		InstanceENIs:      4,
+		InstanceIPsPerENI: 15,
+		EphemeralDisks:    nil,
+	},
+
+	{
+		Name:              "i3en.2xlarge",
+		MemoryGB:          64,
+		ECU:               0,
+		Cores:             8,
+		InstanceENIs:      4,
+		InstanceIPsPerENI: 15,
+		EphemeralDisks:    nil,
+	},
+
+	{
+		Name:              "i3en.3xlarge",
+		MemoryGB:          96,
+		ECU:               0,
+		Cores:             12,
+		InstanceENIs:      4,
+		InstanceIPsPerENI: 15,
+		EphemeralDisks:    nil,
+	},
+
+	{
+		Name:              "i3en.6xlarge",
+		MemoryGB:          192,
+		ECU:               0,
+		Cores:             24,
+		InstanceENIs:      8,
+		InstanceIPsPerENI: 30,
+		EphemeralDisks:    nil,
+	},
+
+	{
+		Name:              "i3en.12xlarge",
+		MemoryGB:          384,
+		ECU:               0,
+		Cores:             48,
+		InstanceENIs:      8,
+		InstanceIPsPerENI: 30,
+		EphemeralDisks:    nil,
+	},
+
+	{
+		Name:              "i3en.24xlarge",
+		MemoryGB:          768,
+		ECU:               0,
+		Cores:             96,
+		InstanceENIs:      15,
+		InstanceIPsPerENI: 50,
+		EphemeralDisks:    nil,
+	},
+
 	// m1 family
 	{
 		Name:              "m1.small",