check if ipv4Addr or ipv6Addr is empty before calling AnnotatePod()#2702
Merged
jdn5126 merged 1 commit intoaws:masterfrom Dec 14, 2023
zachdorame:master
Merged
check if ipv4Addr or ipv6Addr is empty before calling AnnotatePod()#2702jdn5126 merged 1 commit intoaws:masterfrom zachdorame:master
jdn5126 merged 1 commit intoaws:masterfrom
zachdorame:master
Conversation
jdn5126
suggested changes
Dec 5, 2023
Contributor
|
@zachdorame since the approach changed, can you update the PR title and description? |
Contributor
Author
Updated to reflect new approach |
jdn5126
approved these changes
Dec 14, 2023
jchen6585
pushed a commit
to jchen6585/amazon-vpc-cni-k8s
that referenced
this pull request
Dec 21, 2023
…ws#2702) Co-authored-by: Zach Dorame-Barajas <[email protected]>
jdn5126
pushed a commit
to jdn5126/amazon-vpc-cni-k8s
that referenced
this pull request
Dec 21, 2023
…ws#2702) Co-authored-by: Zach Dorame-Barajas <[email protected]>
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
Which issue does this PR fix:
#2687
What does this PR do / Why do we need it:
This PR adds logic to call AnnotatePod() only if exactly one of
ipv4Addroripv6Addris non-null.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:
I observe the following log from
ipamd.logwhich indicates that
erris no longer being overwritten.Also, after running
sudo cat plugin.log | grep "Failed SetupPodNetwork"I did not observe a netlink errorRan
make docker-unit-tests, passes unit testsWill 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.