Merge pull request #5746 from MartinForReal/master

Fix:ignore azclient tags when fetch git tags

.pipelines/ccm-image.yml

@@ -22,7 +22,7 @@ steps:
       sudo GOPATH="/home/vsts/go" make install
       popd
 
-      export IMAGE_TAG="$(git describe --tags)"
+      export IMAGE_TAG="$(git describe --tags --match "v[0-9].*")"
       kubetest2 aks --build --target ccm --targetPath `pwd`
     displayName: make and push ccm image
     env:

.pipelines/cnm-image.yml

@@ -22,7 +22,7 @@ steps:
       sudo GOPATH="/home/vsts/go" make install
       popd
 
-      export IMAGE_TAG="$(git describe --tags)"
+      export IMAGE_TAG="$(git describe --tags --match "v[0-9].*")"
       kubetest2 aks --build --target cnm --targetPath `pwd`
     displayName: make and push cnm image
     env:

.pipelines/scripts/run-e2e.sh

@@ -83,7 +83,7 @@ fi
 # cloud provider azure. This will remove dependency on cloud-provider-azure repo, and use
 # explicit variables makes the interface more clear.
 if [[ -z "${IMAGE_TAG:-}" ]]; then
-  IMAGE_TAG="$(git describe --tags)"
+  IMAGE_TAG="$(git describe --tags --match "v[0-9].*")"
 fi
 
 if [[ -z "${CLUSTER_CONFIG_PATH:-}" ]]; then

hack/pkg-config.sh

@@ -18,7 +18,7 @@ set -e
 cd $(dirname "${BASH_SOURCE}")/..
 
 if [ "${ENABLE_GIT_COMMAND}" = true ]; then
-  GIT_VERSION=$(git describe --tags --always --abbrev=9 || echo)
+  GIT_VERSION=$(git describe --tags --match "v[0-9].*" --always --abbrev=9 || echo)
   GIT_COMMIT=$(git rev-parse HEAD)
   version_regex="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)-([a-zA-Z0-9-]+)?$"
   [[ "${GIT_VERSION}" =~ ${version_regex} ]] && {

hack/print-workspace-status.sh

@@ -27,7 +27,7 @@ fi
 
 # stolen from k8s.io/hack/lib/version.sh
 # Use git describe to find the version based on tags.
-if GIT_VERSION=$(git describe --tags --abbrev=14 2>/dev/null); then
+if GIT_VERSION=$(git describe --tags --match "v[0-9].*" --abbrev=14 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
@@ -67,7 +67,7 @@ if GIT_VERSION=$(git describe --tags --abbrev=14 2>/dev/null); then
 fi
 
 GIT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2)
-GIT_RELEASE_TAG=$(git describe --abbrev=0 --tags)
+GIT_RELEASE_TAG=$(git describe --match "v[0-9].*" --abbrev=0 --tags)
 GIT_RELEASE_COMMIT=$(git rev-list -n 1  ${GIT_RELEASE_TAG} | head -c 14)
 
 cat <<EOF

kubetest2-aks/Makefile

@@ -17,7 +17,7 @@ REPO_ROOT:=$(shell pwd)
 export REPO_ROOT
 OUT_DIR=$(REPO_ROOT)/bin
 # record the source commit in the binary, overridable
-COMMIT?=$(shell git describe --tags --always --dirty 2>/dev/null)
+COMMIT?=$(shell git describe --tags --match "v[0-9].*" --always --dirty 2>/dev/null)
 INSTALL?=install
 # make install will place binaries here
 INSTALL_DIR?=$(GOPATH)/bin