Merge pull request kubernetes#18456 from thockin/bump-flannel-ver

Auto commit by PR queue bot
nikhiljindal · Dec 11, 2015 · 1b90941 · 1b90941
2 parents 90b5db1 + 6b830cf
commit 1b90941
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/cluster/centos/config-build.sh b/cluster/centos/config-build.sh
@@ -20,7 +20,7 @@
 RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads}
 
 # Define flannel version to use.
-FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.3"}
+FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"}
 
 # Define etcd version to use.
 ETCD_VERSION=${ETCD_VERSION:-"2.2.1"}

diff --git a/cluster/centos/node/scripts/flannel.sh b/cluster/centos/node/scripts/flannel.sh
@@ -32,7 +32,7 @@ Before=docker.service
 
 [Service]
 EnvironmentFile=-/opt/kubernetes/cfg/flannel
-ExecStart=/opt/kubernetes/bin/flanneld \${FLANNEL_ETCD} \${FLANNEL_ETCD_KEY}
+ExecStart=/opt/kubernetes/bin/flanneld --ip-masq \${FLANNEL_ETCD} \${FLANNEL_ETCD_KEY}
 ExecStartPost=/opt/kubernetes/bin/mk-docker-opts.sh -d /run/flannel/docker
 
 Type=notify

diff --git a/cluster/saltbase/salt/flannel/initd b/cluster/saltbase/salt/flannel/initd
@@ -17,7 +17,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Flannel overlay network daemon"
 NAME=flannel
 DAEMON=/usr/local/bin/flanneld
-DAEMON_ARGS=""
+DAEMON_ARGS="--ip-masq"
 DAEMON_LOG_FILE=/var/log/$NAME.log
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME

diff --git a/cluster/ubuntu/download-release.sh b/cluster/ubuntu/download-release.sh
@@ -31,7 +31,7 @@ mkdir -p binaries/master
 mkdir -p binaries/minion
 
 # flannel
-FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.3"}
+FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"}
 echo "Prepare flannel ${FLANNEL_VERSION} release ..."
 grep -q "^${FLANNEL_VERSION}\$" binaries/.flannel 2>/dev/null || {
   curl -L  https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flannel-${FLANNEL_VERSION}-linux-amd64.tar.gz -o flannel.tar.gz
@@ -73,4 +73,4 @@ grep -q "^${KUBE_VERSION}\$" binaries/.kubernetes 2>/dev/null || {
 rm -rf flannel* kubernetes* etcd*
 
 echo "Done! All your commands locate in kubernetes/cluster/ubuntu/binaries dir"
-popd
+popd
diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh
@@ -256,6 +256,7 @@ EOF
 function create-flanneld-opts() {
   cat <<EOF > ~/kube/default/flanneld
 FLANNEL_OPTS="--etcd-endpoints=http://${1}:4001 \
+ --ip-masq \
  --iface=${2}"
 EOF
 }

diff --git a/cluster/vagrant/provision-network-master.sh b/cluster/vagrant/provision-network-master.sh
@@ -68,7 +68,7 @@ EOF
     cat <<EOF >/etc/sysconfig/flanneld
 FLANNEL_ETCD="${FLANNEL_ETCD_URL}"
 FLANNEL_ETCD_KEY="/coreos.com/network"
-FLANNEL_OPTIONS="-iface=${NETWORK_IF_NAME}"
+FLANNEL_OPTIONS="-iface=${NETWORK_IF_NAME} --ip-masq"
 EOF
 
     # Start flannel

diff --git a/cluster/vagrant/provision-network-node.sh b/cluster/vagrant/provision-network-node.sh
@@ -33,7 +33,7 @@ function provision-network-node {
     cat <<EOF >/etc/sysconfig/flanneld
 FLANNEL_ETCD="${FLANNEL_ETCD_URL}"
 FLANNEL_ETCD_KEY="/coreos.com/network"
-FLANNEL_OPTIONS="-iface=${NETWORK_IF_NAME}"
+FLANNEL_OPTIONS="-iface=${NETWORK_IF_NAME} --ip-masq"
 EOF
 
     # Start flannel