This PR adds the cni version to the cni-conf.yaml inside the kube-fla…

…nnel-cfg configmap This PR fixes an issue we latest multus version. Multus is unable to call the cni delete function because the cni version is not configured. Because of this issue pod addresses are not released
flannel-io · May 28, 2019 · 0106d23 · 0106d23
1 parent ba49cd4
commit 0106d23
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/Documentation/k8s-manifests/kube-flannel-legacy.yml b/Documentation/k8s-manifests/kube-flannel-legacy.yml
@@ -17,6 +17,7 @@ data:
   cni-conf.json: |
     {
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "type": "flannel",
       "delegate": {
         "hairpinMode": true,

diff --git a/Documentation/kube-flannel-aliyun.yml b/Documentation/kube-flannel-aliyun.yml
@@ -55,6 +55,7 @@ data:
   cni-conf.json: |
     {
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "type": "flannel",
       "delegate": {
         "hairpinMode": true,

diff --git a/Documentation/kube-flannel-old.yaml b/Documentation/kube-flannel-old.yaml
@@ -55,6 +55,7 @@ data:
   cni-conf.json: |
     {
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "plugins": [
         {
           "type": "flannel",

diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml
@@ -106,6 +106,7 @@ data:
   cni-conf.json: |
     {
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "plugins": [
         {
           "type": "flannel",

diff --git a/Documentation/minikube.yml b/Documentation/minikube.yml
@@ -20,6 +20,7 @@ data:
   cni-conf.json: |
     {
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "type": "flannel",
       "delegate": {
         "hairpinMode": true,