Skip to content

run make generate-limits to add new instance types#1601

Merged
jayanthvn merged 1 commit intoaws:masterfrom
causton81:update-vpc_ip_resource_limit
Sep 3, 2021
Merged

run make generate-limits to add new instance types#1601
jayanthvn merged 1 commit intoaws:masterfrom
causton81:update-vpc_ip_resource_limit

Conversation

@causton81
Copy link
Copy Markdown
Contributor

What type of PR is this? bug

Which issue does this PR fix: n/a

What does this PR do / Why do we need it:
Driver does not understand new instance types like m6i.large which causes aws-node to fail to start with below error.

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
Install driver on an EC2 instance type m6i.large.

{"level":"error","ts":"2021-09-03T15:24:56.448Z","caller":"ipamd/ipamd.go:323","msg":"Failed to get hypervisor info due to unknown instance type m6i.large"}
{"level":"error","ts":"2021-09-03T15:24:56.448Z","caller":"aws-k8s-agent/main.go:56","msg":"Failed to get hypervisor type"}
{"level":"error","ts":"2021-09-03T15:24:56.448Z","caller":"aws-k8s-agent/main.go:28","msg":"Initialization failure: vpc ip resource(eni ip limit): unknown instance type"}

Testing done on this change:

{"level":"debug","ts":"2021-09-03T17:56:43.365Z","caller":"ipamd/ipamd.go:323","msg":"Instance hypervisor family nitro"}
{"level":"info","ts":"2021-09-03T17:56:43.365Z","caller":"ipamd/ipamd.go:332","msg":"Prefix Delegation enabled false"}
{"level":"debug","ts":"2021-09-03T17:56:43.365Z","caller":"ipamd/ipamd.go:337","msg":"Start node init"}
{"level":"debug","ts":"2021-09-03T17:56:43.365Z","caller":"ipamd/ipamd.go:337","msg":"Max ip per ENI 9 and max prefixes per ENI 0"}
{"level":"info","ts":"2021-09-03T17:56:43.366Z","caller":"ipamd/ipamd.go:381","msg":"Setting up host network... "}

Automation added to e2e: no

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

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

Does this PR introduce any user-facing change?: no


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

@jayanthvn
Copy link
Copy Markdown
Contributor

Thanks for taking it up.

Copy link
Copy Markdown
Contributor

@jayanthvn jayanthvn left a comment

Choose a reason for hiding this comment

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

lgtm.

@jayanthvn jayanthvn merged commit 2e7d7c8 into aws:master Sep 3, 2021
@jayanthvn jayanthvn added this to the v1.9.1 milestone Sep 3, 2021
jayanthvn pushed a commit to jayanthvn/amazon-vpc-cni-k8s that referenced this pull request Sep 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants