Skip to content

Add M7g, R7g instance#2250

Merged
jdn5126 merged 5 commits intoaws:masterfrom
Issacwww:master
Feb 8, 2023
Merged

Add M7g, R7g instance#2250
jdn5126 merged 5 commits intoaws:masterfrom
Issacwww:master

Conversation

@Issacwww
Copy link
Copy Markdown
Contributor

@Issacwww Issacwww commented Feb 2, 2023 •
edited
Loading

What type of PR is this?
feature

Which issue does this PR fix:
N/A

What does this PR do / Why do we need it:
This PR adds new instance types:M7g R7g and runs make generate-limits to update instance networking limits. It is paired with awslabs/amazon-eks-ami#1166

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
N/A

Testing done on this change:

> make generate-limits
go run  scripts/gen_vpc_ip_limits.go
2023-02-02 10:14:40.061531 -0800 PST m=+0.003936001 write error: can't make directories for new logfile: mkdir /host: read-only file system
2023-02-02 10:14:40.061843 -0800 PST m=+0.004248709 write error: can't make directories for new logfile: mkdir /host: read-only file system
{"level":"info","ts":"2023-02-02T10:14:41.475-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=ap-northeast-1"}
{"level":"info","ts":"2023-02-02T10:14:44.540-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=ap-northeast-2"}
{"level":"info","ts":"2023-02-02T10:14:46.844-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=ap-northeast-3"}
{"level":"info","ts":"2023-02-02T10:14:48.522-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=ap-south-1"}
{"level":"info","ts":"2023-02-02T10:14:51.169-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=ap-southeast-1"}
{"level":"info","ts":"2023-02-02T10:14:53.778-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=ap-southeast-2"}
{"level":"info","ts":"2023-02-02T10:14:56.545-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=ca-central-1"}
{"level":"info","ts":"2023-02-02T10:14:58.938-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=eu-central-1"}
{"level":"info","ts":"2023-02-02T10:15:03.260-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=eu-north-1"}
{"level":"info","ts":"2023-02-02T10:15:06.133-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=eu-west-1"}
{"level":"info","ts":"2023-02-02T10:15:08.657-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=eu-west-2"}
{"level":"info","ts":"2023-02-02T10:15:10.597-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=eu-west-3"}
{"level":"info","ts":"2023-02-02T10:15:12.816-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=sa-east-1"}
{"level":"info","ts":"2023-02-02T10:15:16.622-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=us-east-1"}
{"level":"info","ts":"2023-02-02T10:15:19.834-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=us-east-2"}
{"level":"info","ts":"2023-02-02T10:15:21.824-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=us-west-1"}
{"level":"info","ts":"2023-02-02T10:15:23.726-0800","caller":"/Users/sichaow/workplace/AWSWesleyAMIRecipes/src/amazon-vpc-cni-k8s/scripts/gen_vpc_ip_limits.go:58","msg":"Describing instance types in region=us-west-2"}
Adding "hs1.8xlarge": {8 30 unknown false} since it is missing from the API
Adding "c5a.metal": {15 50 unknown true} since it is missing from the API
Adding "p4de.24xlarge": {15 50 unknown false} since it is missing from the API
Adding "m7g.xlarge": {4 15 unknown false} since it is missing from the API
Adding "m7g.2xlarge": {4 15 unknown false} since it is missing from the API
Adding "u-6tb1.metal": {5 30 unknown true} since it is missing from the API
Adding "c5ad.metal": {15 50 unknown true} since it is missing from the API
Adding "m7g.12xlarge": {8 30 unknown false} since it is missing from the API
Adding "m7g.metal": {15 50 unknown true} since it is missing from the API
Adding "r7g.8xlarge": {8 30 unknown false} since it is missing from the API
Adding "r7g.metal": {15 50 unknown true} since it is missing from the API
Adding "c7g.metal": {15 50 unknown true} since it is missing from the API
Adding "m7g.8xlarge": {8 30 unknown false} since it is missing from the API
Adding "m7g.16xlarge": {15 50 unknown false} since it is missing from the API
Adding "u-18tb1.metal": {15 50 unknown true} since it is missing from the API
Adding "u-24tb1.metal": {15 50 unknown true} since it is missing from the API
Adding "m7g.large": {3 10 unknown false} since it is missing from the API
Adding "m7g.4xlarge": {8 30 unknown false} since it is missing from the API
Adding "cr1.8xlarge": {8 30 unknown false} since it is missing from the API
Adding "u-9tb1.metal": {5 30 unknown true} since it is missing from the API
Adding "r7g.medium": {2 4 unknown false} since it is missing from the API
Adding "r7g.large": {3 10 unknown false} since it is missing from the API
Adding "r7g.xlarge": {4 15 unknown false} since it is missing from the API
Adding "r7g.12xlarge": {8 30 unknown false} since it is missing from the API
Adding "m7g.medium": {2 4 unknown false} since it is missing from the API
Adding "u-12tb1.metal": {5 30 unknown true} since it is missing from the API
Adding "r7g.2xlarge": {4 15 unknown false} since it is missing from the API
Adding "r7g.4xlarge": {8 30 unknown false} since it is missing from the API
Adding "r7g.16xlarge": {15 50 unknown false} since it is missing from the API
{"level":"info","ts":"2023-02-02T10:15:26.298-0800","caller":"/usr/local/go/src/runtime/proc.go:250","msg":"Generated pkg/awsutils/vpc_ip_resource_limit.go"}
{"level":"info","ts":"2023-02-02T10:15:26.305-0800","caller":"/usr/local/go/src/runtime/proc.go:250","msg":"Generated misc/eni-max-pods.txt"}

Automation added to e2e:

N/A
Will this PR introduce any new dependencies?:

N/A
Will this break upgrades or downgrades. Has updating a running cluster been tested?:
N/A

Does this change require updates to the CNI daemonset config files to work?:

No

Does this PR introduce any user-facing change?:

Yes

Update instance type networking limits.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@Issacwww Issacwww requested a review from a team as a code owner February 2, 2023 18:59
@Issacwww Issacwww mentioned this pull request Feb 2, 2023
Merged
orsenthil
orsenthil previously approved these changes Feb 2, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@orsenthil orsenthil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

jdn5126
jdn5126 suggested changes Feb 2, 2023
View reviewed changes
Comment thread scripts/gen_vpc_ip_limits.go Outdated
cartermckinnon
cartermckinnon previously approved these changes Feb 2, 2023
View reviewed changes
@Issacwww Issacwww dismissed stale reviews from cartermckinnon and orsenthil via 57948b6 February 7, 2023 23:05
@Issacwww Issacwww mentioned this pull request Feb 8, 2023
Merged
@jdn5126 jdn5126 merged commit 33e3f8e into aws:master Feb 8, 2023
jdn5126 pushed a commit to jdn5126/amazon-vpc-cni-k8s that referenced this pull request Feb 8, 2023
cherry-pick aws#2235 and aws#2250
b4df99d
@jdn5126 jdn5126 mentioned this pull request Feb 8, 2023
Merged
jdn5126 pushed a commit that referenced this pull request Feb 8, 2023
Cherry-pick 2255, 2235 and 2250 (#2256)
0668d02 
* cherry-pick 2255

* cherry-pick #2235 and #2250
@jdn5126 jdn5126 mentioned this pull request Jun 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers

@jdn5126 jdn5126 jdn5126 approved these changes

@orsenthil orsenthil orsenthil left review comments

@cartermckinnon cartermckinnon cartermckinnon left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Issacwww @orsenthil @cartermckinnon @jdn5126