-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
Support PrintVersion for scheduler&controller binaries #85
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,7 @@ import ( | |
"fmt" | ||
"os" | ||
"time" | ||
"volcano.sh/volcano/pkg/version" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. close to other vk pkg. |
||
|
||
"github.com/golang/glog" | ||
"github.com/spf13/pflag" | ||
|
@@ -37,6 +38,11 @@ func main() { | |
s.AddFlags(pflag.CommandLine) | ||
|
||
flag.InitFlags() | ||
|
||
if s.PrintVersion { | ||
version.PrintVersionAndExit() | ||
os.Exit(0) | ||
} | ||
if err := s.CheckOptionOrDie(); err != nil { | ||
fmt.Fprintf(os.Stderr, "%v\n", err) | ||
os.Exit(1) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,7 @@ import ( | |
"fmt" | ||
"os" | ||
"time" | ||
"volcano.sh/volcano/pkg/version" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto |
||
|
||
"github.com/golang/glog" | ||
"github.com/spf13/pflag" | ||
|
@@ -40,6 +41,12 @@ func main() { | |
s.AddFlags(pflag.CommandLine) | ||
|
||
flag.InitFlags() | ||
|
||
if s.PrintVersion { | ||
version.PrintVersionAndExit() | ||
os.Exit(0) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this line should be removed |
||
} | ||
|
||
if err := s.CheckOptionOrDie(); err != nil { | ||
fmt.Fprintf(os.Stderr, "%v\n", err) | ||
os.Exit(1) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
/* | ||
Copyright 2019 The Volcano Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package version | ||
|
||
import ( | ||
"fmt" | ||
"os" | ||
"runtime" | ||
) | ||
|
||
var ( | ||
// Version shows the version of volcano. | ||
Version = "Not provided." | ||
// GitSHA shows the git commit id of volcano. | ||
GitSHA = "Not provided." | ||
// Built shows the built time of the binary. | ||
Built = "Not provided." | ||
) | ||
|
||
// PrintVersionAndExit prints versions from the array returned by Info() and exit | ||
func PrintVersionAndExit() { | ||
for _, i := range Info() { | ||
fmt.Printf("%v\n", i) | ||
} | ||
os.Exit(0) | ||
} | ||
|
||
// Info returns an array of various service versions | ||
func Info() []string { | ||
return []string{ | ||
fmt.Sprintf("Version: %s", Version), | ||
fmt.Sprintf("Git SHA: %s", GitSHA), | ||
fmt.Sprintf("Built At: %s", Built), | ||
fmt.Sprintf("Go Version: %s", runtime.Version()), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. will that change in different environment? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. no, golang lib is compiled in |
||
fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH), | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also support
-v