fix kube-up workflow

This commit is contained in:
He Simei 2015-11-18 09:59:00 +08:00
parent b836f0cf85
commit cc9fff8e92

View File

@ -267,8 +267,9 @@ EOF
function detect-master() { function detect-master() {
source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE:-config-default.sh}" source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE:-config-default.sh}"
setClusterInfo setClusterInfo
KUBE_MASTER_IP="${MASTER_IP}" export KUBE_MASTER="${MASTER}"
echo "Using master $MASTER_IP" export KUBE_MASTER_IP="${MASTER_IP}"
echo "Using master ${MASTER_IP}"
} }
# Detect the information about the nodes # Detect the information about the nodes
@ -304,11 +305,11 @@ function detect-nodes() {
function kube-up() { function kube-up() {
source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE:-config-default.sh}" source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE:-config-default.sh}"
# ensure the binaries are well prepared # downloading tarball release
if [[ ! -f "ubuntu/binaries/master/kube-apiserver" ]]; then if [[ -d "${KUBE_ROOT}/cluster/ubuntu/binaries" ]]; then
echo "No local binaries for kube-up, downloading..." rm -rf "${KUBE_ROOT}/cluster/ubuntu/binaries"
"${KUBE_ROOT}/cluster/ubuntu/download-release.sh"
fi fi
"${KUBE_ROOT}/cluster/ubuntu/download-release.sh"
setClusterInfo setClusterInfo
local ii=0 local ii=0