Skip to content

Commit 851c4a5

Browse files
vikasmbjayanthvnM00nF1shsushrkDownager
authored
Release 1.11 merge from main branch (#2037)
* 1.10.3 release artifacts (#1962) * Stale PR and issue cleanup wrkflow (#1964) * fix image name during build (#1968) * add event recorder utils to raise aws-node pod events (#1536) * refactor uploader scripts (#1972) * Fix cni panic due to pod.Annotations is a nil map (#1974) Co-authored-by: Relk Li <[email protected]> * chart: Add extraVolumes and extraVolumeMounts (#1949) Co-authored-by: Jayanth Varavani <[email protected]> * Add the new command in the section of CNI Plugin Sequence (#1813) Co-authored-by: Jayanth Varavani <[email protected]> * Bump github.com/containernetworking/cni from 0.8.0 to 0.8.1 (#1966) 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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jayanth Varavani <[email protected]> * Update README to highlight containerd.sock edge case with EKS AMI. (#1884) * Update README to highlight containerd.sock edge case with EKS AMI. * Updated Instructions as per review. * add cni release test script (#1971) * Multus release manifest (#1984) * release manifest for Multus v3.8.0-eksbuild.1 * minor change to Readme * Added Tests for validating Multus Installation (#1811) * 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 * Port new integration tests (#1928) * 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 (#1985) fix syntax for ginkgo-v2 * Added configurable flag to create test nodes with arm64 and containerd runtime (#1977) * Cleanup binary file (#1987) * log error in ipamd on api server timeout (#1988) * Refactored code and Added cni addon upgrade/downgrade regression test (#1861) * Refactored code Addon upgrade/downgrade test similar to #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 (#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 <[email protected]> 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 (#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 <[email protected]> * Remove generation of calico manifests (#1905) * cni manifest upgrade downgrade test (#1863) * Added upgrade/downgrade script template Refactored code Addon upgrade/downgrade test similar to #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 (#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 <[email protected]> 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 * Update golang to Go 1.18 (#1991) * Update CNI Plugins to v1.1.1 (#1997) * Update release manifests for VPC CNI v1.11.2 (#2001) (#2002) * Enable Calico on ARM64 and add configureable flags for Calico installation (#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 (#1998) * Updated dependencies (#2012) * Fix readme (#2013) * Added upgrade/downgrade script template Refactored code Addon upgrade/downgrade test similar to #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 (#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 <[email protected]> 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 * Merge fix-ginkgo to master (#2014) * fix path failure * seperate makefile for test Co-authored-by: abhipth <[email protected]> * Multus manifest for release v3.9.0-eksbuild.1 (#2016) * Updating new instances - p4de (#2018) * Updating new instances * fix formatting * Fix go build failure with v6 networking suite. (#2020) * Update README.md (#2021) * Fix Go build for ipamd test package. (#2023) * Fix Go build for ipamd test package. * Fix format with make format * Fix go build for cni test package. (#2024) * Prevent allocate/free ENIs when node is marked noSchedule (#1927) * Prevent allocate/free ENIs when node is marked noSchedule * Update UTs * Re-use logger instance (#2029) * 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 * fix addOn version api for beta (#2034) * Update yaml.v3 package dependency (#2036) * Update yaml.v3 package dependency Co-authored-by: Jayanth Varavani <[email protected]> Co-authored-by: M00nF1sh <[email protected]> Co-authored-by: Sushmitha Ravikumar <[email protected]> Co-authored-by: Relk Li <[email protected]> Co-authored-by: Relk Li <[email protected]> Co-authored-by: Jan-Otto Kröpke <[email protected]> Co-authored-by: Shuntaro Azuma <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Senthil Kumaran <[email protected]> Co-authored-by: cgchinmay <[email protected]> Co-authored-by: Hao Zhou <[email protected]> Co-authored-by: abhipth <[email protected]> Co-authored-by: Prasad Jivane <[email protected]>
1 parent a57926f commit 851c4a5

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

go.mod

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/prometheus/client_model v0.2.0
1717
github.com/prometheus/common v0.10.0
1818
github.com/spf13/pflag v1.0.5
19-
github.com/stretchr/testify v1.6.1
19+
github.com/stretchr/testify v1.8.0
2020
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
2121
go.uber.org/zap v1.15.0
2222
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
@@ -75,7 +75,7 @@ require (
7575
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
7676
gopkg.in/inf.v0 v0.9.1 // indirect
7777
gopkg.in/yaml.v2 v2.3.0 // indirect
78-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
78+
gopkg.in/yaml.v3 v3.0.1 // indirect
7979
k8s.io/apiextensions-apiserver v0.20.1 // indirect
8080
k8s.io/component-base v0.20.2 // indirect
8181
k8s.io/klog/v2 v2.4.0 // indirect
@@ -84,3 +84,7 @@ require (
8484
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
8585
sigs.k8s.io/yaml v1.2.0 // indirect
8686
)
87+
88+
replace (
89+
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 => gopkg.in/yaml.v3 v3.0.1
90+
)

go.sum

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,15 @@ github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag
393393
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
394394
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
395395
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
396+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
396397
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
397398
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
398399
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
399400
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
400-
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
401401
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
402+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
403+
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
404+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
402405
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
403406
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
404407
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
@@ -729,8 +732,8 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
729732
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
730733
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
731734
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
732-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
733-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
735+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
736+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
734737
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
735738
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
736739
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

scripts/lib/add-on.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
function load_addon_details() {
66
echo "loading $VPC_CNI_ADDON_NAME addon details"
7-
DESCRIBE_ADDON_VERSIONS=$(aws eks describe-addon-versions --addon-name $VPC_CNI_ADDON_NAME --kubernetes-version "$K8S_VERSION")
7+
DESCRIBE_ADDON_VERSIONS=$(aws eks describe-addon-versions $ENDPOINT_FLAG --addon-name $VPC_CNI_ADDON_NAME --kubernetes-version "$K8S_VERSION")
88

99
LATEST_ADDON_VERSION=$(echo "$DESCRIBE_ADDON_VERSIONS" | jq '.addons[0].addonVersions[0].addonVersion' -r)
1010
DEFAULT_ADDON_VERSION=$(echo "$DESCRIBE_ADDON_VERSIONS" | jq -r '.addons[].addonVersions[] | select(.compatibilities[0].defaultVersion == true) | .addonVersion')

0 commit comments

Comments
 (0)