Skip to content

Commit 16712ae

Browse files
aojeathaJeztah
aojea
authored and
thaJeztah
committed
bump cni version to v0.8.0
bump cni dependencies so we can benefits from its bugfixes and improvements Signed-off-by: Antonio Ojea <[email protected]> (cherry picked from commit e3d27f9) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 6b5fc7f commit 16712ae

18 files changed

Lines changed: 506 additions & 235 deletions

File tree

‎script/setup/install-cni‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
2828
go get -d github.com/containernetworking/plugins/...
2929
cd "$GOPATH"/src/github.com/containernetworking/plugins
3030
git checkout $CNI_COMMIT
31-
FASTBUILD=true ./build.sh
31+
./build_linux.sh
3232
sudo mkdir -p $CNI_DIR
3333
sudo cp -r ./bin $CNI_DIR
3434
sudo mkdir -p $CNI_CONFIG_DIR
3535
cat << EOF | sudo tee $CNI_CONFIG_DIR/10-containerd-net.conflist
3636
{
37-
"cniVersion": "0.3.1",
37+
"cniVersion": "0.4.0",
3838
"name": "containerd-net",
3939
"plugins": [
4040
{
@@ -50,7 +50,7 @@ cat << EOF | sudo tee $CNI_CONFIG_DIR/10-containerd-net.conflist
5050
"subnet": "10.88.0.0/16"
5151
}],
5252
[{
53-
"subnet": "2001:4860:4860::8888/32"
53+
"subnet": "2001:4860:4860::/64"
5454
}]
5555
],
5656
"routes": [

‎vendor.conf‎

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

8888
# cni dependencies
89-
github.com/containerd/go-cni v1.0.0
90-
github.com/containernetworking/cni v0.7.1
91-
github.com/containernetworking/plugins v0.7.6
89+
github.com/containerd/go-cni v1.0.1
90+
github.com/containernetworking/cni v0.8.0
91+
github.com/containernetworking/plugins v0.8.6
9292
github.com/fsnotify/fsnotify v1.4.9
9393

9494
# 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)