Merge branch 'v0.10.0-manifests'

Documentation/k8s-manifests/kube-flannel-legacy.yml

@@ -52,7 +52,7 @@ spec:
       serviceAccountName: flannel
       containers:
       - name: kube-flannel
-        image: quay.io/coreos/flannel:v0.9.1-amd64
+        image: quay.io/coreos/flannel:v0.10.0-amd64
         command:
         - /opt/bin/flanneld
         args:
@@ -82,7 +82,7 @@ spec:
         - name: flannel-cfg
           mountPath: /etc/kube-flannel/
       - name: install-cni
-        image: quay.io/coreos/flannel:v0.9.1-amd64
+        image: quay.io/coreos/flannel:v0.10.0-amd64
         command: [ "/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done" ]
         volumeMounts:
         - name: cni

Documentation/kube-flannel.yml

@@ -104,7 +104,7 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni
-        image: quay.io/coreos/flannel:v0.9.1-amd64
+        image: quay.io/coreos/flannel:v0.10.0-amd64
         command:
         - cp
         args:
@@ -118,7 +118,7 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
-        image: quay.io/coreos/flannel:v0.9.1-amd64
+        image: quay.io/coreos/flannel:v0.10.0-amd64
         command:
         - /opt/bin/flanneld
         args: