From 36b4c0535401dfcda27641380b2f4a5559a8abc9 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Fri, 19 Jan 2018 02:44:09 +0000 Subject: [PATCH] Report containerd version instead of cri-containerd version. Signed-off-by: Lantao Liu --- pkg/server/version.go | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkg/server/version.go b/pkg/server/version.go index 88b8a1387..365c522cc 100644 --- a/pkg/server/version.go +++ b/pkg/server/version.go @@ -17,32 +17,30 @@ limitations under the License. package server import ( + "fmt" + "golang.org/x/net/context" runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" - - "github.com/containerd/cri-containerd/pkg/version" ) const ( - // For now, containerd and runc are bundled with cri-containerd, cri-containerd - // version is more important to us. - // TODO(random-liu): Figure out how to package cri-containerd and containerd, - // and how to version it. We still prefer calling the container runtime "containerd", - // but we care both the cri-containerd version and containerd version. - containerName = "cri-containerd" - containerdAPIVersion = "0.0.0" + containerName = "containerd" // kubeAPIVersion is the api version of kubernetes. + // TODO(random-liu): Change this to actual CRI version. kubeAPIVersion = "0.1.0" ) // Version returns the runtime name, runtime version and runtime API version. -// TODO(random-liu): Return containerd version since we are going to merge 2 daemons. func (c *criContainerdService) Version(ctx context.Context, r *runtime.VersionRequest) (*runtime.VersionResponse, error) { + resp, err := c.client.Version(ctx) + if err != nil { + return nil, fmt.Errorf("failed to get containerd version: %v", err) + } return &runtime.VersionResponse{ Version: kubeAPIVersion, RuntimeName: containerName, - RuntimeVersion: version.CRIContainerdVersion, - // Containerd doesn't have an api version now. - RuntimeApiVersion: containerdAPIVersion, + RuntimeVersion: resp.Version, + // Containerd doesn't have an api version use version instead. + RuntimeApiVersion: resp.Version, }, nil }