Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update limits for m6g, c6g and r6g #996

Merged
merged 1 commit into from
May 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ generate:
$(MAKE) format

# Generate descriptors for supported ENI configurations.
generate-limits: GOOS=
generate-limits:
go run pkg/awsutils/gen_vpc_ip_limits.go

Expand Down
26 changes: 18 additions & 8 deletions pkg/awsutils/gen_vpc_ip_limits.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,29 @@ func addManualLimits(limitMap map[string]ENILimit) map[string]ENILimit {
{"cr1.8xlarge", 8, 30},
{"g4dn.metal", 15, 50},
{"hs1.8xlarge", 8, 30},
{"m6g.12xlarge", 8, 30},
{"m6g.16xlarge", 15, 50},
{"m6g.2xlarge", 4, 15},
{"m6g.4xlarge", 8, 30},
{"m6g.8xlarge", 8, 30},
{"m6g.large", 3, 10},
{"m6g.medium", 2, 4},
{"m6g.xlarge", 4, 15},
{"u-12tb1.metal", 5, 30},
{"u-18tb1.metal", 15, 50},
{"u-24tb1.metal", 15, 50},
{"u-6tb1.metal", 5, 30},
{"u-9tb1.metal", 5, 30},
{"c6g.medium", 2, 4},
{"c6g.large", 3, 10},
{"c6g.xlarge", 4, 15},
{"c6g.2xlarge", 4, 15},
{"c6g.4xlarge", 8, 30},
{"c6g.8xlarge", 8, 30},
{"c6g.12xlarge", 8, 30},
{"c6g.16xlarge", 15, 50},
{"c6g.metal", 15, 50},
{"r6g.medium", 2, 4},
{"r6g.large", 3, 10},
{"r6g.xlarge", 4, 15},
{"r6g.2xlarge", 4, 15},
{"r6g.4xlarge", 8, 30},
{"r6g.8xlarge", 8, 30},
{"r6g.12xlarge", 8, 30},
{"r6g.16xlarge", 15, 50},
{"r6g.metal", 15, 50},
}
for _, eniLimit := range manuallyAddedLimits {
limitMap[eniLimit.InstanceType] = newENILimit(eniLimit.InstanceType, eniLimit.ENILimit, eniLimit.IPLimit)
Expand Down
40 changes: 39 additions & 1 deletion pkg/awsutils/vpc_ip_resource_limit.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.