Merge pull request #1977 from marquiz/devel/fix-version-parsing

Fix version parsing
kubernetes-sigs · Dec 13, 2024 · 1ecb1c7 · 1ecb1c7
2 parents 1416072 + 047d031
commit 1ecb1c7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/cmd/nfd-gc/main.go b/cmd/nfd-gc/main.go
@@ -47,7 +47,7 @@ func main() {
 
 	// Assert that the version is known
 	if version.Undefined() {
-		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.")
+		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always --match 'v*'`\" during build or run.")
 	}
 
 	// Get new garbage collector instance

diff --git a/cmd/nfd-master/main.go b/cmd/nfd-master/main.go
@@ -83,7 +83,7 @@ func main() {
 
 	// Assert that the version is known
 	if version.Undefined() {
-		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.")
+		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always --match 'v*'`\" during build or run.")
 	}
 
 	// Plug klog into grpc logging infrastructure

diff --git a/cmd/nfd-topology-updater/main.go b/cmd/nfd-topology-updater/main.go
@@ -49,7 +49,7 @@ func main() {
 
 	// Assert that the version is known
 	if version.Undefined() {
-		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.")
+		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always --match 'v*'`\" during build or run.")
 	}
 
 	// Plug klog into grpc logging infrastructure

diff --git a/cmd/nfd-worker/main.go b/cmd/nfd-worker/main.go
@@ -56,7 +56,7 @@ func main() {
 
 	// Assert that the version is known
 	if version.Undefined() {
-		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.")
+		klog.InfoS("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always --match 'v*'`\" during build or run.")
 	}
 
 	// Plug klog into grpc logging infrastructure

diff --git a/scripts/github/update-gh-pages.sh b/scripts/github/update-gh-pages.sh
@@ -111,7 +111,7 @@ if [ "$site_subdir" != "master" ]; then
             ;;
         *)
             echo "Not a released version. Parsed release branch is $site_subdir but based on tag $_base_tag. Stopping here."
-            echo "SHA `git describe` (`git rev-parse HEAD`)"
+            echo "SHA `git describe` (`git rev-parse --match 'v*' HEAD`)"
             exit 0
             ;;
     esac
@@ -130,7 +130,7 @@ make site-build
 if [ -n "$_GIT_TAG" ]; then
     commit_hash=${GIT_TAG:10}
 else
-    commit_hash=`git describe --tags --dirty --always`
+    commit_hash=`git describe --tags --dirty --always --match "v*"`
 fi
 
 # Sync OWNERS file from master branch

diff --git a/scripts/test-infra/test-e2e-presubmit.sh b/scripts/test-infra/test-e2e-presubmit.sh
@@ -7,7 +7,7 @@ export KIND_NODE_IMAGE="kindest/node:v1.30.2"
 export CLUSTER_NAME="nfd-e2e"
 export KUBECONFIG="/tmp/kubeconfig_$CLUSTER_NAME"
 export IMAGE_REPO="registry.local/node-feature-discovery"
-export IMAGE_TAG_NAME=$(git describe --tags --dirty --always)
+export IMAGE_TAG_NAME=$(git describe --tags --dirty --always --match "v*")
 
 # Install kind
 go install sigs.k8s.io/kind@$KIND_VERSION