scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-11 00:34:39 -08:00
parent 90b5db167f 6b830cf229
commit 1b90941841
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/centos/config-build.sh
View File

@@ -20,7 +20,7 @@
RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads} RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads}
# Define flannel version to use. # Define flannel version to use.
FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.3"} FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"}
# Define etcd version to use. # Define etcd version to use.
ETCD_VERSION=${ETCD_VERSION:-"2.2.1"} ETCD_VERSION=${ETCD_VERSION:-"2.2.1"}

2
cluster/centos/node/scripts/flannel.sh
View File

@@ -32,7 +32,7 @@ Before=docker.service
[Service] [Service]
EnvironmentFile=-/opt/kubernetes/cfg/flannel 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 ExecStartPost=/opt/kubernetes/bin/mk-docker-opts.sh -d /run/flannel/docker
Type=notify Type=notify

2
cluster/saltbase/salt/flannel/initd
View File

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

2
cluster/ubuntu/download-release.sh
View File

@@ -31,7 +31,7 @@ mkdir -p binaries/master
mkdir -p binaries/minion mkdir -p binaries/minion
# flannel # flannel
FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.3"} FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.5"}
echo "Prepare flannel ${FLANNEL_VERSION} release ..." echo "Prepare flannel ${FLANNEL_VERSION} release ..."
grep -q "^${FLANNEL_VERSION}\$" binaries/.flannel 2>/dev/null || { 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 curl -L https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flannel-${FLANNEL_VERSION}-linux-amd64.tar.gz -o flannel.tar.gz

1
cluster/ubuntu/util.sh
View File

@@ -256,6 +256,7 @@ EOF
function create-flanneld-opts() { function create-flanneld-opts() {
cat <<EOF > ~/kube/default/flanneld cat <<EOF > ~/kube/default/flanneld
FLANNEL_OPTS="--etcd-endpoints=http://${1}:4001 \ FLANNEL_OPTS="--etcd-endpoints=http://${1}:4001 \
--ip-masq \
--iface=${2}" --iface=${2}"
EOF EOF
} }

2
cluster/vagrant/provision-network-master.sh
View File

@@ -68,7 +68,7 @@ EOF
cat <<EOF >/etc/sysconfig/flanneld cat <<EOF >/etc/sysconfig/flanneld
FLANNEL_ETCD="${FLANNEL_ETCD_URL}" FLANNEL_ETCD="${FLANNEL_ETCD_URL}"
FLANNEL_ETCD_KEY="/coreos.com/network" FLANNEL_ETCD_KEY="/coreos.com/network"
FLANNEL_OPTIONS="-iface=${NETWORK_IF_NAME}" FLANNEL_OPTIONS="-iface=${NETWORK_IF_NAME} --ip-masq"
EOF EOF
# Start flannel # Start flannel

2
cluster/vagrant/provision-network-node.sh
View File

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