Merge pull request #61068 from ixdy/git-export-subst-tag-fix

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Exclude commas when pulling the tag out of the git export-subst format string **What this PR does / why we need it**: the version tag is not guaranteed to be the last item in the ref names substituted into the format string, so we need to be sure not to match on the trailing comma. For example, v1.9.3 was exported with `HEAD -> release-1.9, tag: v1.9.3, origin/release-1.9`, where we only want to match `v1.9.3`, not `v1.9.3,`. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #61029, though we need to backport this to all active branches. **Release note**: ```release-note NONE ``` /assign @david-mcmahon /priority important-soon

Merge pull request #61068 from ixdy/git-export-subst-tag-fix
a7d6340a · Kubernetes Submit Queue · GitHub · 6571be13 · 77134533 · a7d6340a
Unverified Commit a7d6340a authored Mar 12, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

version.sh hack/lib/version.sh +1 -1

No files found.
--- a/hack/lib/version.sh
+++ b/hack/lib/version.sh
@@ -45,7 +45,7 @@ kube::version::get_version_vars() {
    # 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
+    if [[ '$Format:%D$' =~ tag:\ (v[^ ,]+) ]]; then
     KUBE_GIT_VERSION="${BASH_REMATCH[1]}"
    fi
  fi