Merge "Set cniVersion for flannel" into stable/train

2019-10-11 20:17:03 +00:00 · 2019-10-11 20:17:03 +00:00 · 200e18b091
parent 76d6c2ee9e b2ee79e26d
commit 200e18b091
1 changed files with 1 additions and 0 deletions
--- a/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh
@ -123,6 +123,7 @@ data:
  cni-conf.json: |
    {
      "name": "cbr0",
+      "cniVersion": "0.2.0",
      "plugins": [
        {
          "type": "flannel",