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

non-nitro instances init issues #1526

Merged
merged 2 commits into from
Jul 2, 2021
Merged

non-nitro instances init issues #1526

merged 2 commits into from
Jul 2, 2021

Conversation

jayanthvn
Copy link
Contributor

What type of PR is this?
bug

Which issue does this PR fix:
Non-nitro instances were getting initialized as PD enabled

What does this PR do / Why do we need it:
Had multiple internal branches and during the merge to master this got overwritten.

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:

{"level":"debug","ts":"2021-07-02T00:02:28.791Z","caller":"ipamd/ipamd.go:315","msg":"Using WARM_ENI_TARGET 1"}
{"level":"debug","ts":"2021-07-02T00:02:28.791Z","caller":"ipamd/ipamd.go:318","msg":"Using WARM_PREFIX_TARGET 1"}
{"level":"debug","ts":"2021-07-02T00:02:28.791Z","caller":"ipamd/ipamd.go:323","msg":"Instance hypervisor family xen"}
{"level":"warn","ts":"2021-07-02T00:02:28.791Z","caller":"aws-k8s-agent/main.go:56","msg":"Prefix delegation is not supported on non-nitro instance r4.xlarge hence falling back to default
(secondary IP) mode"}
{"level":"info","ts":"2021-07-02T00:02:28.791Z","caller":"ipamd/ipamd.go:333","msg":"Prefix Delegation enabled false"}
{"level":"info","ts":"2021-07-02T00:02:28.791Z","caller":"awsutils/awsutils.go:1480","msg":"Will attempt to clean up AWS CNI leaked ENIs after waiting 4m41s."}
{"level":"debug","ts":"2021-07-02T00:02:28.791Z","caller":"ipamd/ipamd.go:338","msg":"Start node init"}
{"level":"debug","ts":"2021-07-02T00:02:28.791Z","caller":"ipamd/ipamd.go:365","msg":"Using MAX_ENI 2"}
{"level":"debug","ts":"2021-07-02T00:02:28.791Z","caller":"ipamd/ipamd.go:338","msg":"Max ip per ENI 14 and max prefixes per ENI 0"}
{"level":"info","ts":"2021-07-02T00:02:28.792Z","caller":"ipamd/ipamd.go:382","msg":"Setting up host network... "}
dev-dsk-varavaj-2b-72f02457 % kgpsys | grep aws-node
aws-node-56kcp             1/1     Running   0          50m     10.0.14.94     ip-10-0-14-94.us-west-2.compute.internal     <none>           <none>
aws-node-b8d5z             1/1     Running   0          50m     10.0.38.223    ip-10-0-38-223.us-west-2.compute.internal    <none>           <none>
aws-node-fm9f6             1/1     Running   0          50m     10.0.89.170    ip-10-0-89-170.us-west-2.compute.internal    <none>           <none>
aws-node-fs6v2             1/1     Running   0          50m     10.0.126.61    ip-10-0-126-61.us-west-2.compute.internal    <none>           <none>
aws-node-hlngf             1/1     Running   0          50m     10.0.210.189   ip-10-0-210-189.us-west-2.compute.internal   <none>           <none>
aws-node-jc6bd             1/1     Running   0          50m     10.0.194.183   ip-10-0-194-183.us-west-2.compute.internal   <none>           <none>
aws-node-rwsbb             1/1     Running   0          50m     10.0.234.160   ip-10-0-234-160.us-west-2.compute.internal   <none>           <none>
aws-node-sqcjs             1/1     Running   0          50m     10.0.147.38    ip-10-0-147-38.us-west-2.compute.internal    <none>           <none>
aws-node-vvmg6             1/1     Running   0          50m     10.0.7.26      ip-10-0-7-26.us-west-2.compute.internal      <none>           <none>
aws-node-wjpm5             1/1     Running   0          50m     10.0.12.85     ip-10-0-12-85.us-west-2.compute.internal     <none>           <none>

Automation added to e2e:

No, will add it.

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 jayanthvn requested a review from achevuru July 2, 2021 00:53
@jayanthvn jayanthvn merged commit 0af437a into aws:master Jul 2, 2021
jayanthvn added a commit to jayanthvn/amazon-vpc-cni-k8s that referenced this pull request Jul 2, 2021
* non-nitro init issues

* fix formatting
@jayanthvn jayanthvn mentioned this pull request Jul 2, 2021
jayanthvn added a commit that referenced this pull request Jul 2, 2021
* non-nitro init issues

* fix formatting
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