Skip to content

Commit febaa0a

Browse files
authored
Merge pull request #240 from yevgeny-shnaidman/yevgeny/code-version
Getting rid of pkg/version
2 parents 0b42db2 + 2dedaae commit febaa0a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ GOOS=linux
8585
PACKAGE=sigs.k8s.io/node-feature-discovery-operator
8686
MAIN_PACKAGE=main.go
8787
BIN=node-feature-discovery-operator
88-
LDFLAGS = -ldflags "-s -w -X sigs.k8s.io/node-feature-discovery-operator/pkg/version.version=$(VERSION)"
88+
LDFLAGS = -ldflags "-s -w -X main.version=$(VERSION)"
8989

9090
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
9191

main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ import (
4040
"sigs.k8s.io/node-feature-discovery-operator/internal/deployment"
4141
"sigs.k8s.io/node-feature-discovery-operator/internal/job"
4242
"sigs.k8s.io/node-feature-discovery-operator/internal/status"
43-
"sigs.k8s.io/node-feature-discovery-operator/pkg/version"
4443
// +kubebuilder:scaffold:imports
4544
)
4645

4746
var (
4847
// scheme holds a new scheme for the operator
49-
scheme = runtime.NewScheme()
48+
scheme = runtime.NewScheme()
49+
version = "undefined"
5050
)
5151

5252
const (
@@ -92,7 +92,7 @@ func main() {
9292
}
9393

9494
if *printVersion {
95-
fmt.Println(ProgramName, version.Get())
95+
fmt.Println(ProgramName, version)
9696
os.Exit(0)
9797
}
9898

0 commit comments

Comments
 (0)