Merge pull request #8140 from mikesplain/automated-cherry-pick-of-#81…

…28-origin-release-1.16 Automated cherry pick of #8128: Add inf1 isntances
kubernetes · Dec 17, 2019 · 25315c4 · 25315c4
2 parents dec1e72 + b046673
commit 25315c4
Show file tree

Hide file tree

Showing 2 changed files with 227 additions and 80 deletions.
diff --git a/hack/machine_types/vpc_ip_resource_limit.go b/hack/machine_types/vpc_ip_resource_limit.go
@@ -120,6 +120,10 @@ var InstanceENIsAvailable = map[string]int{
 	"i3en.large":    3,
 	"i3en.metal":    15,
 	"i3en.xlarge":   4,
+	"inf1.xlarge":   4,
+	"inf1.2xlarge":  4,
+	"inf1.6xlarge":  8,
+	"inf1.24xlarge": 15,
 	"m1.large":      3,
 	"m1.medium":     2,
 	"m1.small":      2,
@@ -384,6 +388,10 @@ var InstanceIPsAvailable = map[string]int64{
 	"i3en.large":    10,
 	"i3en.metal":    50,
 	"i3en.xlarge":   15,
+	"inf1.xlarge":   10,
+	"inf1.2xlarge":  10,
+	"inf1.6xlarge":  30,
+	"inf1.24xlarge": 50,
 	"m1.large":      10,
 	"m1.medium":     6,
 	"m1.small":      4,