github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15135 from ZJU-SEL/upgrade-flannel

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-13 07:07:18 -07:00
parent de1a9e3167 c41eda7309
commit 4008c65323
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/ubuntu/build.sh
View File

@@ -33,7 +33,7 @@ mkdir -p binaries/master
mkdir -p binaries/minion
# flannel
FLANNEL_VERSION=${FLANNEL_VERSION:-"0.4.0"}
FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.3"}
echo "Prepare flannel ${FLANNEL_VERSION} release ..."
if [ ! -f flannel.tar.gz ] ; then
curl -L https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flannel-${FLANNEL_VERSION}-linux-amd64.tar.gz -o flannel.tar.gz

3
cluster/ubuntu/util.sh
View File

@@ -435,7 +435,8 @@ function kube-down {
ssh -t $i 'sudo rm -f /opt/bin/kube* /opt/bin/flanneld;
sudo rm -rf /etc/init/kube* /etc/init/flanneld.conf /etc/init.d/kube* /etc/init.d/flanneld;
sudo rm -rf /etc/default/kube* /etc/default/flanneld;
sudo rm -rf ~/kube /var/lib/kubelet'
sudo rm -rf ~/kube /var/lib/kubelet;
sudo rm -rf /run/flannel/subnet.env' || true
}
((ii=ii+1))
done