move links for cri-containerd to cri

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

Makefile

@@ -16,12 +16,12 @@ GO := go
 GOOS := $(shell $(GO) env GOOS)
 GOARCH := $(shell $(GO) env GOARCH)
 EPOCH_TEST_COMMIT := f9e02affccd51702191e5312665a16045ffef8ab
-PROJECT := github.com/containerd/cri-containerd
+PROJECT := github.com/containerd/cri
 BINDIR := ${DESTDIR}/usr/local/bin
 BUILD_DIR := _output
 # 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
-# cri-containerd.
+# cri plugin.
 VERSION := $(shell git describe --tags --dirty --always)
 # strip the first char of the tag if it's a `v`
 VERSION := $(VERSION:v%=%)
@@ -50,17 +50,17 @@ help:
 	@echo " * 'install-containerd'	- Install customized containerd to system location"
 	@echo " * 'release'          	- Build release tarball"
 	@echo " * 'push'             	- Push release tarball to GCS"
-	@echo " * 'test'             	- Test cri-containerd with unit test"
-	@echo " * 'test-integration' 	- Test cri-containerd with integration test"
-	@echo " * 'test-cri'         	- Test cri-containerd with cri validation test"
-	@echo " * 'test-e2e-node'    	- Test cri-containerd with Kubernetes node e2e test"
+	@echo " * 'test'             	- Test cri with unit test"
+	@echo " * 'test-integration' 	- Test cri with integration test"
+	@echo " * 'test-cri'         	- Test cri with cri validation test"
+	@echo " * 'test-e2e-node'    	- Test cri with Kubernetes node e2e test"
 	@echo " * 'clean'            	- Clean artifacts"
 	@echo " * 'verify'           	- Execute the source code verification tools"
-	@echo " * 'proto'            	- Update protobuf of cri-containerd api"
+	@echo " * 'proto'            	- Update protobuf of the cri plugin api"
 	@echo " * 'install.tools'    	- Install tools used by verify"
-	@echo " * 'install.deps'     	- Install dependencies of cri-containerd (containerd, runc, cni) Note: BUILDTAGS defaults to 'seccomp apparmor' for runc build"
+	@echo " * 'install.deps'     	- Install dependencies of cri (Note: BUILDTAGS defaults to 'seccomp apparmor' for runc build")
 	@echo " * 'uninstall'        	- Remove installed binaries from system locations"
-	@echo " * 'version'          	- Print current cri-containerd release version"
+	@echo " * 'version'          	- Print current cri plugin release version"
 	@echo " * 'update-vendor'    	- Syncs containerd/vendor.conf -> vendor.conf and sorts vendor.conf"
 
 verify: lint gofmt boiler

cmd/containerd/containerd.go

