X Tutup
Skip to content

Commit a217b5a

Browse files
zouyeezouyee
committed
bump CNI to spec v1.0.0
Signed-off-by: zounengren <zouyee1989@gmail.com>
1 parent 006b441 commit a217b5a

File tree

32 files changed

+1180
-499
lines changed

32 files changed

+1180
-499
lines changed

‎contrib/gce/cni.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "k8s-pod-network",
3-
"cniVersion": "0.3.1",
3+
"cniVersion": "1.0.0",
44
"plugins": [
55
{
66
"type": "ptp",

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ require (
1313
github.com/containerd/containerd/api v0.0.0
1414
github.com/containerd/continuity v0.2.0
1515
github.com/containerd/fifo v1.0.0
16-
github.com/containerd/go-cni v1.0.2
16+
github.com/containerd/go-cni v1.1.0
1717
github.com/containerd/go-runc v1.0.0
1818
github.com/containerd/imgcrypt v1.1.1
1919
github.com/containerd/nri v0.1.0
2020
github.com/containerd/ttrpc v1.0.2
2121
github.com/containerd/typeurl v1.0.2
2222
github.com/containerd/zfs v1.0.0
23-
github.com/containernetworking/plugins v0.9.1
23+
github.com/containernetworking/plugins v1.0.1
2424
github.com/coreos/go-systemd/v22 v22.3.2
2525
github.com/davecgh/go-spew v1.1.1
2626
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c

‎go.sum‎

Lines changed: 28 additions & 29 deletions
Large diffs are not rendered by default.

‎integration/client/go.sum‎

Lines changed: 22 additions & 23 deletions
Large diffs are not rendered by default.

‎pkg/cri/server/update_runtime_config_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestUpdateRuntimeConfig(t *testing.T) {
3636
testTemplate = `
3737
{
3838
"name": "test-pod-network",
39-
"cniVersion": "0.3.1",
39+
"cniVersion": "1.0.0",
4040
"plugins": [
4141
{
4242
"type": "ptp",
@@ -54,7 +54,7 @@ func TestUpdateRuntimeConfig(t *testing.T) {
5454
expected = `
5555
{
5656
"name": "test-pod-network",
57-
"cniVersion": "0.3.1",
57+
"cniVersion": "1.0.0",
5858
"plugins": [
5959
{
6060
"type": "ptp",

‎script/setup/install-cni‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ cp -r ./bin $CNI_DIR
3535
mkdir -p $CNI_CONFIG_DIR
3636
cat << EOF | tee $CNI_CONFIG_DIR/10-containerd-net.conflist
3737
{
38-
"cniVersion": "0.4.0",
38+
"cniVersion": "1.0.0",
3939
"name": "containerd-net",
4040
"plugins": [
4141
{

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

Lines changed: 4 additions & 4 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/cni.go‎

Lines changed: 4 additions & 5 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/deprecated.go‎

Lines changed: 3 additions & 3 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/errors.go‎

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

0 commit comments

Comments
 (0)
X Tutup