diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 0a42999c3f..08aa462cc0 100644 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -471,31 +471,6 @@ function ensure-temp-dir { fi } -# Verify and find the various tar files that we are going to use on the server. -# -# Vars set: -# SERVER_BINARY_TAR -# SALT_TAR -function find-release-tars { - SERVER_BINARY_TAR="${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - SERVER_BINARY_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz" - fi - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - echo "!!! Cannot find kubernetes-server-linux-amd64.tar.gz" - exit 1 - fi - - SALT_TAR="${KUBE_ROOT}/server/kubernetes-salt.tar.gz" - if [[ ! -f "$SALT_TAR" ]]; then - SALT_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-salt.tar.gz" - fi - if [[ ! -f "$SALT_TAR" ]]; then - echo "!!! Cannot find kubernetes-salt.tar.gz" - exit 1 - fi -} - # Take the local tar files and upload them to S3. They will then be # downloaded by the master as part of the start up script for the master. # diff --git a/cluster/azure/util.sh b/cluster/azure/util.sh index 23fe542c20..1a75d6be8b 100644 --- a/cluster/azure/util.sh +++ b/cluster/azure/util.sh @@ -94,32 +94,6 @@ function ensure-temp-dir { fi } -# Verify and find the various tar files that we are going to use on the server. -# -# Vars set: -# SERVER_BINARY_TAR -# SALT_TAR -function find-release-tars { - SERVER_BINARY_TAR="${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - SERVER_BINARY_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz" - fi - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - echo "!!! Cannot find kubernetes-server-linux-amd64.tar.gz" - exit 1 - fi - - SALT_TAR="${KUBE_ROOT}/server/kubernetes-salt.tar.gz" - if [[ ! -f "$SALT_TAR" ]]; then - SALT_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-salt.tar.gz" - fi - if [[ ! -f "$SALT_TAR" ]]; then - echo "!!! Cannot find kubernetes-salt.tar.gz" - exit 1 - fi -} - - # Take the local tar files and upload them to Azure Storage. They will then be # downloaded by the master as part of the start up script for the master. # diff --git a/cluster/common.sh b/cluster/common.sh index 1d55439088..f16b23a2be 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -304,3 +304,29 @@ function tars_from_version() { fi } +# Verify and find the various tar files that we are going to use on the server. +# +# Assumed vars: +# KUBE_ROOT +# Vars set: +# SERVER_BINARY_TAR +# SALT_TAR +function find-release-tars() { + SERVER_BINARY_TAR="${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" + if [[ ! -f "$SERVER_BINARY_TAR" ]]; then + SERVER_BINARY_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz" + fi + if [[ ! -f "$SERVER_BINARY_TAR" ]]; then + echo "!!! Cannot find kubernetes-server-linux-amd64.tar.gz" >&2 + exit 1 + fi + + SALT_TAR="${KUBE_ROOT}/server/kubernetes-salt.tar.gz" + if [[ ! -f "$SALT_TAR" ]]; then + SALT_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-salt.tar.gz" + fi + if [[ ! -f "$SALT_TAR" ]]; then + echo "!!! Cannot find kubernetes-salt.tar.gz" >&2 + exit 1 + fi +} diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 23c0f1791f..9871678920 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -115,31 +115,6 @@ function ensure-temp-dir { fi } -# Verify and find the various tar files that we are going to use on the server. -# -# Vars set: -# SERVER_BINARY_TAR -# SALT_TAR -function find-release-tars { - SERVER_BINARY_TAR="${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - SERVER_BINARY_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz" - fi - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - echo "!!! Cannot find kubernetes-server-linux-amd64.tar.gz" >&2 - exit 1 - fi - - SALT_TAR="${KUBE_ROOT}/server/kubernetes-salt.tar.gz" - if [[ ! -f "$SALT_TAR" ]]; then - SALT_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-salt.tar.gz" - fi - if [[ ! -f "$SALT_TAR" ]]; then - echo "!!! Cannot find kubernetes-salt.tar.gz" >&2 - exit 1 - fi -} - # Use the gcloud defaults to find the project. If it is already set in the # environment then go with that. # diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh index fc567584e5..d9fee14902 100644 --- a/cluster/libvirt-coreos/util.sh +++ b/cluster/libvirt-coreos/util.sh @@ -250,17 +250,6 @@ function kube-down { destroy-network } -function find-release-tars { - SERVER_BINARY_TAR="${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - SERVER_BINARY_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz" - fi - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - echo "!!! Cannot find kubernetes-server-linux-amd64.tar.gz" - exit 1 - fi -} - # The kubernetes binaries are pushed to a host directory which is exposed to the VM function upload-server-tars { tar -x -C "$POOL_PATH/kubernetes" -f "$SERVER_BINARY_TAR" kubernetes diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh index b249fcbf69..53f37b696f 100755 --- a/cluster/rackspace/util.sh +++ b/cluster/rackspace/util.sh @@ -66,19 +66,6 @@ rax-ssh-key() { fi } -find-release-tars() { - SERVER_BINARY_TAR="${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" - RELEASE_DIR="${KUBE_ROOT}/server/" - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - SERVER_BINARY_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz" - RELEASE_DIR="${KUBE_ROOT}/_output/release-tars/" - fi - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - echo "!!! Cannot find kubernetes-server-linux-amd64.tar.gz" - exit 1 - fi -} - rackspace-set-vars() { CLOUDFILES_CONTAINER="kubernetes-releases-${OS_USERNAME}" @@ -114,7 +101,7 @@ ensure_dev_container() { copy_dev_tarballs() { echo "cluster/rackspace/util.sh: Uploading to Cloud Files" - ${SWIFTLY_CMD} put -i ${RELEASE_DIR}/kubernetes-server-linux-amd64.tar.gz \ + ${SWIFTLY_CMD} put -i ${SERVER_BINARY_TAR} \ ${CLOUDFILES_CONTAINER}/${CONTAINER_PREFIX}/kubernetes-server-linux-amd64.tar.gz > /dev/null 2>&1 echo "Release pushed." diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh index 5d3ebc56f2..e2ed4ca84b 100755 --- a/cluster/vsphere/util.sh +++ b/cluster/vsphere/util.sh @@ -126,31 +126,6 @@ function ensure-temp-dir { fi } -# Verify and find the various tar files that we are going to use on the server. -# -# Vars set: -# SERVER_BINARY_TAR -# SALT_TAR -function find-release-tars { - SERVER_BINARY_TAR="${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - SERVER_BINARY_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz" - fi - if [[ ! -f "$SERVER_BINARY_TAR" ]]; then - echo "!!! Cannot find kubernetes-server-linux-amd64.tar.gz" - exit 1 - fi - - SALT_TAR="${KUBE_ROOT}/server/kubernetes-salt.tar.gz" - if [[ ! -f "$SALT_TAR" ]]; then - SALT_TAR="${KUBE_ROOT}/_output/release-tars/kubernetes-salt.tar.gz" - fi - if [[ ! -f "$SALT_TAR" ]]; then - echo "!!! Cannot find kubernetes-salt.tar.gz" - exit 1 - fi -} - # Take the local tar files and upload them to the master. # # Assumed vars: