Revert "Use protoversion for containerd version"

This reverts commit d2e319523d.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>

containerd/main.go

@@ -9,8 +9,6 @@ import (
 	"syscall"
 	"time"
 
-	"go.pedge.io/proto/version"
-
 	"google.golang.org/grpc"
 
 	"github.com/Sirupsen/logrus"
@@ -80,7 +78,7 @@ var daemonFlags = []cli.Flag{
 func main() {
 	app := cli.NewApp()
 	app.Name = "containerd"
-	app.Version = containerd.Version.VersionString()
+	app.Version = containerd.Version
 	app.Usage = Usage
 	app.Authors = authors
 	app.Flags = daemonFlags
@@ -217,15 +215,6 @@ func daemon(id, address, stateDir string, concurrency int, oom bool) error {
 	}
 	s := grpc.NewServer()
 	types.RegisterAPIServer(s, server.NewServer(sv))
-	protoversion.RegisterAPIServer(
-		s,
-		protoversion.NewAPIServer(
-			containerd.Version,
-			protoversion.APIServerOptions{
-				DisableLogging: true,
-			},
-		),
-	)
 	logrus.Debugf("GRPC API listen on %s", address)
 	return s.Serve(l)
 }

ctr/container.go

@@ -23,10 +23,6 @@ import (
 
 // TODO: parse flags and pass opts
 func getClient(ctx *cli.Context) types.APIClient {
-	return types.NewAPIClient(getClientConn(ctx))
-}
-
-func getClientConn(ctx *cli.Context) *grpc.ClientConn {
 	dialOpts := []grpc.DialOption{grpc.WithInsecure()}
 	dialOpts = append(dialOpts,
 		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
@@ -37,7 +33,7 @@ func getClientConn(ctx *cli.Context) *grpc.ClientConn {
 	if err != nil {
 		fatal(err.Error(), 1)
 	}
-	return conn
+	return types.NewAPIClient(conn)
 }
 
 var ContainersCommand = cli.Command{

ctr/main.go

@@ -14,7 +14,7 @@ const Usage = `High performance container daemon cli`
 func main() {
 	app := cli.NewApp()
 	app.Name = "ctr"
-	app.Version = containerd.Version.VersionString()
+	app.Version = containerd.Version
 	app.Usage = Usage
 	app.Authors = []cli.Author{
 		{
@@ -37,7 +37,6 @@ func main() {
 		CheckpointCommand,
 		ContainersCommand,
 		EventsCommand,
-		VersionCommand,
 	}
 	app.Before = func(context *cli.Context) error {
 		if context.GlobalBool("debug") {

ctr/version.go

@@ -1,22 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"go.pedge.io/proto/version"
-
-	"github.com/codegangsta/cli"
-	"github.com/docker/containerd"
-)
-
-var VersionCommand = cli.Command{
-	Name:  "version",
-	Usage: "get the containerd version",
-	Action: func(context *cli.Context) {
-		serverVersion, err := protoversion.GetServerVersion(getClientConn(context))
-		if err != nil {
-			fatal(err.Error(), 1)
-		}
-		fmt.Printf("Client: %s\nServer: %s\n", containerd.Version.VersionString(), serverVersion.VersionString())
-	},
-}

version.go

@@ -1,9 +1,3 @@
 package containerd
 
-import "go.pedge.io/proto/version"
+const Version = "0.0.4"
-
-var Version = &protoversion.Version{
-	Major: 0,
-	Minor: 0,
-	Micro: 4,
-}