github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #334 from Random-Liu/change-versioning

Browse Source 
Change `Version` to return cri-containerd version instead.
This commit is contained in:
Lantao Liu 2017-10-08 20:28:39 -07:00 committed by GitHub
commit 9135ef2c07
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -18,14 +18,14 @@ PROJECT := github.com/kubernetes-incubator/cri-containerd
BINDIR := ${DESTDIR}/usr/local/bin BINDIR := ${DESTDIR}/usr/local/bin
BUILD_DIR := _output BUILD_DIR := _output
# VERSION is derived from the current tag for HEAD plus amends. Version is used # VERSION is derived from the current tag for HEAD plus amends. Version is used
# to set/overide the criContainerdVersion variable in the verison package for # to set/overide the CRIContainerdVersion variable in the verison package for
# cri-containerd. # cri-containerd.
VERSION := $(shell git describe --tags --dirty) VERSION := $(shell git describe --tags --dirty)
# strip the first char of the tag if it's a `v` # strip the first char of the tag if it's a `v`
VERSION := $(VERSION:v%=%) VERSION := $(VERSION:v%=%)
TARBALL := cri-containerd-$(VERSION).tar.gz TARBALL := cri-containerd-$(VERSION).tar.gz
BUILD_TAGS := seccomp apparmor BUILD_TAGS := seccomp apparmor
GO_LDFLAGS := -X $(PROJECT)/pkg/version.criContainerdVersion=$(VERSION) GO_LDFLAGS := -X $(PROJECT)/pkg/version.CRIContainerdVersion=$(VERSION)
SOURCES := $(shell find cmd/ pkg/ vendor/ -name '*.go') SOURCES := $(shell find cmd/ pkg/ vendor/ -name '*.go')
INTEGRATION_SOURCES := $(shell find integration/ -name '*.go') INTEGRATION_SOURCES := $(shell find integration/ -name '*.go')

17
pkg/server/version.go
View File

@ -17,14 +17,19 @@ limitations under the License.
package server package server
import ( import (
"fmt"
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"github.com/kubernetes-incubator/cri-containerd/pkg/version"
) )
const ( const (
containerName = "containerd" // 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" containerdAPIVersion = "0.0.0"
// kubeAPIVersion is the api version of kubernetes. // kubeAPIVersion is the api version of kubernetes.
kubeAPIVersion = "0.1.0" kubeAPIVersion = "0.1.0"
@ -32,14 +37,10 @@ const (
// Version returns the runtime name, runtime version and runtime API version. // Version returns the runtime name, runtime version and runtime API version.
func (c *criContainerdService) Version(ctx context.Context, r *runtime.VersionRequest) (*runtime.VersionResponse, error) { 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{ return &runtime.VersionResponse{
Version: kubeAPIVersion, Version: kubeAPIVersion,
RuntimeName: containerName, RuntimeName: containerName,
RuntimeVersion: resp.Version, RuntimeVersion: version.CRIContainerdVersion,
// Containerd doesn't have an api version now. // Containerd doesn't have an api version now.
RuntimeApiVersion: containerdAPIVersion, RuntimeApiVersion: containerdAPIVersion,
}, nil }, nil

7
pkg/version/version.go
View File

@ -22,7 +22,8 @@ import (
"github.com/blang/semver" "github.com/blang/semver"
) )
var criContainerdVersion = "UNKNOWN" // CRIContainerdVersion is the version of the cri-containerd.
var CRIContainerdVersion = "UNKNOWN"
func validateSemver(sv string) error { func validateSemver(sv string) error {
_, err := semver.Parse(sv) _, err := semver.Parse(sv)
@ -34,9 +35,9 @@ func validateSemver(sv string) error {
// PrintVersion outputs the release version of cri-containerd // PrintVersion outputs the release version of cri-containerd
func PrintVersion() { func PrintVersion() {
err := validateSemver(criContainerdVersion) err := validateSemver(CRIContainerdVersion)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
} }
fmt.Println(criContainerdVersion) fmt.Println(CRIContainerdVersion)
} }

2
pkg/version/version_test.go
View File

@ -28,6 +28,6 @@ func TestValidateSemver(t *testing.T) {
assert.NotNil(err) assert.NotNil(err)
err = validateSemver("0.0.0-1-gdf6a1cc-dirty") err = validateSemver("0.0.0-1-gdf6a1cc-dirty")
assert.Nil(err) assert.Nil(err)
err = validateSemver(criContainerdVersion) err = validateSemver(CRIContainerdVersion)
assert.Nil(err) assert.Nil(err)
} }