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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ BIN_DIR=_output/bin
BIN_OSARCH=linux/amd64
IMAGE_PREFIX=volcanosh/vk
TAG = latest
GitSHA=`git rev-parse HEAD`
Date=`date "+%Y-%m-%d %H:%M:%S"`
REPO_PATH=volcano.sh/volcano
LD_FLAGS=" \
-X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
-X '${REPO_PATH}/pkg/version.Built=${Date}' \
-X '${REPO_PATH}/pkg/version.Version=${TAG}'"

.EXPORT_ALL_VARIABLES:

Expand All @@ -17,7 +24,7 @@ cli:
image_bins:
go get github.com/mitchellh/gox
for name in controllers scheduler admission; do\
CGO_ENABLED=0 gox -osarch=${BIN_OSARCH} -output ${BIN_DIR}/${BIN_OSARCH}/vk-$$name ./cmd/$$name; \
CGO_ENABLED=0 gox -osarch=${BIN_OSARCH} -ldflags ${LD_FLAGS} -output ${BIN_DIR}/${BIN_OSARCH}/vk-$$name ./cmd/$$name; \
done

images: image_bins
Expand Down
2 changes: 2 additions & 0 deletions cmd/controllers/app/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type ServerOption struct {
Kubeconfig string
EnableLeaderElection bool
LockObjectNamespace string
PrintVersion bool
}

// NewServerOption creates a new CMServer with a default config.
Expand All @@ -43,6 +44,7 @@ func (s *ServerOption) AddFlags(fs *pflag.FlagSet) {
fs.BoolVar(&s.EnableLeaderElection, "leader-elect", s.EnableLeaderElection, "Start a leader election client and gain leadership before "+
"executing the main loop. Enable this when running replicated kar-scheduler for high availability.")
fs.StringVar(&s.LockObjectNamespace, "lock-object-namespace", s.LockObjectNamespace, "Define the namespace of the lock object.")
fs.BoolVar(&s.PrintVersion, "version", false, "Show version and quit")
Copy link
Member

Choose a reason for hiding this comment

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

also support -v

}

func (s *ServerOption) CheckOptionOrDie() error {
Expand Down
6 changes: 6 additions & 0 deletions cmd/controllers/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"fmt"
"os"
"time"
"volcano.sh/volcano/pkg/version"
Copy link
Member

Choose a reason for hiding this comment

The 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"
Expand All @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions cmd/scheduler/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"fmt"
"os"
"time"
"volcano.sh/volcano/pkg/version"
Copy link
Member

Choose a reason for hiding this comment

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

ditto


"github.com/golang/glog"
"github.com/spf13/pflag"
Expand All @@ -40,6 +41,12 @@ func main() {
s.AddFlags(pflag.CommandLine)

flag.InitFlags()

if s.PrintVersion {
version.PrintVersionAndExit()
os.Exit(0)
Copy link
Contributor

Choose a reason for hiding this comment

The 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)
Expand Down
51 changes: 51 additions & 0 deletions pkg/version/version.go
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()),
Copy link
Member

Choose a reason for hiding this comment

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

will that change in different environment?

Copy link
Collaborator

Choose a reason for hiding this comment

The 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),
}
}