Merge pull request #1530 from manuelbuil/kube-flannel-cniplugin-update

Update kube-flannel-cni image

Documentation/configuration.md

@@ -86,7 +86,7 @@ Set `healthz-port` to a non-zero value will enable a healthz server for flannel.
 Flannel supports the dual-stack mode of Kubernetes. This means pods and services could use ipv4 and ipv6 at the same time. Currently, dual-stack is only supported for kube subnet manager and vxlan, wireguard or host-gw(linux) backend.
 
 Requirements:
-* v1.0 of flannel binary from [containernetworking/plugins](https://github.com/containernetworking/plugins)
+* v1.0.1 of flannel binary from [containernetworking/plugins](https://github.com/containernetworking/plugins)
 * Nodes must have an ipv4 and ipv6 address in the main interface
 * Nodes must have an ipv4 and ipv6 address default route
 * vxlan support ipv6 tunnel require kernel version >= 3.12

Documentation/kube-flannel.yml

@@ -166,7 +166,8 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni-plugin
-        image: rancher/mirrored-flannelcni-flannel-cni-plugin:v1.0.0
+       #image: flannelcni/flannel-cni-plugin:v1.0.1 for ppc64le (dockerhub limitations may apply)
+        image: rancher/mirrored-flannelcni-flannel-cni-plugin:v1.0.1
         command:
         - cp
         args:
@@ -177,6 +178,7 @@ spec:
         - name: cni-plugin
           mountPath: /opt/cni/bin
       - name: install-cni
+       #image: flannelcni/flannel:v0.16.1 for ppc64le (dockerhub limitations may apply)
         image: rancher/mirrored-flannelcni-flannel:v0.16.1
         command:
         - cp
@@ -191,6 +193,7 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
+       #image: flannelcni/flannel:v0.16.1 for ppc64le (dockerhub limitations may apply)
         image: rancher/mirrored-flannelcni-flannel:v0.16.1
         command:
         - /opt/bin/flanneld