From 3a0d6ded4a6d314e940111d535f1bbb26eb0b5c6 Mon Sep 17 00:00:00 2001 From: l1b0k Date: Wed, 7 Jul 2021 10:54:56 +0800 Subject: [PATCH] Bump cni version to 0.3.1 Signed-off-by: l1b0k --- docs/host-stack-cidrs.md | 4 ++-- docs/hubble-intergration.md | 2 +- eni.conf | 2 +- init.sh | 2 +- plugin/terway/cni.go | 2 +- {version => plugin/version}/spec.go | 2 +- terway-cilium.yml | 2 +- terway-multiip.yml | 2 +- terway.yml | 2 +- tests/templates/terway/terway-eni-only.yml | 2 +- tests/templates/terway/terway-multiip.yml | 2 +- tests/templates/terway/terway-vpc.yml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename {version => plugin/version}/spec.go (87%) diff --git a/docs/host-stack-cidrs.md b/docs/host-stack-cidrs.md index 5586da4c..e3ad9ed3 100644 --- a/docs/host-stack-cidrs.md +++ b/docs/host-stack-cidrs.md @@ -23,7 +23,7 @@ ```json 10-terway.conf: | { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway", "eniip_virtual_type": "IPVlan", "host_stack_cidrs": ["169.254.0.0/16"], // 此处为您希望添加的主机网络栈路由 @@ -50,7 +50,7 @@ ```bash cat /etc/cni/net.d/* { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway-chainer", "plugins": [ { diff --git a/docs/hubble-intergration.md b/docs/hubble-intergration.md index 13cfe3bb..25a5d4c1 100644 --- a/docs/hubble-intergration.md +++ b/docs/hubble-intergration.md @@ -19,7 +19,7 @@ ```json 10-terway.conf: | { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway", "eniip_virtual_type": "IPVlan", // 新增以下配置，以打开 Hubble 网络流量分析 diff --git a/eni.conf b/eni.conf index 7ed633af..f45d3ede 100644 --- a/eni.conf +++ b/eni.conf @@ -1,5 +1,5 @@ { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "eni", "type": "terway-plugin", "prefix": "eth" diff --git a/init.sh b/init.sh index 7ba9d1c7..3a7eb499 100755 --- a/init.sh +++ b/init.sh @@ -107,7 +107,7 @@ if [ "$ENIIP_VIRTUAL_TYPE" = "ipvlan" ]; then echo "Creating 10-terway.conflist" jq ' { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway-chainer", "plugins": [ del(.name,.cniVersion), diff --git a/plugin/terway/cni.go b/plugin/terway/cni.go index a3dbb3f3..4f2e8066 100644 --- a/plugin/terway/cni.go +++ b/plugin/terway/cni.go @@ -14,9 +14,9 @@ import ( "github.com/AliyunContainerService/terway/pkg/link" "github.com/AliyunContainerService/terway/plugin/backend" "github.com/AliyunContainerService/terway/plugin/driver" + "github.com/AliyunContainerService/terway/plugin/version" "github.com/AliyunContainerService/terway/rpc" terwayTypes "github.com/AliyunContainerService/terway/types" - "github.com/AliyunContainerService/terway/version" "github.com/containernetworking/cni/pkg/skel" "github.com/containernetworking/cni/pkg/types" diff --git a/version/spec.go b/plugin/version/spec.go similarity index 87% rename from version/spec.go rename to plugin/version/spec.go index 82b45cb9..b7b34ef5 100644 --- a/version/spec.go +++ b/plugin/version/spec.go @@ -10,7 +10,7 @@ import "github.com/containernetworking/cni/pkg/version" // * VERSION // Refer to https://github.com/containernetworking/cni/blob/master/SPEC.md // for details -var specVersionSupported = version.PluginSupports("0.3.0", "0.4.0") +var specVersionSupported = version.PluginSupports("0.3.0", "0.3.1", "0.4.0") // GetSpecVersionSupported gets the version of the CNI spec that's supported // by the ENI plugin diff --git a/terway-cilium.yml b/terway-cilium.yml index 378c3d8e..bae38c3d 100644 --- a/terway-cilium.yml +++ b/terway-cilium.yml @@ -121,7 +121,7 @@ data: } 10-terway.conf: | { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway", "type": "terway", "eniip_virtual_type": "IPVlan", diff --git a/terway-multiip.yml b/terway-multiip.yml index 2cdb66f3..e3059b25 100644 --- a/terway-multiip.yml +++ b/terway-multiip.yml @@ -82,7 +82,7 @@ data: } 10-terway.conf: | { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway", "type": "terway", "eniip_virtual_type": "Veth", diff --git a/terway.yml b/terway.yml index 4826b526..1b3d8450 100644 --- a/terway.yml +++ b/terway.yml @@ -79,7 +79,7 @@ data: } 10-terway.conf: | { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway", "type": "terway" } diff --git a/tests/templates/terway/terway-eni-only.yml b/tests/templates/terway/terway-eni-only.yml index f9665dfa..4a174d21 100644 --- a/tests/templates/terway/terway-eni-only.yml +++ b/tests/templates/terway/terway-eni-only.yml @@ -77,7 +77,7 @@ data: } 10-terway.conf: | { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway", "type": "terway" } diff --git a/tests/templates/terway/terway-multiip.yml b/tests/templates/terway/terway-multiip.yml index 28b18da5..6a4b012a 100644 --- a/tests/templates/terway/terway-multiip.yml +++ b/tests/templates/terway/terway-multiip.yml @@ -76,7 +76,7 @@ data: } 10-terway.conf: | { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway", "type": "terway" } diff --git a/tests/templates/terway/terway-vpc.yml b/tests/templates/terway/terway-vpc.yml index d1f21d3c..34f157bb 100644 --- a/tests/templates/terway/terway-vpc.yml +++ b/tests/templates/terway/terway-vpc.yml @@ -77,7 +77,7 @@ data: } 10-terway.conf: | { - "cniVersion": "0.3.0", + "cniVersion": "0.3.1", "name": "terway", "type": "terway" }