From 106a8ce469a29e605b52b1361bfab3d1023bc9ed Mon Sep 17 00:00:00 2001
From: Erick Fejta <fejta@google.com>
Date: Fri, 17 Mar 2017 14:37:22 -0700
Subject: [PATCH] Do not override KUBERNETES_RELEASE if already set

---
 cluster/get-kube-binaries.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/cluster/get-kube-binaries.sh b/cluster/get-kube-binaries.sh
index 20e1c13d8f3..15067a6d874 100755
--- a/cluster/get-kube-binaries.sh
+++ b/cluster/get-kube-binaries.sh
@@ -44,6 +44,10 @@ KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd)
 KUBERNETES_RELEASE_URL="${KUBERNETES_RELEASE_URL:-https://storage.googleapis.com/kubernetes-release/release}"
 
 function detect_kube_release() {
+  if [[ -n "${KUBE_VERSION:-}" ]]; then
+    return 0  # Allow caller to explicitly set version
+  fi
+
   if [[ ! -e "${KUBE_ROOT}/version" ]]; then
     echo "Can't determine Kubernetes release." >&2
     echo "${BASH_SOURCE} should only be run from a prebuilt Kubernetes release." >&2
@@ -51,8 +55,7 @@ function detect_kube_release() {
     exit 1
   fi
 
-  KUBERNETES_RELEASE=$(cat "${KUBE_ROOT}/version")
-  DOWNLOAD_URL_PREFIX="${KUBERNETES_RELEASE_URL}/${KUBERNETES_RELEASE}"
+  KUBE_VERSION=$(cat "${KUBE_ROOT}/version")
 }
 
 function detect_client_info() {
@@ -153,6 +156,7 @@ function extract_arch_tarball() {
 }
 
 detect_kube_release
+DOWNLOAD_URL_PREFIX="${KUBERNETES_RELEASE_URL}/${KUBE_VERSION}"
 
 SERVER_PLATFORM="linux"
 SERVER_ARCH="${KUBERNETES_SERVER_ARCH:-amd64}"
@@ -161,7 +165,7 @@ SERVER_TAR="kubernetes-server-${SERVER_PLATFORM}-${SERVER_ARCH}.tar.gz"
 detect_client_info
 CLIENT_TAR="kubernetes-client-${CLIENT_PLATFORM}-${CLIENT_ARCH}.tar.gz"
 
-echo "Kubernetes release: ${KUBERNETES_RELEASE}"
+echo "Kubernetes release: ${KUBE_VERSION}"
 echo "Server: ${SERVER_PLATFORM}/${SERVER_ARCH}  (to override, set KUBERNETES_SERVER_ARCH)"
 echo "Client: ${CLIENT_PLATFORM}/${CLIENT_ARCH}  (autodetected)"
 echo