diff --git a/Makefile b/Makefile index f7c051de..91e9bf4c 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,16 @@ CURDIR=$(shell pwd) -VERSION=$(shell git describe --tags --dirty --always) + +ifeq (,$(shell which govvv)) +$(shell go install github.com/ahmetb/govvv@latest) +endif + +PKG := $(shell go list ./version) +GIT_INFO := $(shell govvv -flags -pkg $(PKG)) .PHONY: build build: cd $(CURDIR) go mod tidy CGO_ENABLED=0 go build \ - -ldflags "-w -s -X github.com/kubearmor/kubearmor-client/version.version=${VERSION}" \ + -ldflags "-w -s ${GIT_INFO}" \ -o karmor \ No newline at end of file diff --git a/version/version.go b/version/version.go index deb4faf4..8be30746 100644 --- a/version/version.go +++ b/version/version.go @@ -12,10 +12,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -var version string +var GitSummary string +var BuildDate string func PrintVersion(c *k8s.Client) error { - fmt.Printf("karmor version %s %s/%s\n", version, runtime.GOOS, runtime.GOARCH) + fmt.Printf("karmor version %s %s/%s BuildDate=%s\n", GitSummary, runtime.GOOS, runtime.GOARCH, BuildDate) kubearmorVersion, err := getKubeArmorVersion(c) if err != nil { return nil