From a5940da62c3468411168b71e69faaedeb721fb34 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Mon, 5 Aug 2019 11:23:23 -0700 Subject: [PATCH] Remove `ctr cri load` and update cri-tools to v1.15.0 Signed-off-by: Lantao Liu --- cmd/ctr/builtins_cri_linux.go | 25 ------------------------- script/setup/install-critools | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 cmd/ctr/builtins_cri_linux.go diff --git a/cmd/ctr/builtins_cri_linux.go b/cmd/ctr/builtins_cri_linux.go deleted file mode 100644 index 384dcefb9..000000000 --- a/cmd/ctr/builtins_cri_linux.go +++ /dev/null @@ -1,25 +0,0 @@ -// +build !no_cri - -/* - Copyright The containerd 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 main - -import "github.com/containerd/cri/cli" - -func init() { - pluginCmds = append(pluginCmds, cli.Command) -} diff --git a/script/setup/install-critools b/script/setup/install-critools index e260c36e4..08fa0e952 100755 --- a/script/setup/install-critools +++ b/script/setup/install-critools @@ -21,7 +21,7 @@ set -eu -o pipefail go get -u github.com/onsi/ginkgo/ginkgo -CRITEST_COMMIT=v1.13.0 +CRITEST_COMMIT=v1.15.0 go get -d github.com/kubernetes-incubator/cri-tools/... cd $GOPATH/src/github.com/kubernetes-incubator/cri-tools git checkout $CRITEST_COMMIT