Merge pull request #9102 from ZJU-SEL/updateK8sversion

bump the ubuntu k8s version to 0.18.0
This commit is contained in:
Brian Grant
2015-06-02 10:40:54 -07:00
4 changed files with 11 additions and 10 deletions

View File

@@ -51,7 +51,7 @@ cp $ETCD/etcd $ETCD/etcdctl binaries/minion
# k8s
echo "Download kubernetes release ..."
K8S_VERSION="v0.15.0"
K8S_VERSION="v0.18.0"
if [ ! -f kubernetes.tar.gz ] ; then
curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/${K8S_VERSION}/kubernetes.tar.gz -o kubernetes.tar.gz
tar xzf kubernetes.tar.gz

View File

@@ -205,7 +205,6 @@ EOF
function create-kube-controller-manager-opts(){
cat <<EOF > ~/kube/default/kube-controller-manager
KUBE_CONTROLLER_MANAGER_OPTS="--master=127.0.0.1:8080 \
--machines=$1 \
--logtostderr=true"
EOF