@@ -37,7 +37,7 @@ import (
 	_ "github.com/containerd/containerd/services/tasks"
 	_ "github.com/containerd/containerd/services/version"
 	_ "github.com/containerd/containerd/snapshots/overlay"
-	_ "github.com/containerd/cri-containerd"
+	_ "github.com/containerd/cri"
 
 	"github.com/containerd/containerd/cmd/containerd/command"
 	"github.com/sirupsen/logrus"

cmd/ctrcri/ctrcri.go

@@ -24,16 +24,16 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/containerd/cri-containerd/pkg/version"
+	"github.com/containerd/cri/pkg/version"
 )
 
 const (
 	// Add \u200B to avoid the space trimming.
-	desc = "\u200B" + `        __                 _ 
+	desc = "\u200B" + `        __                 _
   _____/ /________________(_)
- / ___/ __/ ___/ ___/ ___/ / 
-/ /__/ /_/ /  / /__/ /  / /  
-\___/\__/_/   \___/_/  /_/   
+ / ___/ __/ ___/ ___/ ___/ /
+/ /__/ /_/ /  / /__/ /  / /
+\___/\__/_/   \___/_/  /_/
 
 containerd CRI plugin CLI
 `

cmd/ctrcri/load.go

@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
-	api "github.com/containerd/cri-containerd/pkg/api/v1"
-	"github.com/containerd/cri-containerd/pkg/client"
+	api "github.com/containerd/cri/pkg/api/v1"
+	"github.com/containerd/cri/pkg/client"
 )
 
 func dedent(s string) string {

cri.go

@@ -37,9 +37,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	criconfig "github.com/containerd/cri-containerd/pkg/config"
-	"github.com/containerd/cri-containerd/pkg/constants"
-	"github.com/containerd/cri-containerd/pkg/server"
+	criconfig "github.com/containerd/cri/pkg/config"
+	"github.com/containerd/cri/pkg/constants"
+	"github.com/containerd/cri/pkg/server"
 )
 
 // TODO(random-liu): Use github.com/pkg/errors for our errors.

hack/install-deps.sh

@@ -62,7 +62,7 @@ RUNC_PKG=github.com/opencontainers/runc
 CNI_PKG=github.com/containernetworking/plugins
 CONTAINERD_PKG=github.com/containerd/containerd
 CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools
-CRI_CONTAINERD_PKG=github.com/containerd/cri-containerd
+CRI_CONTAINERD_PKG=github.com/containerd/cri
 
 # Create a temporary GOPATH for make install.deps.
 TMPGOPATH=$(mktemp -d /tmp/cri-containerd-install-deps.XXXX)

integration/image_load_test.go

@@ -27,7 +27,7 @@ import (
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	api "github.com/containerd/cri-containerd/pkg/api/v1"
+	api "github.com/containerd/cri/pkg/api/v1"
 )
 
 // Test to load an image from tarball.
@@ -50,14 +50,14 @@ func TestImageLoad(t *testing.T) {
 	output, err = exec.Command("docker", "save", testImage, "-o", tar).CombinedOutput()
 	require.NoError(t, err, "output: %q", output)
 
-	t.Logf("make sure no such image in cri-containerd")
+	t.Logf("make sure no such image in cri")
 	img, err := imageService.ImageStatus(&runtime.ImageSpec{Image: testImage})
 	require.NoError(t, err)
 	if img != nil {
 		require.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: testImage}))
 	}
 
-	t.Logf("load image in cri-containerd")
+	t.Logf("load image in cri")
 	res, err := criContainerdClient.LoadImage(context.Background(), &api.LoadImageRequest{FilePath: tar})
 	require.NoError(t, err)
 	require.Equal(t, []string{loadedImage}, res.GetImages())

integration/test_utils.go

@@ -31,10 +31,10 @@ import (
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 	"k8s.io/kubernetes/pkg/kubelet/remote"
 
-	api "github.com/containerd/cri-containerd/pkg/api/v1"
-	"github.com/containerd/cri-containerd/pkg/client"
-	"github.com/containerd/cri-containerd/pkg/constants"
-	"github.com/containerd/cri-containerd/pkg/util"
+	api "github.com/containerd/cri/pkg/api/v1"
+	"github.com/containerd/cri/pkg/client"
+	"github.com/containerd/cri/pkg/constants"
+	"github.com/containerd/cri/pkg/util"
 )
 
 const (

integration/truncindex_test.go

@@ -48,7 +48,7 @@ func TestTruncIndex(t *testing.T) {
 	// if you add n images at least two will share the same leading digit.
 	// "sha256:n" where n is the a number from 0-9 where two images have the same trunc,
 	// for example sha256:9
-	// https://github.com/containerd/cri-containerd/pull/352
+	// https://github.com/containerd/cri/pull/352
 	// I am thinking how I get the two image which have same trunc.
 
 	// TODO(yanxuean): add test case for ListImages

pkg/client/client.go

@@ -23,7 +23,7 @@ import (
 	"google.golang.org/grpc"
 	"k8s.io/kubernetes/pkg/kubelet/util"
 
-	api "github.com/containerd/cri-containerd/pkg/api/v1"
+	api "github.com/containerd/cri/pkg/api/v1"
 )
 
 // NewCRIContainerdClient creates grpc client of cri-containerd

pkg/containerd/importer/importer.go

@@ -36,8 +36,8 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 
-	ctrdutil "github.com/containerd/cri-containerd/pkg/containerd/util"
-	"github.com/containerd/cri-containerd/pkg/util"
+	ctrdutil "github.com/containerd/cri/pkg/containerd/util"
+	"github.com/containerd/cri/pkg/util"
 )
 
 // This code reuses the docker import code from containerd/containerd#1602.

pkg/containerd/util/util.go

@@ -22,7 +22,7 @@ import (
 	"github.com/containerd/containerd/namespaces"
 	"golang.org/x/net/context"
 
-	"github.com/containerd/cri-containerd/pkg/constants"
+	"github.com/containerd/cri/pkg/constants"
 )
 
 // deferCleanupTimeout is the default timeout for containerd cleanup operations

pkg/os/testing/fake_os.go

@@ -24,7 +24,7 @@ import (
 	containerdmount "github.com/containerd/containerd/mount"
 	"golang.org/x/net/context"
 
-	osInterface "github.com/containerd/cri-containerd/pkg/os"
+	osInterface "github.com/containerd/cri/pkg/os"
 )
 
 // CalledDetail is the struct contains called function name and arguments.

pkg/server/container_attach.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	cio "github.com/containerd/cri-containerd/pkg/server/io"
+	cio "github.com/containerd/cri/pkg/server/io"
 )
 
 // Attach prepares a streaming endpoint to attach to a running container, and returns the address.

pkg/server/container_create.go

@@ -44,12 +44,12 @@ import (
 	"golang.org/x/sys/unix"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	"github.com/containerd/cri-containerd/pkg/annotations"
-	customopts "github.com/containerd/cri-containerd/pkg/containerd/opts"
-	ctrdutil "github.com/containerd/cri-containerd/pkg/containerd/util"
-	cio "github.com/containerd/cri-containerd/pkg/server/io"
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
-	"github.com/containerd/cri-containerd/pkg/util"
+	"github.com/containerd/cri/pkg/annotations"
+	customopts "github.com/containerd/cri/pkg/containerd/opts"
+	ctrdutil "github.com/containerd/cri/pkg/containerd/util"
+	cio "github.com/containerd/cri/pkg/server/io"
+	containerstore "github.com/containerd/cri/pkg/store/container"
+	"github.com/containerd/cri/pkg/util"
 )
 
 const (
@@ -69,7 +69,7 @@ const (
 
 func init() {
 	typeurl.Register(&containerstore.Metadata{},
-		"github.com/containerd/cri-containerd/pkg/store/container", "Metadata")
+		"github.com/containerd/cri/pkg/store/container", "Metadata")
 }
 
 // CreateContainer creates a new container in the given PodSandbox.

pkg/server/container_create_test.go

@@ -32,9 +32,9 @@ import (
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	"github.com/containerd/cri-containerd/pkg/annotations"
-	ostesting "github.com/containerd/cri-containerd/pkg/os/testing"
-	"github.com/containerd/cri-containerd/pkg/util"
+	"github.com/containerd/cri/pkg/annotations"
+	ostesting "github.com/containerd/cri/pkg/os/testing"
+	"github.com/containerd/cri/pkg/util"
 )
 
 func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string,

pkg/server/container_execsync.go

@@ -31,10 +31,10 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	ctrdutil "github.com/containerd/cri-containerd/pkg/containerd/util"
-	cioutil "github.com/containerd/cri-containerd/pkg/ioutil"
-	cio "github.com/containerd/cri-containerd/pkg/server/io"
-	"github.com/containerd/cri-containerd/pkg/util"
+	ctrdutil "github.com/containerd/cri/pkg/containerd/util"
+	cioutil "github.com/containerd/cri/pkg/ioutil"
+	cio "github.com/containerd/cri/pkg/server/io"
+	"github.com/containerd/cri/pkg/util"
 )
 
 // ExecSync executes a command in the container, and returns the stdout output.

pkg/server/container_list.go

@@ -21,7 +21,7 @@ import (
 
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri/pkg/store/container"
 )
 
 // ListContainers lists all containers matching the filter.

pkg/server/container_list_test.go

@@ -25,8 +25,8 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
-	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
+	containerstore "github.com/containerd/cri/pkg/store/container"
+	sandboxstore "github.com/containerd/cri/pkg/store/sandbox"
 )
 
 func TestToCRIContainer(t *testing.T) {

pkg/server/container_log_reopen.go

@@ -23,7 +23,7 @@ import (
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 
-// ReopenContainerLog asks cri-containerd to reopen the stdout/stderr log file for the container.
+// ReopenContainerLog asks the cri plugin to reopen the stdout/stderr log file for the container.
 // This is often called after the log file has been rotated.
 func (c *criContainerdService) ReopenContainerLog(ctx context.Context, r *runtime.ReopenContainerLogRequest) (*runtime.ReopenContainerLogResponse, error) {
 	container, err := c.containerStore.Get(r.GetContainerId())

pkg/server/container_remove.go

@@ -26,9 +26,9 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	"github.com/containerd/cri-containerd/pkg/log"
-	"github.com/containerd/cri-containerd/pkg/store"
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	"github.com/containerd/cri/pkg/log"
+	"github.com/containerd/cri/pkg/store"
+	containerstore "github.com/containerd/cri/pkg/store/container"
 )
 
 // RemoveContainer removes the container.

pkg/server/container_remove_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri/pkg/store/container"
 )
 
 // TestSetContainerRemoving tests setContainerRemoving sets removing

pkg/server/container_start.go

@@ -28,10 +28,10 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	ctrdutil "github.com/containerd/cri-containerd/pkg/containerd/util"
-	cio "github.com/containerd/cri-containerd/pkg/server/io"
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
-	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
+	ctrdutil "github.com/containerd/cri/pkg/containerd/util"
+	cio "github.com/containerd/cri/pkg/server/io"
+	containerstore "github.com/containerd/cri/pkg/store/container"
+	sandboxstore "github.com/containerd/cri/pkg/store/sandbox"
 )
 
 // StartContainer starts the container.

pkg/server/container_stats_list.go

@@ -26,7 +26,7 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri/pkg/store/container"
 )
 
 // ListContainerStats returns stats of all running containers.

pkg/server/container_status.go

@@ -25,7 +25,7 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri/pkg/store/container"
 )
 
 // ContainerStatus inspects the container and returns the status.

pkg/server/container_status_test.go

@@ -24,8 +24,8 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
-	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
+	containerstore "github.com/containerd/cri/pkg/store/container"
+	imagestore "github.com/containerd/cri/pkg/store/image"
 )
 
 func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status,

pkg/server/container_stop.go

@@ -28,7 +28,7 @@ import (
 	"golang.org/x/sys/unix"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri/pkg/store/container"
 )
 
 // killContainerTimeout is the timeout that we wait for the container to

pkg/server/container_stop_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri/pkg/store/container"
 )
 
 func TestWaitContainerStop(t *testing.T) {

pkg/server/container_update_resources.go

@@ -29,9 +29,9 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
-	ctrdutil "github.com/containerd/cri-containerd/pkg/containerd/util"
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
-	"github.com/containerd/cri-containerd/pkg/util"
+	ctrdutil "github.com/containerd/cri/pkg/containerd/util"
+	containerstore "github.com/containerd/cri/pkg/store/container"
+	"github.com/containerd/cri/pkg/util"
 )
 
 // UpdateContainerResources updates ContainerConfig of the container.

pkg/server/events.go

@@ -27,10 +27,10 @@ import (
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 
-	ctrdutil "github.com/containerd/cri-containerd/pkg/containerd/util"
-	"github.com/containerd/cri-containerd/pkg/store"
-	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
-	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
+	ctrdutil "github.com/containerd/cri/pkg/containerd/util"
+	"github.com/containerd/cri/pkg/store"
+	containerstore "github.com/containerd/cri/pkg/store/container"
+	sandboxstore "github.com/containerd/cri/pkg/store/sandbox"
 )
 
 // eventMonitor monitors containerd event and updates internal state correspondingly.