vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

version: fix version handling and kube info

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-10-17 10:44:46 +02:00
parent 04951dcc6e
commit e07ba4b2d1
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
5 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cmd/crio/main.go
View file

@ -14,6 +14,7 @@ import (
"github.com/containers/storage/pkg/reexec"
"github.com/kubernetes-incubator/cri-o/libkpod"
"github.com/kubernetes-incubator/cri-o/server"
"github.com/kubernetes-incubator/cri-o/version"
"github.com/opencontainers/selinux/go-selinux"
"github.com/sirupsen/logrus"
"github.com/soheilhy/cmux"
@ -23,10 +24,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)
// This is populated by the Makefile from the VERSION file
// in the repository
var version = ""
// gitCommit is the commit that the binary is being built from.
// It will be populated by the Makefile.
var gitCommit = ""
@ -182,9 +179,7 @@ func main() {
app := cli.NewApp()
var v []string
if version != "" {
v = append(v, version)
}
v = append(v, version.Version)
if gitCommit != "" {
v = append(v, fmt.Sprintf("commit: %s", gitCommit))
}