diff --git a/cluster/common.sh b/cluster/common.sh index a61928985b..660e6abb2e 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -376,13 +376,13 @@ function tars_from_version() { SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes-salt.tar.gz" # TODO: Clean this up. KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}" - KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} | sha1sum | awk '{print $1}') + KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} 2>/dev/null | sha1sum | awk '{print $1}') elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release-dev/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz" SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release-dev/ci/${KUBE_VERSION}/kubernetes-salt.tar.gz" # TODO: Clean this up. KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}" - KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} | sha1sum | awk '{print $1}') + KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} 2>/dev/null | sha1sum | awk '{print $1}') else echo "Version doesn't match regexp" >&2 exit 1 diff --git a/cluster/gce/upgrade.sh b/cluster/gce/upgrade.sh index 709ff4c9dd..f7ac123c13 100755 --- a/cluster/gce/upgrade.sh +++ b/cluster/gce/upgrade.sh @@ -253,6 +253,7 @@ function do-node-upgrade() { --zones="${ZONE}" \ --regexp="${group}" \ --format='value(instanceTemplate)' || true)) + echo "== Calling rolling-update for ${group}. ==" >&2 update=$(gcloud alpha compute rolling-updates \ --project="${PROJECT}" \ --zone="${ZONE}" \ @@ -267,6 +268,7 @@ function do-node-upgrade() { updates+=("${id}") done + echo "== Waiting for Upgrading nodes to be finished. ==" >&2 # Wait until rolling updates are finished. for update in ${updates[@]}; do while true; do