Merge pull request #43331 from fejta/release

Automatic merge from submit-queue (batch tested with PRs 43331, 43336) Do not override KUBERNETES_RELEASE if already set /assign @ixdy If the user calls `get-kube.sh` with `KUBERNETES_RELEASE` and `KUBERNETES_RELEASE_URL` already set, continue to use these values.

Merge pull request #43331 from fejta/release
a32757a1 · Kubernetes Submit Queue · GitHub · 7bc86d84 · 106a8ce4 · a32757a1
Commit a32757a1 authored Mar 17, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

get-kube-binaries.sh cluster/get-kube-binaries.sh +7 -3

No files found.
--- 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