Merge master to Release 1.11 branch #2032

jayanthvn · 2022-07-14T19:44:56Z

What type of PR is this?
Merge master to release-1.11 branch

Which issue does this PR fix:
N/A

What does this PR do / Why do we need it:
Merges latest master PRs to release 1.11 branch

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:

Testing done on this change:

Yes testing will be done before release 1.11.3
Automation added to e2e:

Yes

Will this PR introduce any new dependencies?:

No

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

Release 1.11.3

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Co-authored-by: Relk Li <relk@maicoin.com>

Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>

Bumps [github.com/containernetworking/cni](https://github.com/containernetworking/cni) from 0.8.0 to 0.8.1. - [Release notes](https://github.com/containernetworking/cni/releases) - [Commits](containernetworking/cni@v0.8.0...v0.8.1) --- updated-dependencies: - dependency-name: github.com/containernetworking/cni dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>

…ws#1884) * Update README to highlight containerd.sock edge case with EKS AMI. * Updated Instructions as per review.

* release manifest for Multus v3.8.0-eksbuild.1 * minor change to Readme

* Added Tests for validating Multus Installation Added missing files Refactored code Tried to make it modular and extensible. * Deleted redundant file * Fixed compilation issues * fixed minor error * Added script to trigger Multus tests (will be used by prow job) * remove multus installation logic from ginkgo * remove redundant changes * Cleaned up run-multus-tests helper script * Updated Readme for running multus tests Added few checks in canary helper script * revert changes to canary.sh * Pass tag as an argument * Updated Readme * Updated tag for multus tests to use latest image

* Minor changes to run-integration-tests Added integration-new framework tests * Modified run-integration-tests to use new integration tests * reverted redundant changes * Merge integration with integration-new

fix syntax for ginkgo-v2

…d runtime (aws#1977)

…aws#1861) * Refactored code Addon upgrade/downgrade test similar to aws#1795 Added tests for addon upgrade/downgrade Changed DEFAULT version Added addon status checks Fetch latest addon version for given K8s Cluster Update kops cluster config used in weekly tests (aws#1862) * Change to kops cluster creation scripts * Add logging for retry attempt * Switch kops cluster to use docker container runtime Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com> Renamed package name for adddon tests removed unnecessary changes Fixed replica count for MTU and Veth test in host networking Updated ENI/IP limits file for newly added instances (aws#1864) * Added new instances * Updated test readme * needed rebase * formatting * remove all references to integration-new migrate to ginkgo v2 in addon test files * fix maxIPPerInterface count on pod_networking_suite * Increase default deployment ready timeout Co-authored-by: Vikas Basavaraj <5373156+vikasmb@users.noreply.github.com>

* Added upgrade/downgrade script template Refactored code Addon upgrade/downgrade test similar to aws#1795 Added tests for addon upgrade/downgrade Changed DEFAULT version Added addon status checks Fetch latest addon version for given K8s Cluster Update kops cluster config used in weekly tests (aws#1862) * Change to kops cluster creation scripts * Add logging for retry attempt * Switch kops cluster to use docker container runtime Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com> Added upgrade/downgrade test for custom cni-manifest-file Added missing files remove upgrade-downgrade.sh * Add eks.go file , deleted by mistake * Extract apply manifest logic in common Remove redundant code * Add PD traffic test for cni upgrade downgrade test

…ation (aws#2004) * Enable Calico on ARM64 and add configureable flags for Calico installation * Add v to Calico version in release test script

* Added upgrade/downgrade script template Refactored code Addon upgrade/downgrade test similar to aws#1795 Added tests for addon upgrade/downgrade Changed DEFAULT version Added addon status checks Fetch latest addon version for given K8s Cluster Update kops cluster config used in weekly tests (aws#1862) * Change to kops cluster creation scripts * Add logging for retry attempt * Switch kops cluster to use docker container runtime Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com> Added upgrade/downgrade test for custom cni-manifest-file Added missing files remove upgrade-downgrade.sh * Add eks.go file , deleted by mistake * Extract apply manifest logic in common Remove redundant code * Add PD traffic test for cni upgrade downgrade test * Updated Readme

* fix path failure * seperate makefile for test Co-authored-by: abhipth <abhipth@amazon.com>

* Updating new instances * fix formatting

* Fix Go build for ipamd test package. * Fix format with make format

* Prevent allocate/free ENIs when node is marked noSchedule * Update UTs

* Re-use logger instance - Existing logger initialization constructed different logger instances upon call to Get() method. - Fixed the initailiation logic to re-use the logger instance. * Added unit tests for logger initialization fix

jayanthvn · 2022-07-14T19:46:37Z

Release branch 1.11 is "This branch is 9 commits ahead, 37 commits behind master."

1 extra commit is the final merge.

orsenthil · 2022-07-14T20:00:46Z

Please trigger the integration test change this PR before merge. (Make sure the changes are picked up by having the correct base branch).

jayanthvn · 2022-07-14T20:05:02Z

Yes the integration test is already running - https://github.com/aws/amazon-vpc-cni-k8s/actions/runs/2672754828

orsenthil · 2022-07-14T20:06:05Z

Thank you, Jayanth. :)

.github/workflows/stale_issue_pr.yaml

vikasmb

lgtm

jayanthvn · 2022-07-14T21:58:36Z

Integration test has passed.

jayanthvn and others added 30 commits April 11, 2022 11:46

1.10.3 release artifacts (aws#1962)

45dd7e4

Stale PR and issue cleanup wrkflow (aws#1964)

dd7615e

fix image name during build (aws#1968)

46c41f8

add event recorder utils to raise aws-node pod events (aws#1536)

fd8bcf0

refactor uploader scripts (aws#1972)

c22f72e

Fix cni panic due to pod.Annotations is a nil map (aws#1974)

db1481f

Co-authored-by: Relk Li <relk@maicoin.com>

chart: Add extraVolumes and extraVolumeMounts (aws#1949)

1c6cc3c

Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>

Add the new command in the section of CNI Plugin Sequence (aws#1813)

22d3a91

Co-authored-by: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>

Update README to highlight containerd.sock edge case with EKS AMI. (a…

af55286

…ws#1884) * Update README to highlight containerd.sock edge case with EKS AMI. * Updated Instructions as per review.

add cni release test script (aws#1971)

44c132a

Multus release manifest (aws#1984)

1c4bd46

* release manifest for Multus v3.8.0-eksbuild.1 * minor change to Readme

Port new integration tests (aws#1928)

fcf90e8

* Minor changes to run-integration-tests Added integration-new framework tests * Modified run-integration-tests to use new integration tests * reverted redundant changes * Merge integration with integration-new

increase timeout (aws#1985)

902dcb2

fix syntax for ginkgo-v2

Added configurable flag to create test nodes with arm64 and container…

5b34d7d

…d runtime (aws#1977)

Cleanup binary file (aws#1987)

1950aa7

log error in ipamd on api server timeout (aws#1988)

e3cf980

Remove generation of calico manifests (aws#1905)

2c32145

Update golang to Go 1.18 (aws#1991)

3b80849

Update CNI Plugins to v1.1.1 (aws#1997)

7748fdb

Update release manifests for VPC CNI v1.11.2 (aws#2001) (aws#2002)

6416a0e

Enable Calico on ARM64 and add configureable flags for Calico install…

10f3aed

…ation (aws#2004) * Enable Calico on ARM64 and add configureable flags for Calico installation * Add v to Calico version in release test script

fix integration test script (aws#1998)

5c6945e

Updated dependencies (aws#2012)

7156643

Merge fix-ginkgo to master (aws#2014)

e6439fb

* fix path failure * seperate makefile for test Co-authored-by: abhipth <abhipth@amazon.com>

Multus manifest for release v3.9.0-eksbuild.1 (aws#2016)

1158a52

jayanthvn and others added 8 commits June 29, 2022 15:22

Updating new instances - p4de (aws#2018)

6abbf20

* Updating new instances * fix formatting

Fix go build failure with v6 networking suite. (aws#2020)

4bd4c8e

Update README.md (aws#2021)

a3af829

Fix Go build for ipamd test package. (aws#2023)

301c379

* Fix Go build for ipamd test package. * Fix format with make format

Fix go build for cni test package. (aws#2024)

f979630

Prevent allocate/free ENIs when node is marked noSchedule (aws#1927)

b01d356

* Prevent allocate/free ENIs when node is marked noSchedule * Update UTs

Re-use logger instance (aws#2029)

6b04445

* Re-use logger instance - Existing logger initialization constructed different logger instances upon call to Get() method. - Fixed the initailiation logic to re-use the logger instance. * Added unit tests for logger initialization fix

Merge from master to release-1.11 branch

bfd59b0

jayanthvn requested a review from a team as a code owner July 14, 2022 19:44

vikasmb reviewed Jul 14, 2022

View reviewed changes

.github/workflows/stale_issue_pr.yaml Show resolved Hide resolved

vikasmb approved these changes Jul 14, 2022

View reviewed changes

jayanthvn merged commit a57926f into aws:release-1.11 Jul 14, 2022

moshevayner mentioned this pull request Aug 10, 2022

Bump AWS CNI to 1.11.3 kubernetes/kops#14107

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master to Release 1.11 branch #2032

Merge master to Release 1.11 branch #2032

jayanthvn commented Jul 14, 2022

jayanthvn commented Jul 14, 2022

orsenthil commented Jul 14, 2022

jayanthvn commented Jul 14, 2022 •

edited

Loading

orsenthil commented Jul 14, 2022

vikasmb left a comment

jayanthvn commented Jul 14, 2022

Merge master to Release 1.11 branch #2032

Merge master to Release 1.11 branch #2032

Conversation

jayanthvn commented Jul 14, 2022

jayanthvn commented Jul 14, 2022

orsenthil commented Jul 14, 2022

jayanthvn commented Jul 14, 2022 • edited Loading

orsenthil commented Jul 14, 2022

vikasmb left a comment

Choose a reason for hiding this comment

jayanthvn commented Jul 14, 2022

jayanthvn commented Jul 14, 2022 •

edited

Loading