Merge pull request #7547 from justinsb/cherrypick_7515_release-1.14

Cherry pick of #7515 onto release-1.14
kubernetes · Sep 10, 2019 · e099379 · e099379
2 parents 5d76e70 + 1c3db04
commit e099379
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/hack/machine_types/vpc_ip_resource_limit.go b/hack/machine_types/vpc_ip_resource_limit.go
@@ -70,6 +70,7 @@ var InstanceENIsAvailable = map[string]int{
 	"c5n.4xlarge":   8,
 	"c5n.9xlarge":   8,
 	"c5n.18xlarge":  15,
+	"c5n.metal":     15,
 	"cc2.8xlarge":   8,
 	"cr1.8xlarge":   8,
 	"d2.xlarge":     4,
@@ -108,6 +109,7 @@ var InstanceENIsAvailable = map[string]int{
 	"i3en.6xlarge":  8,
 	"i3en.12xlarge": 8,
 	"i3en.24xlarge": 15,
+	"i3en.metal":    15,
 	"m1.small":      2,
 	"m1.medium":     2,
 	"m1.large":      3,
@@ -290,6 +292,7 @@ var InstanceIPsAvailable = map[string]int64{
 	"c5n.4xlarge":   30,
 	"c5n.9xlarge":   30,
 	"c5n.18xlarge":  50,
+	"c5n.metal":     50,
 	"cc2.8xlarge":   30,
 	"cr1.8xlarge":   30,
 	"d2.xlarge":     15,
@@ -328,6 +331,7 @@ var InstanceIPsAvailable = map[string]int64{
 	"i3en.6xlarge":  30,
 	"i3en.12xlarge": 30,
 	"i3en.24xlarge": 50,
+	"i3en.metal":    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
@@ -467,6 +467,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		EphemeralDisks:    nil,
 	},
 
+	{
+		Name:              "c5n.metal",
+		MemoryGB:          192,
+		ECU:               0,
+		Cores:             72,
+		InstanceENIs:      15,
+		InstanceIPsPerENI: 50,
+		EphemeralDisks:    nil,
+	},
+
 	// cc2 family
 	{
 		Name:              "cc2.8xlarge",
@@ -538,7 +548,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		Cores:             8,
 		InstanceENIs:      4,
 		InstanceIPsPerENI: 15,
-		EphemeralDisks:    nil,
+		EphemeralDisks:    []int{470},
 	},
 
 	{
@@ -558,7 +568,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		Cores:             64,
 		InstanceENIs:      8,
 		InstanceIPsPerENI: 50,
-		EphemeralDisks:    nil,
+		EphemeralDisks:    []int{940, 940, 940, 940},
 	},
 
 	// g2 family
@@ -865,6 +875,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		EphemeralDisks:    []int{7500, 7500, 7500, 7500, 7500, 7500, 7500, 7500},
 	},
 
+	{
+		Name:              "i3en.metal",
+		MemoryGB:          768,
+		ECU:               0,
+		Cores:             96,
+		InstanceENIs:      15,
+		InstanceIPsPerENI: 50,
+		EphemeralDisks:    []int{7500, 7500, 7500, 7500, 7500, 7500, 7500, 7500},
+	},
+
 	// m1 family
 	{
 		Name:              "m1.small",