From 6b1d1ccbf5a6ff19e48915bdc8932d03ecd46c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20H=C3=B6rl?= Date: Fri, 4 Oct 2019 12:13:01 +0300 Subject: [PATCH] Allow users to use custom tags When discovering the kube version we only consider tags that match the glob 'v*'. By doing so users can create/use their custom tags as long as they don't look like a version (starting with a 'v'). We already do a similar thing when building the pause container, see how the `REV` is set in git.k8s.io/kubernetes/build/pause/Makefile. --- hack/lib/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/lib/version.sh b/hack/lib/version.sh index 0a3342378c4..4dec8dadb4f 100644 --- a/hack/lib/version.sh +++ b/hack/lib/version.sh @@ -66,7 +66,7 @@ kube::version::get_version_vars() { fi # Use git describe to find the version based on tags. - if [[ -n ${KUBE_GIT_VERSION-} ]] || KUBE_GIT_VERSION=$("${git[@]}" describe --tags --abbrev=14 "${KUBE_GIT_COMMIT}^{commit}" 2>/dev/null); then + if [[ -n ${KUBE_GIT_VERSION-} ]] || KUBE_GIT_VERSION=$("${git[@]}" describe --tags --match='v*' --abbrev=14 "${KUBE_GIT_COMMIT}^{commit}" 2>/dev/null); then # This translates the "git describe" to an actual semver.org # compatible semantic version that looks something like this: # v1.1.0-alpha.0.6+84c76d1142ea4d