From ae05eed14af347c6a599d8ad7a2869d79e18e1b7 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Tue, 17 Nov 2015 18:13:24 -0800 Subject: [PATCH] add a way to discover git version from a built release --- build/common.sh | 2 ++ cluster/common.sh | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/build/common.sh b/build/common.sh index 33994d4b9d3..38b645d077e 100755 --- a/build/common.sh +++ b/build/common.sh @@ -909,6 +909,8 @@ function kube::release::package_full_tarball() { mkdir -p "${release_stage}/contrib/completions/bash" cp "${KUBE_ROOT}/contrib/completions/bash/kubectl" "${release_stage}/contrib/completions/bash" + echo "${KUBE_GIT_VERSION}" > "${release_stage}/version" + kube::release::clean_cruft local package_name="${RELEASE_DIR}/kubernetes.tar.gz" diff --git a/cluster/common.sh b/cluster/common.sh index abc4d303276..7ed0b876222 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -332,3 +332,24 @@ function find-release-tars() { exit 1 fi } + +# Discover the git version of the current build package +# +# Assumed vars: +# KUBE_ROOT +# Vars set: +# KUBE_GIT_VERSION +function find-release-version() { + KUBE_GIT_VERSION="" + if [[ -f "${KUBE_ROOT}/version" ]]; then + KUBE_GIT_VERSION="$(cat ${KUBE_ROOT}/version)" + fi + if [[ -f "${KUBE_ROOT}/_output/full/kubernetes/version" ]]; then + KUBE_GIT_VERSION="$(cat ${KUBE_ROOT}/_output/full/kubernetes/version)" + fi + + if [[ -z "${KUBE_GIT_VERSION}" ]]; then + echo "!!! Cannot find release version" + exit 1 + fi +}