scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 18:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow users to use custom tags

Browse Source 
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.
This commit is contained in:
Hannes Hörl
2019-10-04 12:13:01 +03:00
parent 3c0bc3c5ad
commit 6b1d1ccbf5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/lib/version.sh
View File

@@ -66,7 +66,7 @@ kube::version::get_version_vars() {
fi fi
# Use git describe to find the version based on tags. # 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 # This translates the "git describe" to an actual semver.org
# compatible semantic version that looks something like this: # compatible semantic version that looks something like this:
# v1.1.0-alpha.0.6+84c76d1142ea4d # v1.1.0-alpha.0.6+84c76d1142ea4d