diff --git a/Makefile b/Makefile index 1f05d00bd..cc716378f 100644 --- a/Makefile +++ b/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 diff --git a/internal/shared/version/version.go b/internal/shared/version/version.go index ef90dffa0..e61952e91 100644 --- a/internal/shared/version/version.go +++ b/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":