Merge pull request #205736 from urandom2/controller-tools

This commit is contained in:
Sandro 2022-12-14 21:55:25 +01:00 committed by GitHub
commit 48a5954a8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 0 deletions

View File

@ -11,8 +11,16 @@ buildGoModule rec {
sha256 = "sha256-244o+QZ0BGVe8t8AWf1wU6VHgYyzkATpr5ZTbZezk10=";
};
patches = [ ./version.patch ];
vendorSha256 = "sha256-sVdSKu6TDGIDV2o+kuCvGCItbFe9MwlM2Qjiz8n2rZU=";
ldflags = [
"-s"
"-w"
"-X sigs.k8s.io/controller-tools/pkg/version.version=v${version}"
];
doCheck = false;
subPackages = [

View File

@ -0,0 +1,23 @@
diff --git a/pkg/version/version.go b/pkg/version/version.go
index 09c8efcf..b9ec798a 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -20,14 +20,12 @@ import (
"runtime/debug"
)
+var version string
+
// Version returns the version of the main module
func Version() string {
- info, ok := debug.ReadBuildInfo()
- if !ok || info == nil || info.Main.Version == "" {
- // binary has not been built with module support or doesn't contain a version.
- return "(unknown)"
- }
- return info.Main.Version
+ _ = debug.ReadBuildInfo
+ return version
}
// Print prints the main module version on stdout.