From aa13c64c773e12e9acfafc2c71ad5d89c1183b24 Mon Sep 17 00:00:00 2001 From: Rashmi Gottipati Date: Tue, 25 Feb 2025 15:47:54 -0500 Subject: [PATCH 1/3] bugfix for operator-controller not outputting the right commit ID in version Signed-off-by: Rashmi Gottipati --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 1f05d00bd..e31fd53ec 100644 --- a/Makefile +++ b/Makefile @@ -308,6 +308,8 @@ VERSION := $(shell git describe --tags --always --dirty) endif export VERSION +GIT_COMMIT := $(if $(SOURCE_GIT_COMMIT),$(SOURCE_GIT_COMMIT),$(shell git rev-parse HEAD)) + ifeq ($(origin CGO_ENABLED), undefined) CGO_ENABLED := 0 endif @@ -321,6 +323,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 From ad27502e1a07610310dd89a379d25fe342794e13 Mon Sep 17 00:00:00 2001 From: Rashmi Gottipati Date: Mon, 3 Mar 2025 14:10:06 -0500 Subject: [PATCH 2/3] Address review feedback Signed-off-by: Rashmi Gottipati --- Makefile | 4 +--- internal/shared/version/version.go | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e31fd53ec..cc716378f 100644 --- a/Makefile +++ b/Makefile @@ -308,8 +308,6 @@ VERSION := $(shell git describe --tags --always --dirty) endif export VERSION -GIT_COMMIT := $(if $(SOURCE_GIT_COMMIT),$(SOURCE_GIT_COMMIT),$(shell git rev-parse HEAD)) - ifeq ($(origin CGO_ENABLED), undefined) CGO_ENABLED := 0 endif @@ -323,7 +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)" \ + -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..4d370df88 100644 --- a/internal/shared/version/version.go +++ b/internal/shared/version/version.go @@ -6,7 +6,7 @@ import ( ) var ( - gitCommit = "unknown" + gitCommit = "" commitDate = "unknown" repoState = "unknown" version = "unknown" @@ -29,7 +29,9 @@ func init() { for _, setting := range info.Settings { switch setting.Key { case "vcs.revision": - gitCommit = setting.Value + if gitCommit == "" { + gitCommit = setting.Value + } case "vcs.time": commitDate = setting.Value case "vcs.modified": From fcebcb7232e522e8b9c5b2c950b21e5d007e2b4c Mon Sep 17 00:00:00 2001 From: Rashmi Gottipati Date: Tue, 4 Mar 2025 12:13:12 -0500 Subject: [PATCH 3/3] leave default as it is` Signed-off-by: Rashmi Gottipati --- internal/shared/version/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/shared/version/version.go b/internal/shared/version/version.go index 4d370df88..e61952e91 100644 --- a/internal/shared/version/version.go +++ b/internal/shared/version/version.go @@ -6,7 +6,7 @@ import ( ) var ( - gitCommit = "" + gitCommit = "unknown" commitDate = "unknown" repoState = "unknown" version = "unknown" @@ -29,7 +29,7 @@ func init() { for _, setting := range info.Settings { switch setting.Key { case "vcs.revision": - if gitCommit == "" { + if gitCommit == "unknown" { gitCommit = setting.Value } case "vcs.time":