Merge pull request #18313 from thockin/bump-flannel-ver

Auto commit by PR queue bot
kubernetes · Dec 8, 2015 · be0d55c · be0d55c
2 parents 1900c62 + 8ba250e
commit be0d55c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/docs/getting-started-guides/docker-multinode/master.md b/docs/getting-started-guides/docker-multinode/master.md
@@ -115,7 +115,7 @@ or it may be something else.
 Now run flanneld itself:
 
 ```sh
-sudo docker -H unix:///var/run/docker-bootstrap.sock run -d --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.3
+sudo docker -H unix:///var/run/docker-bootstrap.sock run -d --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.5 --ip-masq
 ```
 
 The previous command should have printed a really long hash, copy this hash.

diff --git a/docs/getting-started-guides/docker-multinode/master.sh b/docs/getting-started-guides/docker-multinode/master.sh
@@ -139,8 +139,9 @@ start_k8s(){
     --net=host \
     --privileged \
     -v /dev/net:/dev/net \
-    quay.io/coreos/flannel:0.5.3 \
+    quay.io/coreos/flannel:0.5.5 \
     /opt/bin/flanneld \
+    --ip-masq \
     -iface="eth0")
 
     sleep 8

diff --git a/docs/getting-started-guides/docker-multinode/worker.md b/docs/getting-started-guides/docker-multinode/worker.md
@@ -91,7 +91,7 @@ or it may be something else.
 Now run flanneld itself, this call is slightly different from the above, since we point it at the etcd instance on the master.
 
 ```sh
-sudo docker -H unix:///var/run/docker-bootstrap.sock run -d --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.3 /opt/bin/flanneld --etcd-endpoints=http://${MASTER_IP}:4001
+sudo docker -H unix:///var/run/docker-bootstrap.sock run -d --net=host --privileged -v /dev/net:/dev/net quay.io/coreos/flannel:0.5.5 /opt/bin/flanneld --ip-masq --etcd-endpoints=http://${MASTER_IP}:4001
 ```
 
 The previous command should have printed a really long hash, copy this hash.

diff --git a/docs/getting-started-guides/docker-multinode/worker.sh b/docs/getting-started-guides/docker-multinode/worker.sh
@@ -125,8 +125,9 @@ start_k8s() {
         --net=host \
         --privileged \
         -v /dev/net:/dev/net \
-        quay.io/coreos/flannel:0.5.3 \
+        quay.io/coreos/flannel:0.5.5 \
         /opt/bin/flanneld \
+        --ip-masq \
         --etcd-endpoints=http://${MASTER_IP}:4001 -iface="eth0")
 
     sleep 8

diff --git a/docs/getting-started-guides/ubuntu.md b/docs/getting-started-guides/ubuntu.md
@@ -60,7 +60,7 @@ work, which has been merge into this document.
 Internet to download the necessary files, while worker nodes do not.
 3. These guide is tested OK on Ubuntu 14.04 LTS 64bit server, but it can not work with
 Ubuntu 15 which uses systemd instead of upstart.
-4. Dependencies of this guide: etcd-2.2.1, flannel-0.5.3, k8s-1.1.2, may work with higher versions.
+4. Dependencies of this guide: etcd-2.2.1, flannel-0.5.5, k8s-1.1.2, may work with higher versions.
 5. All the remote servers can be ssh logged in without a password by using key authentication.
 
 
@@ -77,7 +77,7 @@ $ git clone https://github.com/kubernetes/kubernetes.git
 #### Configure and start the Kubernetes cluster
 
 The startup process will first download all the required binaries automatically.
-By default etcd version is 2.2.1, flannel version is 0.5.3 and k8s version is 1.1.2.
+By default etcd version is 2.2.1, flannel version is 0.5.5 and k8s version is 1.1.2.
 You can customize your etcd version, flannel version, k8s version by changing corresponding variables
 `ETCD_VERSION` , `FLANNEL_VERSION` and `KUBE_VERSION` like following.