Bump cni version to 0.3.1

Signed-off-by: l1b0k <[email protected]>
AliyunContainerService · Jul 9, 2021 · 3a0d6de · 3a0d6de
1 parent 893821f
commit 3a0d6de
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 → plugin/version/spec.go b/version/spec.go → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -77,7 +77,7 @@ data:
     }
   10-terway.conf: |
     {
-      "cniVersion": "0.3.0",
+      "cniVersion": "0.3.1",
       "name": "terway",
       "type": "terway"
     }