build tooling: Allow custom tags to exist

Otherwise other tags confuse the version script. Equivalent to kubernetes/kubernetes#83497
kubernetes-retired · Dec 16, 2020 · edcf198 · edcf198
1 parent 52d817d
commit edcf198
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/version.sh b/version.sh
@@ -65,7 +65,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