github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 21:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Capture git export-subst strings in version.sh for 'git archive' use.

Browse Source 
Eliminate the need to update pkg/version/base.go on release branch tagging.
This commit is contained in:
David McMahon
2017-11-08 15:37:49 -08:00
parent e5acc48295
commit 9a9d11bb75
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hack/lib/version.sh
View File

@@ -36,6 +36,19 @@ kube::version::get_version_vars() {
return
fi
# If the kubernetes source was exported through git archive, then
# we likely don't have a git tree, but these magic values may be filled in.
if [[ '$Format:%%$' == "%" ]]; then
KUBE_GIT_COMMIT='$Format:%H$'
KUBE_GIT_TREE_STATE="git archive"
# When a 'git archive' is exported, the '$Format:%D$' below will look
# something like 'HEAD -> release-1.8, tag: v1.8.3' where then 'tag: '
# can be extracted from it.
if [[ '$Format:%D$' =~ tag:\ (v[^ ]+) ]]; then
KUBE_GIT_VERSION="${BASH_REMATCH[1]}"
fi
fi
local git=(git --work-tree "${KUBE_ROOT}")
if [[ -n ${KUBE_GIT_COMMIT-} ]] || KUBE_GIT_COMMIT=$("${git[@]}" rev-parse "HEAD^{commit}" 2>/dev/null); then