Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −2
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0fb04e
bugfix for operator-controller not outputting the right commit ID in …
rashmigottipati Feb 25, 2025
6217d52
Address review feedback
rashmigottipati Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,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

Expand Down
6 changes: 4 additions & 2 deletions internal/shared/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
)

var (
gitCommit = "unknown"
gitCommit = ""
commitDate = "unknown"
repoState = "unknown"
version = "unknown"
Expand All @@ -29,7 +29,9 @@ func init() {
for _, setting := range info.Settings {
switch setting.Key {
case "vcs.revision":
gitCommit = setting.Value
if gitCommit == "" {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't this be a check against "unknown", and leave the default value as-is?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i.e. is there a need to change the default?

gitCommit = setting.Value
}
case "vcs.time":
commitDate = setting.Value
case "vcs.modified":
Expand Down
Loading