Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd.

Signed-off-by: Lantao Liu <lantaol@google.com>

pkg/server/container_attach.go

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

pkg/server/container_create.go

@@ -45,10 +45,10 @@ import (
 	"golang.org/x/sys/unix"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	customopts "github.com/kubernetes-incubator/cri-containerd/pkg/containerd/opts"
-	cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io"
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
-	"github.com/kubernetes-incubator/cri-containerd/pkg/util"
+	customopts "github.com/containerd/cri-containerd/pkg/containerd/opts"
+	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"
 )
 
 const (
@@ -68,7 +68,7 @@ const (
 
 func init() {
 	typeurl.Register(&containerstore.Metadata{},
-		"github.com/kubernetes-incubator/cri-containerd/pkg/store/container", "Metadata")
+		"github.com/containerd/cri-containerd/pkg/store/container", "Metadata")
 }
 
 // CreateContainer creates a new container in the given PodSandbox.

pkg/server/container_create_test.go

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

pkg/server/container_execsync.go

@@ -31,9 +31,9 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil"
-	cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io"
-	"github.com/kubernetes-incubator/cri-containerd/pkg/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"
 )
 
 // ExecSync executes a command in the container, and returns the stdout output.

pkg/server/container_list.go

@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri-containerd/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"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
+	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
 )
 
 func TestToCRIContainer(t *testing.T) {

pkg/server/container_remove.go

@@ -26,8 +26,8 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	"github.com/kubernetes-incubator/cri-containerd/pkg/store"
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
+	"github.com/containerd/cri-containerd/pkg/store"
+	containerstore "github.com/containerd/cri-containerd/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/kubernetes-incubator/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
 )
 
 // TestSetContainerRemoving tests setContainerRemoving sets removing

pkg/server/container_start.go

@@ -27,8 +27,8 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io"
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
+	cio "github.com/containerd/cri-containerd/pkg/server/io"
+	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
 )
 
 // StartContainer starts the container.

pkg/server/container_stats_list.go

@@ -26,7 +26,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri-containerd/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"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri-containerd/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"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
+	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
 )
 
 func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status,

pkg/server/container_stop.go

@@ -28,8 +28,8 @@ import (
 	"golang.org/x/sys/unix"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	"github.com/kubernetes-incubator/cri-containerd/pkg/store"
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
+	"github.com/containerd/cri-containerd/pkg/store"
+	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
 )
 
 const (

pkg/server/container_stop_test.go

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

pkg/server/container_update_resources.go

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

pkg/server/events.go

@@ -25,7 +25,7 @@ import (
 	"github.com/golang/glog"
 	"golang.org/x/net/context"
 
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
+	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
 )
 
 // eventMonitor monitors containerd event and updates internal state correspondingly.

pkg/server/helpers.go

@@ -40,9 +40,9 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	"github.com/kubernetes-incubator/cri-containerd/pkg/store"
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
-	"github.com/kubernetes-incubator/cri-containerd/pkg/util"
+	"github.com/containerd/cri-containerd/pkg/store"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
+	"github.com/containerd/cri-containerd/pkg/util"
 )
 
 const (

pkg/server/helpers_test.go

@@ -22,7 +22,7 @@ import (
 	imagedigest "github.com/opencontainers/go-digest"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/kubernetes-incubator/cri-containerd/pkg/util"
+	"github.com/containerd/cri-containerd/pkg/util"
 )
 
 // TestGetUserFromImage tests the logic of getting image uid or user name of image user.

pkg/server/image_list.go

@@ -20,7 +20,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
 )
 
 // ListImages lists existing images.

pkg/server/image_list_test.go

@@ -25,7 +25,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
 )
 
 func TestListImages(t *testing.T) {

pkg/server/image_load.go

@@ -24,9 +24,9 @@ import (
 
 	"github.com/golang/glog"
 
-	api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1"
-	"github.com/kubernetes-incubator/cri-containerd/pkg/containerd/importer"
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
+	api "github.com/containerd/cri-containerd/pkg/api/v1"
+	"github.com/containerd/cri-containerd/pkg/containerd/importer"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
 )
 
 // LoadImage loads a image into containerd.

pkg/server/image_pull.go

@@ -31,8 +31,8 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
-	"github.com/kubernetes-incubator/cri-containerd/pkg/util"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
+	"github.com/containerd/cri-containerd/pkg/util"
 )
 
 // For image management:

pkg/server/image_status.go

@@ -24,7 +24,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
 	imagespec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 

pkg/server/image_status_test.go

@@ -25,7 +25,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
 )
 
 func TestImageStatus(t *testing.T) {

pkg/server/imagefs_info_test.go

@@ -25,7 +25,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot"
+	snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot"
 )
 
 func TestImageFsInfo(t *testing.T) {

pkg/server/instrumented_service.go

@@ -21,7 +21,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1"
+	api "github.com/containerd/cri-containerd/pkg/api/v1"
 )
 
 // instrumentedService wraps service and logs each operation.

pkg/server/io/container_io.go

@@ -26,8 +26,8 @@ import (
 	"github.com/containerd/containerd/cio"
 	"github.com/golang/glog"
 
-	cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil"
-	"github.com/kubernetes-incubator/cri-containerd/pkg/util"
+	cioutil "github.com/containerd/cri-containerd/pkg/ioutil"
+	"github.com/containerd/cri-containerd/pkg/util"
 )
 
 // streamKey generates a key for the stream.

pkg/server/io/exec_io.go

