Make sure we have space for a trunk ENI#1210
Merged
mogren merged 1 commit intoaws:masterfrom Sep 17, 2020
Merged
Conversation
abhipth
approved these changes
Sep 13, 2020
acd86ef to
3c31d9f
Compare
jayanthvn
pushed a commit
to jayanthvn/amazon-vpc-cni-k8s
that referenced
this pull request
Nov 25, 2020
jayanthvn
added a commit
that referenced
this pull request
Nov 30, 2020
* Cherry-pick #1210 * Cherry-pick missed README line Co-authored-by: Claes Mogren <[email protected]>
haouc
pushed a commit
to haouc/amazon-vpc-cni-k8s
that referenced
this pull request
Dec 2, 2020
This file contains hidden or 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
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 fix
Which issue does this PR fix:
#1202
What does this PR do / Why do we need it:
We should only set the
vpc.amazonaws.com/has-trunk-attachedlabel on the node if there is space to attach one more ENI.Testing done on this change:
Manual test in a cluster with
MAX_ENI=1:After removing the
MAX_ENIsetting, the label gets applied, and a trunk ENI attached:Automation added to e2e:
None. Standard e2e tests pass: https://app.circleci.com/pipelines/github/mogren/amazon-vpc-cni-k8s/963/workflows/34c4ef50-c137-4ea8-a1b1-039964bf7cd0/jobs/1950
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.