Merge pull request #7301 from mikesplain/automated-cherry-pick-of-#73…

…00-origin-release-1.14 Automated cherry pick of #7300: Fix m5a.8xlarge and i3en.metal has been removed
kubernetes · Jul 22, 2019 · 9c141fe · 9c141fe
2 parents 67168be + b01fe15
commit 9c141fe
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/upup/pkg/fi/cloudup/awsup/machine_types.go b/upup/pkg/fi/cloudup/awsup/machine_types.go
@@ -80,9 +80,6 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 	// NOTE: Content below is auto generated by `make update-machine-types`
 	// BEGIN GENERATED CONTENT
 
-	// WARNING: ENIs not known for i3en.metal
-	// WARNING: IPs per ENI not known for i3en.metal
-
 	// a1 family
 	{
 		Name:              "a1.medium",
@@ -868,16 +865,6 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		EphemeralDisks:    []int{7500, 7500, 7500, 7500, 7500, 7500, 7500, 7500},
 	},
 
-	{
-		Name:              "i3en.metal",
-		MemoryGB:          768,
-		ECU:               0,
-		Cores:             96,
-		InstanceENIs:      0,
-		InstanceIPsPerENI: 0,
-		EphemeralDisks:    []int{7500, 7500, 7500, 7500, 7500, 7500, 7500, 7500},
-	},
-
 	// m1 family
 	{
 		Name:              "m1.small",
@@ -1189,8 +1176,8 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{
 		MemoryGB:          128,
 		ECU:               0,
 		Cores:             32,
-		InstanceENIs:      0,
-		InstanceIPsPerENI: 0,
+		InstanceENIs:      8,
+		InstanceIPsPerENI: 30,
 		EphemeralDisks:    nil,
 	},