@@ -24,7 +24,7 @@ import (
 	"github.com/containerd/containerd/cio"
 	"github.com/golang/glog"
 
-	cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil"
+	cioutil "github.com/containerd/cri-containerd/pkg/ioutil"
 )
 
 // ExecIO holds the exec io.

pkg/server/io/logger.go

@@ -28,7 +28,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil"
+	cioutil "github.com/containerd/cri-containerd/pkg/ioutil"
 )
 
 const (

pkg/server/io/logger_test.go

@@ -27,7 +27,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil"
+	cioutil "github.com/containerd/cri-containerd/pkg/ioutil"
 )
 
 func TestRedirectLogs(t *testing.T) {

pkg/server/restart.go

@@ -35,10 +35,10 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io"
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
+	cio "github.com/containerd/cri-containerd/pkg/server/io"
+	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
 )
 
 // NOTE: The recovery logic has following assumption: when cri-containerd is down:

pkg/server/sandbox_list.go

@@ -26,7 +26,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
 )
 
 // ListPodSandbox returns a list of Sandbox.

pkg/server/sandbox_list_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
 )
 
 func TestToCRISandbox(t *testing.T) {

pkg/server/sandbox_remove.go

@@ -26,7 +26,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	"github.com/kubernetes-incubator/cri-containerd/pkg/store"
+	"github.com/containerd/cri-containerd/pkg/store"
 )
 
 // RemovePodSandbox removes the sandbox. If there are running containers in the

pkg/server/sandbox_run.go

@@ -34,14 +34,14 @@ import (
 	"golang.org/x/sys/unix"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	customopts "github.com/kubernetes-incubator/cri-containerd/pkg/containerd/opts"
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
-	"github.com/kubernetes-incubator/cri-containerd/pkg/util"
+	customopts "github.com/containerd/cri-containerd/pkg/containerd/opts"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
+	"github.com/containerd/cri-containerd/pkg/util"
 )
 
 func init() {
 	typeurl.Register(&sandboxstore.Metadata{},
-		"github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox", "Metadata")
+		"github.com/containerd/cri-containerd/pkg/store/sandbox", "Metadata")
 }
 
 // RunPodSandbox creates and starts a pod-level sandbox. Runtimes should ensure
@@ -123,7 +123,7 @@ func (c *criContainerdService) RunPodSandbox(ctx context.Context, r *runtime.Run
 		if err != nil {
 			return nil, fmt.Errorf("failed to get network status for sandbox %q: %v", id, err)
 		}
-		// Certain VM based solutions like clear containers (Issue kubernetes-incubator/cri-containerd#524)
+		// Certain VM based solutions like clear containers (Issue containerd/cri-containerd#524)
 		//  rely on the assumption that CRI shim will not be querying the network namespace to check the
 		// network states such as IP.
 		// In furture runtime implementation should avoid relying on CRI shim implementation details.

pkg/server/sandbox_run_test.go

@@ -28,8 +28,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing"
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
+	ostesting "github.com/containerd/cri-containerd/pkg/os/testing"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
 )
 
 func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) {

pkg/server/sandbox_status.go

@@ -28,7 +28,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
 )
 
 // PodSandboxStatus returns the status of the PodSandbox.

pkg/server/sandbox_status_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
 )
 
 func TestPodSandboxStatus(t *testing.T) {

pkg/server/service.go

@@ -37,14 +37,14 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 	"k8s.io/kubernetes/pkg/kubelet/server/streaming"
 
-	"github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options"
-	api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1"
-	osinterface "github.com/kubernetes-incubator/cri-containerd/pkg/os"
-	"github.com/kubernetes-incubator/cri-containerd/pkg/registrar"
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
-	snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot"
+	"github.com/containerd/cri-containerd/cmd/cri-containerd/options"
+	api "github.com/containerd/cri-containerd/pkg/api/v1"
+	osinterface "github.com/containerd/cri-containerd/pkg/os"
+	"github.com/containerd/cri-containerd/pkg/registrar"
+	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
+	snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot"
 )
 
 const (

pkg/server/service_test.go

@@ -17,14 +17,14 @@ limitations under the License.
 package server
 
 import (
-	"github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options"
-	ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing"
-	"github.com/kubernetes-incubator/cri-containerd/pkg/registrar"
-	servertesting "github.com/kubernetes-incubator/cri-containerd/pkg/server/testing"
-	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
-	imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image"
-	sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox"
-	snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot"
+	"github.com/containerd/cri-containerd/cmd/cri-containerd/options"
+	ostesting "github.com/containerd/cri-containerd/pkg/os/testing"
+	"github.com/containerd/cri-containerd/pkg/registrar"
+	servertesting "github.com/containerd/cri-containerd/pkg/server/testing"
+	containerstore "github.com/containerd/cri-containerd/pkg/store/container"
+	imagestore "github.com/containerd/cri-containerd/pkg/store/image"
+	sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
+	snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot"
 )
 
 const (

pkg/server/snapshots.go

@@ -25,7 +25,7 @@ import (
 	snapshot "github.com/containerd/containerd/snapshots"
 	"github.com/golang/glog"
 
-	snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot"
+	snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot"
 )
 
 // snapshotsSyncer syncs snapshot stats periodically. imagefs info and container stats

pkg/server/version.go

@@ -20,7 +20,7 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
-	"github.com/kubernetes-incubator/cri-containerd/pkg/version"
+	"github.com/containerd/cri-containerd/pkg/version"
 )
 
 const (