Cherrypick #1251 #1301
Merged
Cherrypick #1251 #1301
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
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?
cherry-pick
Which issue does this PR fix:
cherry pick #1251 for rel 1.7.6
What does this PR do / Why do we need it:
n/a
If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
#1251
Testing done on this change:
Yes
Automation added to e2e:
n/a
Will this break upgrades or downgrades. Has updating a running cluster been tested?:
n/a
Does this change require updates to the CNI daemonset config files to work?:
n/a
Does this PR introduce any user-facing change?:
n/a
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.