Browse Source

This PR adds the cni version to the cni-conf.yaml inside the kube-flannel-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
Sebastian Sch 5 years ago
parent
commit
0106d23455

+ 1 - 0
Documentation/k8s-manifests/kube-flannel-legacy.yml

@@ -17,6 +17,7 @@ data:
   cni-conf.json: |
   cni-conf.json: |
     {
     {
       "name": "cbr0",
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "type": "flannel",
       "type": "flannel",
       "delegate": {
       "delegate": {
         "hairpinMode": true,
         "hairpinMode": true,

+ 1 - 0
Documentation/kube-flannel-aliyun.yml

@@ -55,6 +55,7 @@ data:
   cni-conf.json: |
   cni-conf.json: |
     {
     {
       "name": "cbr0",
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "type": "flannel",
       "type": "flannel",
       "delegate": {
       "delegate": {
         "hairpinMode": true,
         "hairpinMode": true,

+ 1 - 0
Documentation/kube-flannel-old.yaml

@@ -55,6 +55,7 @@ data:
   cni-conf.json: |
   cni-conf.json: |
     {
     {
       "name": "cbr0",
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "plugins": [
       "plugins": [
         {
         {
           "type": "flannel",
           "type": "flannel",

+ 1 - 0
Documentation/kube-flannel.yml

@@ -106,6 +106,7 @@ data:
   cni-conf.json: |
   cni-conf.json: |
     {
     {
       "name": "cbr0",
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "plugins": [
       "plugins": [
         {
         {
           "type": "flannel",
           "type": "flannel",

+ 1 - 0
Documentation/minikube.yml

@@ -20,6 +20,7 @@ data:
   cni-conf.json: |
   cni-conf.json: |
     {
     {
       "name": "cbr0",
       "name": "cbr0",
+      "cniVersion": "0.3.1",
       "type": "flannel",
       "type": "flannel",
       "delegate": {
       "delegate": {
         "hairpinMode": true,
         "hairpinMode": true,