Merge pull request #6557 from justinsb/cherrypick_6551_release-1.11

Cherry pick of #6551 onto release-1.11
kubernetes · Feb 28, 2019 · 6248b55 · 6248b55
2 parents 71f39d7 + eae28ab
commit 6248b55
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 0 deletions.
diff --git a/hack/machine_types/vpc_ip_resource_limit.go b/hack/machine_types/vpc_ip_resource_limit.go
@@ -121,6 +121,7 @@ var InstanceENIsAvailable = map[string]int{
 	"m5.4xlarge":    8,
 	"m5.12xlarge":   8,
 	"m5.24xlarge":   15,
+	"m5.metal":      15,
 	"m5a.large":     3,
 	"m5a.xlarge":    4,
 	"m5a.2xlarge":   4,
@@ -133,6 +134,7 @@ var InstanceENIsAvailable = map[string]int{
 	"m5d.4xlarge":   8,
 	"m5d.12xlarge":  8,
 	"m5d.24xlarge":  15,
+	"m5d.metal":     15,
 	"p2.xlarge":     4,
 	"p2.8xlarge":    8,
 	"p2.16xlarge":   8,
@@ -157,6 +159,7 @@ var InstanceENIsAvailable = map[string]int{
 	"r5.4xlarge":    8,
 	"r5.12xlarge":   8,
 	"r5.24xlarge":   15,
+	"r5.metal":      15,
 	"r5a.large":     3,
 	"r5a.xlarge":    4,
 	"r5a.2xlarge":   4,
@@ -169,6 +172,7 @@ var InstanceENIsAvailable = map[string]int{
 	"r5d.4xlarge":   8,
 	"r5d.12xlarge":  8,
 	"r5d.24xlarge":  15,
+	"r5d.metal":     15,
 	"t1.micro":      2,
 	"t2.nano":       2,
 	"t2.micro":      2,
@@ -201,6 +205,7 @@ var InstanceENIsAvailable = map[string]int{
 	"z1d.3xlarge":   8,
 	"z1d.6xlarge":   8,
 	"z1d.12xlarge":  15,
+	"z1d.metal":     15,
 }
 
 // InstanceIPsAvailable contains a mapping of instance types to the number of IPs per ENI
@@ -295,6 +300,7 @@ var InstanceIPsAvailable = map[string]int64{
 	"m5.4xlarge":    30,
 	"m5.12xlarge":   30,
 	"m5.24xlarge":   50,
+	"m5.metal":      50,
 	"m5a.large":     10,
 	"m5a.xlarge":    15,
 	"m5a.2xlarge":   15,
@@ -307,6 +313,7 @@ var InstanceIPsAvailable = map[string]int64{
 	"m5d.4xlarge":   30,
 	"m5d.12xlarge":  30,
 	"m5d.24xlarge":  50,
+	"m5d.metal":     50,
 	"p2.xlarge":     15,
 	"p2.8xlarge":    30,
 	"p2.16xlarge":   30,
@@ -331,6 +338,7 @@ var InstanceIPsAvailable = map[string]int64{
 	"r5.4xlarge":    30,
 	"r5.12xlarge":   30,
 	"r5.24xlarge":   50,
+	"r5.metal":      50,
 	"r5a.large":     10,
 	"r5a.xlarge":    15,
 	"r5a.2xlarge":   15,
@@ -343,6 +351,7 @@ var InstanceIPsAvailable = map[string]int64{
 	"r5d.4xlarge":   30,
 	"r5d.12xlarge":  30,
 	"r5d.24xlarge":  50,
+	"r5d.metal":     50,
 	"t1.micro":      2,
 	"t2.nano":       2,
 	"t2.micro":      2,
@@ -375,4 +384,5 @@ var InstanceIPsAvailable = map[string]int64{
 	"z1d.3xlarge":   30,
 	"z1d.6xlarge":   30,
 	"z1d.12xlarge":  50,
+	"z1d.metal":     50,
 }
diff --git a/upup/pkg/fi/cloudup/awsup/machine_types.go b/upup/pkg/fi/cloudup/awsup/machine_types.go
@@ -999,6 +999,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		EphemeralDisks:    nil,
 	},
 
+	{
+		Name:              "m5.metal",
+		MemoryGB:          384,
+		ECU:               345,
+		Cores:             96,
+		InstanceENIs:      15,
+		InstanceIPsPerENI: 50,
+		EphemeralDisks:    nil,
+	},
+
 	// m5a family
 	{
 		Name:              "m5a.large",
@@ -1121,6 +1131,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		EphemeralDisks:    []int{900, 900, 900, 900},
 	},
 
+	{
+		Name:              "m5d.metal",
+		MemoryGB:          384,
+		ECU:               345,
+		Cores:             96,
+		InstanceENIs:      15,
+		InstanceIPsPerENI: 50,
+		EphemeralDisks:    []int{900, 900, 900, 900},
+	},
+
 	// p2 family
 	{
 		Name:              "p2.xlarge",
@@ -1374,6 +1394,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		EphemeralDisks:    nil,
 	},
 
+	{
+		Name:              "r5.metal",
+		MemoryGB:          768,
+		ECU:               347,
+		Cores:             96,
+		InstanceENIs:      15,
+		InstanceIPsPerENI: 50,
+		EphemeralDisks:    nil,
+	},
+
 	// r5a family
 	{
 		Name:              "r5a.large",
@@ -1496,6 +1526,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		EphemeralDisks:    []int{900, 900, 900, 900},
 	},
 
+	{
+		Name:              "r5d.metal",
+		MemoryGB:          768,
+		ECU:               347,
+		Cores:             96,
+		InstanceENIs:      15,
+		InstanceIPsPerENI: 50,
+		EphemeralDisks:    []int{900, 900, 900, 900},
+	},
+
 	// t1 family
 	{
 		Name:              "t1.micro",
@@ -1807,5 +1847,15 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		EphemeralDisks:    []int{900, 900},
 	},
 
+	{
+		Name:              "z1d.metal",
+		MemoryGB:          384,
+		ECU:               271,
+		Cores:             48,
+		InstanceENIs:      15,
+		InstanceIPsPerENI: 50,
+		EphemeralDisks:    []int{900, 900},
+	},
+
 	// END GENERATED CONTENT
 }