-
Notifications
You must be signed in to change notification settings - Fork 321
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for version command (#741)
* Use correct name for binary * Add support for version command - Also refactor the version code out into top-level version pkg to match how the control-plane is factored
- Loading branch information
Showing
7 changed files
with
89 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -124,4 +124,4 @@ Global Options: | |
-kubeconfig=<string> | ||
Path to kubeconfig file. This is aliased as "-c". | ||
``` | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
package version | ||
|
||
import ( | ||
"fmt" | ||
"strings" | ||
) | ||
|
||
var ( | ||
// The git commit that was compiled. These will be filled in by the compiler. | ||
GitCommit string | ||
GitDescribe string | ||
|
||
// The main version number that is being run at the moment. | ||
// | ||
// Version must conform to the format expected by | ||
// github.com/hashicorp/go-version for tests to work. | ||
Version = "0.34.1" | ||
|
||
// A pre-release marker for the version. If this is "" (empty string) | ||
// then it means that it is a final release. Otherwise, this is a pre-release | ||
// such as "dev" (in development), "beta", "rc1", etc. | ||
VersionPrerelease = "dev" | ||
) | ||
|
||
// GetHumanVersion composes the parts of the version in a way that's suitable | ||
// for displaying to humans. | ||
func GetHumanVersion() string { | ||
version := Version | ||
if GitDescribe != "" { | ||
version = GitDescribe | ||
} | ||
|
||
release := VersionPrerelease | ||
if GitDescribe == "" && release == "" { | ||
release = "dev" | ||
} | ||
|
||
if release != "" { | ||
if !strings.HasSuffix(version, "-"+release) { | ||
// if we tagged a prerelease version then the release is in the version already | ||
version += fmt.Sprintf("-%s", release) | ||
} | ||
if GitCommit != "" { | ||
version += fmt.Sprintf(" (%s)", GitCommit) | ||
} | ||
} | ||
|
||
// Strip off any single quotes added by the git information. | ||
return strings.Replace(version, "'", "", -1) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters