Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit 5736d0e

Browse files
mikebrowmikebrow
authored
Merge pull request #1560 from mikebrow/cherrypick-#1556-release-1.4
[release/1.4] bump cni dependencies #1556
2 parents bb0ca84 + d716c78 commit 5736d0e

File tree

20 files changed

+515
-236
lines changed

20 files changed

+515
-236
lines changed

‎hack/install/install-cni-config.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ${SUDO} bash -c 'cat >'${CNI_CONFIG_DIR}'/10-containerd-net.conflist <<EOF
3939
"subnet": "10.88.0.0/16"
4040
}],
4141
[{
42-
"subnet": "2001:4860:4860::8888/32"
42+
"subnet": "2001:4860:4860::/64"
4343
}]
4444
],
4545
"routes": [

‎hack/install/install-cni.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@ GOPATH=$(mktemp -d /tmp/cri-install-cni.XXXX)
2929
from-vendor CNI github.com/containernetworking/plugins
3030
checkout_repo ${CNI_PKG} ${CNI_VERSION} ${CNI_REPO}
3131
cd ${GOPATH}/src/${CNI_PKG}
32-
FASTBUILD=true ./build.sh
32+
33+
if [[ "$OSTYPE" == "linux-gnu"* ]] || [[ "$OSTYPE" == "darwin"* ]]; then
34+
./build_linux.sh
35+
elif [[ "$OSTYPE" == "win32" ]]; then
36+
./build_windows.sh
37+
else
38+
exit 1
39+
fi
40+
3341
${SUDO} mkdir -p ${CNI_DIR}
3442
${SUDO} cp -r ./bin ${CNI_DIR}
3543

‎pkg/server/update_runtime_config_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestUpdateRuntimeConfig(t *testing.T) {
5151
},
5252
]
5353
}`
54-
testCIDR = "10.0.0.0/24, 2001:4860:4860::8888/32"
54+
testCIDR = "10.0.0.0/24, 2001:4860:4860::/64"
5555
expected = `
5656
{
5757
"name": "test-pod-network",
@@ -63,7 +63,7 @@ func TestUpdateRuntimeConfig(t *testing.T) {
6363
"ipam": {
6464
"type": "host-local",
6565
"subnet": "10.0.0.0/24",
66-
"ranges": [[{"subnet": "10.0.0.0/24"}], [{"subnet": "2001:4860:4860::8888/32"}]],
66+
"ranges": [[{"subnet": "10.0.0.0/24"}], [{"subnet": "2001:4860:4860::/64"}]],
6767
"routes": [{"dst": "0.0.0.0/0"}, {"dst": "::/0"}]
6868
}
6969
},

‎vendor.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ sigs.k8s.io/structured-merge-diff/v3 v3.0.0
8989
sigs.k8s.io/yaml v1.2.0
9090

9191
# cni dependencies
92-
github.com/containerd/go-cni v1.0.0
93-
github.com/containernetworking/cni v0.7.1
94-
github.com/containernetworking/plugins v0.7.6
92+
github.com/containerd/go-cni v1.0.1
93+
github.com/containernetworking/cni v0.8.0
94+
github.com/containernetworking/plugins v0.8.6
9595
github.com/fsnotify/fsnotify v1.4.9
9696

9797
# image decrypt depedencies

‎vendor/github.com/containerd/go-cni/README.md‎

Lines changed: 49 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/go-cni/go.mod‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containernetworking/cni/README.md‎

Lines changed: 24 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)