Merge pull request #863 from umohnani8/version

rhatdan · web-flow · commit c56dcf2cb5ec · 2017-09-11T12:10:11.000-04:00
kpod version
diff --git a/KPOD_VERSION b/KPOD_VERSION
@@ -0,0 +1 @@
+0.1
diff --git a/Makefile b/Makefile
@@ -20,6 +20,7 @@ GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMI
 BUILD_INFO := $(shell date +%s)
 
 VERSION := ${shell cat ./VERSION}
+KPOD_VERSION := ${shell cat ./KPOD_VERSION}
 
 # If GOPATH not specified, use one in the local directory
 ifeq ($(GOPATH),)
@@ -32,7 +33,7 @@ GOPKGBASEDIR := $(shell dirname "$(GOPKGDIR)")
 # Update VPATH so make finds .gopathok
 VPATH := $(VPATH):$(GOPATH)
 
-LDFLAGS := -ldflags '-X main.gitCommit=${GIT_COMMIT} -X main.buildInfo=${BUILD_INFO} -X main.version=${VERSION}'
+LDFLAGS := -ldflags '-X main.gitCommit=${GIT_COMMIT} -X main.buildInfo=${BUILD_INFO} -X main.version=${VERSION} -X main.kpodVersion=${KPOD_VERSION}'
 
 all: binaries crio.conf docs
 
diff --git a/cmd/kpod/info.go b/cmd/kpod/info.go
@@ -85,6 +85,8 @@ func debugInfo(c *cli.Context) (string, map[string]interface{}, error) {
 	info := map[string]interface{}{}
 	info["compiler"] = runtime.Compiler
 	info["go version"] = runtime.Version()
+	info["kpod version"] = c.App.Version
+	info["git commit"] = gitCommit
 	return "debug", info, nil
 }
 
diff --git a/cmd/kpod/main.go b/cmd/kpod/main.go
@@ -8,6 +8,10 @@ import (
 	"github.com/urfave/cli"
 )
 
+// This is populated by the Makefile from the VERSION file
+// in the repository
+var kpodVersion = ""
+
 func main() {
 	if reexec.Init() {
 		return
@@ -16,7 +20,12 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "kpod"
 	app.Usage = "manage pods and images"
-	app.Version = "0.0.1"
+
+	var v string
+	if kpodVersion != "" {
+		v = kpodVersion
+	}
+	app.Version = v
 
 	app.Commands = []cli.Command{
 		diffCommand,
diff --git a/cmd/kpod/version.go b/cmd/kpod/version.go
@@ -11,7 +11,11 @@ import (
 
 // Overwritten at build time
 var (
+	// gitCommit is the commit that the binary is being built from.
+	// It will be populated by the Makefile.
 	gitCommit string
+	// buildInfo is the time at which the binary was built
+	// It will be populated by the Makefile.
 	buildInfo string
 )
 

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,8 @@ func debugInfo(c *cli.Context) (string, map[string]interface{}, error) {`
`85`	`85`	`info := map[string]interface{}{}`
`86`	`86`	`info["compiler"] = runtime.Compiler`
`87`	`87`	`info["go version"] = runtime.Version()`
	`88`	`+ info["kpod version"] = c.App.Version`
	`89`	`+ info["git commit"] = gitCommit`
`88`	`90`	`return "debug", info, nil`
`89`	`91`	`}`
`90`	`92`