Merge pull request #1174 from mgoltzsche/add-cni-version

Add cniVersion to general CNI plugin configuration.

Documentation/kube-flannel.yml

@@ -105,6 +105,7 @@ metadata:
 data:
   cni-conf.json: |
     {
+      "cniVersion": "0.2.0",
       "name": "cbr0",
       "plugins": [
         {