From ef3d56433b28c1c7e3fb920f21846f52af51a32b Mon Sep 17 00:00:00 2001
From: Isaac Hollander McCreery <ihmccreery@google.com>
Date: Fri, 16 Oct 2015 12:34:18 -0700
Subject: [PATCH] Fix KUBE_TAR_URL issue and fix root cause; fixes #15738

---
 cluster/common.sh | 25 ++++++++-----------------
 hack/get-build.sh | 10 ++++++++--
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/cluster/common.sh b/cluster/common.sh
index f16b23a2be..1fce23bb5f 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -255,10 +255,10 @@ function set_binary_version() {
 # use local dev binaries.
 #
 # Assumed vars:
+#   KUBE_VERSION
 #   KUBE_VERSION_REGEX
 #   KUBE_CI_VERSION_REGEX
 # Vars set:
-#   KUBE_TAR_URL
 #   KUBE_TAR_HASH
 #   SERVER_BINARY_TAR_URL
 #   SERVER_BINARY_TAR_HASH
@@ -269,36 +269,27 @@ function tars_from_version() {
     find-release-tars
     upload-server-tars
   elif [[ ${KUBE_VERSION} =~ ${KUBE_VERSION_REGEX} ]]; then
-    KUBE_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes.tar.gz"
     SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz"
     SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes-salt.tar.gz"
   elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then
-    KUBE_TAR_URL="https://storage.googleapis.com/kubernetes-release/ci/${KUBE_VERSION}/kubernetes.tar.gz"
     SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz"
     SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release/ci/${KUBE_VERSION}/kubernetes-salt.tar.gz"
   else
     echo "Version doesn't match regexp" >&2
     exit 1
   fi
-  until KUBE_TAR_HASH=$(curl --fail --silent "${KUBE_TAR_URL}.sha1"); do
+  if ! SERVER_BINARY_TAR_HASH=$(curl -Ss --fail "${SERVER_BINARY_TAR_URL}.sha1"); then
     echo "Failure trying to curl release .sha1"
-  done
-  until SERVER_BINARY_TAR_HASH=$(curl --fail --silent "${SERVER_BINARY_TAR_URL}.sha1"); do
-    echo "Failure trying to curl release .sha1"
-  done
-  until SALT_TAR_HASH=$(curl --fail --silent "${SALT_TAR_URL}.sha1"); do
-    echo "Failure trying to curl Salt tar .sha1"
-  done
-
-  if ! curl -Ss --range 0-1 "${KUBE_TAR_URL}" >&/dev/null; then
-    echo "Can't find release at ${KUBE_TAR_URL}" >&2
-    exit 1
   fi
-  if ! curl -Ss --range 0-1 "${SERVER_BINARY_TAR_URL}" >&/dev/null; then
+  if ! SALT_TAR_HASH=$(curl -Ss --fail "${SALT_TAR_URL}.sha1"); then
+    echo "Failure trying to curl Salt tar .sha1"
+  fi
+
+  if ! curl -Ss --head "${SERVER_BINARY_TAR_URL}" >&/dev/null; then
     echo "Can't find release at ${SERVER_BINARY_TAR_URL}" >&2
     exit 1
   fi
-  if ! curl -Ss --range 0-1 "${SALT_TAR_URL}" >&/dev/null; then
+  if ! curl -Ss --head "${SALT_TAR_URL}" >&/dev/null; then
     echo "Can't find Salt tar at ${SALT_TAR_URL}" >&2
     exit 1
   fi
diff --git a/hack/get-build.sh b/hack/get-build.sh
index 64e77f4386..9bc990a836 100755
--- a/hack/get-build.sh
+++ b/hack/get-build.sh
@@ -71,6 +71,12 @@ if [[ "${print_version}" == "true" ]]; then
   echo "${KUBE_VERSION}"
 else
   echo "Using version at ${1}: ${KUBE_VERSION}" >&2
-  tars_from_version
-  curl --fail -o kubernetes-${KUBE_VERSION}.tar.gz "${KUBE_TAR_URL}"
+  if [[ ${KUBE_VERSION} =~ ${KUBE_VERSION_REGEX} ]]; then
+    curl --fail -o kubernetes-${KUBE_VERSION}.tar.gz "https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes.tar.gz"
+  elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then
+    curl --fail -o kubernetes-${KUBE_VERSION}.tar.gz "https://storage.googleapis.com/kubernetes-release/ci/${KUBE_VERSION}/kubernetes.tar.gz"
+  else
+    echo "Version doesn't match regexp" >&2
+    exit 1
+  fi
 fi