Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.11 merge from main branch #2037

Merged
merged 40 commits into from
Jul 22, 2022
Merged

Release 1.11 merge from main branch #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
45dd7e4
1.10.3 release artifacts (#1962)
jayanthvn Apr 11, 2022
dd7615e
Stale PR and issue cleanup wrkflow (#1964)
jayanthvn Apr 12, 2022
46c41f8
fix image name during build (#1968)
M00nF1sh Apr 13, 2022
fd8bcf0
add event recorder utils to raise aws-node pod events (#1536)
sushrk Apr 13, 2022
c22f72e
refactor uploader scripts (#1972)
jayanthvn Apr 15, 2022
db1481f
Fix cni panic due to pod.Annotations is a nil map (#1974)
Downager Apr 18, 2022
1c6cc3c
chart: Add extraVolumes and extraVolumeMounts (#1949)
jkroepke Apr 22, 2022
22d3a91
Add the new command in the section of CNI Plugin Sequence (#1813)
a2ush Apr 22, 2022
3146258
Bump github.com/containernetworking/cni from 0.8.0 to 0.8.1 (#1966)
dependabot[bot] Apr 22, 2022
af55286
Update README to highlight containerd.sock edge case with EKS AMI. (#…
orsenthil May 5, 2022
44c132a
add cni release test script (#1971)
sushrk May 6, 2022
1c4bd46
Multus release manifest (#1984)
May 6, 2022
42e5f2d
Added Tests for validating Multus Installation (#1811)
May 9, 2022
fcf90e8
Port new integration tests (#1928)
May 9, 2022
902dcb2
increase timeout (#1985)
May 11, 2022
5b34d7d
Added configurable flag to create test nodes with arm64 and container…
May 11, 2022
1950aa7
Cleanup binary file (#1987)
jayanthvn May 12, 2022
e3cf980
log error in ipamd on api server timeout (#1988)
May 12, 2022
9d7bf47
Refactored code and Added cni addon upgrade/downgrade regression test…
May 17, 2022
2c32145
Remove generation of calico manifests (#1905)
jayanthvn May 18, 2022
5ea08e9
cni manifest upgrade downgrade test (#1863)
May 19, 2022
3b80849
Update golang to Go 1.18 (#1991)
orsenthil May 25, 2022
7748fdb
Update CNI Plugins to v1.1.1 (#1997)
orsenthil Jun 3, 2022
6416a0e
Update release manifests for VPC CNI v1.11.2 (#2001) (#2002)
orsenthil Jun 6, 2022
10f3aed
Enable Calico on ARM64 and add configureable flags for Calico install…
haouc Jun 11, 2022
5c6945e
fix integration test script (#1998)
sushrk Jun 18, 2022
7156643
Updated dependencies (#2012)
jayanthvn Jun 20, 2022
8eafddd
Fix readme (#2013)
Jun 21, 2022
e6439fb
Merge fix-ginkgo to master (#2014)
sushrk Jun 22, 2022
1158a52
Multus manifest for release v3.9.0-eksbuild.1 (#2016)
Jun 24, 2022
6abbf20
Updating new instances - p4de (#2018)
jayanthvn Jun 29, 2022
4bd4c8e
Fix go build failure with v6 networking suite. (#2020)
orsenthil Jul 1, 2022
a3af829
Update README.md (#2021)
Jul 5, 2022
301c379
Fix Go build for ipamd test package. (#2023)
orsenthil Jul 6, 2022
f979630
Fix go build for cni test package. (#2024)
orsenthil Jul 6, 2022
b01d356
Prevent allocate/free ENIs when node is marked noSchedule (#1927)
jayanthvn Jul 11, 2022
6b04445
Re-use logger instance (#2029)
vikasmb Jul 12, 2022
f8d731a
fix addOn version api for beta (#2034)
M00nF1sh Jul 15, 2022
ecfe8fa
Update yaml.v3 package dependency (#2036)
vikasmb Jul 22, 2022
22b73f2
Merge remote-tracking branch 'remotes/upstream/master' into release-1.11
vikasmb Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.10.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1
github.com/stretchr/testify v1.8.0
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
go.uber.org/zap v1.15.0
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
Expand Down Expand Up @@ -75,7 +75,7 @@ require (
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.20.1 // indirect
k8s.io/component-base v0.20.2 // indirect
k8s.io/klog/v2 v2.4.0 // indirect
Expand All @@ -84,3 +84,7 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace (
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 => gopkg.in/yaml.v3 v3.0.1
)
9 changes: 6 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,12 +393,15 @@ github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
Expand Down Expand Up @@ -729,8 +732,8 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
Expand Down
2 changes: 1 addition & 1 deletion scripts/lib/add-on.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

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