🐛bugfix for operator-controller not outputting the right commit ID in the version (#1811)

* bugfix for operator-controller not outputting the right commit ID in version

Signed-off-by: Rashmi Gottipati <[email protected]>

* Address review feedback

Signed-off-by: Rashmi Gottipati <[email protected]>

* leave default as it is`

Signed-off-by: Rashmi Gottipati <[email protected]>

---------

Signed-off-by: Rashmi Gottipati <[email protected]>

Author: rashmigottipati

Makefile

@@ -321,6 +321,7 @@ export GO_BUILD_GCFLAGS := all=-trimpath=$(PWD)
 export GO_BUILD_FLAGS :=
 export GO_BUILD_LDFLAGS := -s -w \
     -X '$(VERSION_PATH).version=$(VERSION)' \
+    -X '$(VERSION_PATH).gitCommit=$(GIT_COMMIT)' \
 
 BINARIES=operator-controller catalogd
 

internal/shared/version/version.go

@@ -29,7 +29,9 @@ func init() {
 	for _, setting := range info.Settings {
 		switch setting.Key {
 		case "vcs.revision":
-			gitCommit = setting.Value
+			if gitCommit == "unknown" {
+				gitCommit = setting.Value
+			}
 		case "vcs.time":
 			commitDate = setting.Value
 		case "vcs.modified":