Ignore non-zero cards #2784
Merged
Ignore non-zero cards #2784
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jdn5126
reviewed
Feb 6, 2024
jchen6585
force-pushed
the
eni-calc-fix
branch
2 times, most recently
from
2afc2ce
to
c23dca4
Compare
jdn5126
reviewed
Feb 12, 2024
jdn5126
reviewed
Feb 12, 2024
jchen6585
force-pushed
the
eni-calc-fix
branch
from
c23dca4
to
1427f47
Compare
jdn5126
reviewed
Feb 12, 2024
jchen6585
force-pushed
the
eni-calc-fix
branch
from
1427f47
to
cf52f8e
Compare
jdn5126
previously approved these changes
Feb 13, 2024
jchen6585
force-pushed
the
eni-calc-fix
branch
from
cf52f8e
to
ca9df94
Compare
achevuru
reviewed
Feb 13, 2024
jchen6585
force-pushed
the
eni-calc-fix
branch
from
ca9df94
to
5ff9d11
Compare
jayanthvn
reviewed
Feb 13, 2024
jdn5126
force-pushed
the
eni-calc-fix
branch
from
5ff9d11
to
03c5aad
Compare
jchen6585
added a commit
to jchen6585/amazon-vpc-cni-k8s
that referenced
this pull request
Feb 20, 2024
jchen6585
added a commit
that referenced
this pull request
Feb 20, 2024
#2802) Co-authored-by: Joseph Chen <chenjoez@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
The previous logic
c.dataStore.GetENIs() < (c.maxENI - c.unmanagedENI - trunkEni)would return negative for multicard instance types that had EFA devices installed on non-zero cards. This adds another value to the inequality to negate ENIs on non-zero cards as CNI does not support multi-card yet.If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
Testing done on this change:
CNI and IPAMD suites look good
Will this PR introduce any new dependencies?:
No
Will this break upgrades or downgrades? Has updating a running cluster been tested?:
No, Yes
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.