move links for cri-containerd to cri

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

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