Merge pull request #40 from tomdee/fix-versioning

Fix versioning
projectcalico · Aug 10, 2018 · ea3a32b · ea3a32b
2 parents 8a32a66 + 76ec8a5
commit ea3a32b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -117,7 +117,7 @@ MAKE_SURE_BIN_EXIST := $(shell mkdir -p dist .go-pkg-cache $(NODE_CONTAINER_BIN_
 NODE_CONTAINER_FILES=$(shell find ./filesystem -type f)
 SRCFILES=$(shell find ./pkg -name '*.go')
 LOCAL_USER_ID?=$(shell id -u $$USER)
-LDFLAGS=-ldflags "-X main.VERSION=$(CALICO_GIT_VER)"
+LDFLAGS=-ldflags "-X github.com/projectcalico/node/pkg/startup.VERSION=$(CALICO_GIT_VER)"
 PACKAGE_NAME?=github.com/projectcalico/node
 LIBCALICOGO_PATH?=none
 

diff --git a/cmd/calico-node/main.go b/cmd/calico-node/main.go
@@ -30,9 +30,6 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// Populated by build - used for printing version.
-var VERSION string
-
 // Create a new flag set.
 var flagSet = flag.NewFlagSet("Calico", flag.ContinueOnError)
 
@@ -89,7 +86,7 @@ func main() {
 
 	// Decide which action to take based on the given flags.
 	if *version {
-		fmt.Println(VERSION)
+		fmt.Println(startup.VERSION)
 		os.Exit(0)
 	} else if *runFelix {
 		felix.Run("/etc/calico/felix.cfg")

diff --git a/glide.lock b/glide.lock