Merge pull request #240 from yevgeny-shnaidman/yevgeny/code-version

Getting rid of pkg/version
kubernetes-sigs · Jun 10, 2024 · febaa0a · febaa0a
2 parents 0b42db2 + 2dedaae
commit febaa0a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -85,7 +85,7 @@ GOOS=linux
 PACKAGE=sigs.k8s.io/node-feature-discovery-operator
 MAIN_PACKAGE=main.go
 BIN=node-feature-discovery-operator
-LDFLAGS = -ldflags "-s -w -X sigs.k8s.io/node-feature-discovery-operator/pkg/version.version=$(VERSION)"
+LDFLAGS = -ldflags "-s -w -X main.version=$(VERSION)"
 
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 

diff --git a/main.go b/main.go
@@ -40,13 +40,13 @@ import (
 	"sigs.k8s.io/node-feature-discovery-operator/internal/deployment"
 	"sigs.k8s.io/node-feature-discovery-operator/internal/job"
 	"sigs.k8s.io/node-feature-discovery-operator/internal/status"
-	"sigs.k8s.io/node-feature-discovery-operator/pkg/version"
 	// +kubebuilder:scaffold:imports
 )
 
 var (
 	// scheme holds a new scheme for the operator
-	scheme = runtime.NewScheme()
+	scheme  = runtime.NewScheme()
+	version = "undefined"
 )
 
 const (
@@ -92,7 +92,7 @@ func main() {
 	}
 
 	if *printVersion {
-		fmt.Println(ProgramName, version.Get())
+		fmt.Println(ProgramName, version)
 		os.Exit(0)
 	}