Makefile,version,cmd/operator-sdk/version: add git compile-time variables (#1431)

* Makefile,version,cmd/operator-sdk/version: add compile-time variables for git version and commit

* release.sh: new format for Version in version.go

Author: joelanford

Makefile

@@ -10,6 +10,7 @@ else
 endif
 
 VERSION = $(shell git describe --dirty --tags --always)
+GIT_COMMIT = $(shell git rev-parse HEAD)
 REPO = github.com/operator-framework/operator-sdk
 BUILD_PATH = $(REPO)/cmd/operator-sdk
 PKGS = $(shell go list ./... | grep -v /vendor/)
@@ -42,7 +43,14 @@ clean:
 .PHONY: all test format dep clean
 
 install:
-	$(Q)go install -gcflags "all=-trimpath=${GOPATH}" -asmflags "all=-trimpath=${GOPATH}" $(BUILD_PATH)
+	$(Q)go install \
+		-gcflags "all=-trimpath=${GOPATH}" \
+		-asmflags "all=-trimpath=${GOPATH}" \
+		-ldflags " \
+			-X '${REPO}/version.GitVersion=${VERSION}' \
+			-X '${REPO}/version.GitCommit=${GIT_COMMIT}' \
+		" \
+		$(BUILD_PATH)
 
 release_x86_64 := \
 	build/operator-sdk-$(VERSION)-x86_64-linux-gnu \
@@ -54,7 +62,14 @@ build/operator-sdk-%-x86_64-linux-gnu: GOARGS = GOOS=linux GOARCH=amd64
 build/operator-sdk-%-x86_64-apple-darwin: GOARGS = GOOS=darwin GOARCH=amd64
 
 build/%: $(SOURCES)
-	$(Q)$(GOARGS) go build -gcflags "all=-trimpath=${GOPATH}" -asmflags "all=-trimpath=${GOPATH}" -o $@ $(BUILD_PATH)
+	$(Q)$(GOARGS) go build \
+		-gcflags "all=-trimpath=${GOPATH}" \
+		-asmflags "all=-trimpath=${GOPATH}" \
+		-ldflags " \
+			-X '${REPO}/version.GitVersion=${VERSION}' \
+			-X '${REPO}/version.GitCommit=${GIT_COMMIT}' \
+		" \
+		-o $@ $(BUILD_PATH)
 
 build/%.asc:
 	$(Q){ \

cmd/operator-sdk/version/cmd.go

@@ -27,7 +27,11 @@ func NewCmd() *cobra.Command {
 		Use:   "version",
 		Short: "Prints the version of operator-sdk",
 		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Println("operator-sdk version:", ver.Version)
+			version := ver.GitVersion
+			if version == "unknown" {
+				version = ver.Version
+			}
+			fmt.Printf("operator-sdk version: %s, commit: %s\n", version, ver.GitCommit)
 		},
 	}
 	return versionCmd

release.sh

@@ -31,7 +31,7 @@ fi
 
 # Detect whether versions in code were updated.
 VER_FILE="version/version.go"
-CURR_VER="$(sed -nr 's|Version = "(.+)"|\1|p' "$VER_FILE" | tr -d ' \t\n')"
+CURR_VER="$(sed -nr 's|\s+Version\s+= "(.+)"|\1|p' "$VER_FILE" | tr -d ' \t\n')"
 if [[ "$VER" != "$CURR_VER" ]]; then
 	echo "version is not set correctly in $VER_FILE"
 	exit 1

version/version.go

@@ -15,5 +15,7 @@
 package version
 
 var (
-	Version = "v0.7.0+git"
+	Version    = "v0.7.0+git"
+	GitVersion = "unknown"
+	GitCommit  = "unknown"
 )