Cherry picks to release-1.7 #1189
Merged
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
(cherry picked from commit f2ad9ba)
…5 mins (cherry picked from commit 5f8da4d)
When a newly created ENI gets attached, we should wait for the secondary IPv4 addresses to be assigned to the ENI before continuing. (cherry picked from commit afbd8fa)
(cherry picked from commit 260b46e)
(cherry picked from commit 561190a)
(cherry picked from commit 93f934d)
…7 config. (cherry picked from commit 190a275)
(cherry picked from commit 6eb28fa)
…grams are manipulating iptables at the same time. (cherry picked from commit 8fffd38)
(cherry picked from commit 32c8ee7)
(cherry picked from commit d835b13)
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 picks from master.
I intentionally skipped some commits that I did not deem required (PR template updates for example)
Which issue(s) this PR fixes:
#964, #989, #1070, #1094, #1101, #1148,
What this PR does / why we need it:
Preparing for
v1.7.2releaseIf issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
Testing:
Manual tests for each PR before merged to master.
e2e tests after changes merged: https://app.circleci.com/pipelines/github/aws/amazon-vpc-cni-k8s/821/workflows/fbb238e0-89e9-495b-bba6-4c8d1ded78be/jobs/1699
Automation added to e2e:
No new e2e tests
Will this break upgrades and downgrades. Has it been tested?:
Upgrades and downgrades from and to v1.6.3 tested.
Does this require config upgrades?:
Yes, we now mount the iptables lock file
Does this PR introduce a 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.