Merge pull request #4607 from dmcgowan/cleanup-cri-packages

Move cri server packages under pkg/cri

integration/main_test.go

@@ -41,9 +41,9 @@ import (
 
 	"github.com/containerd/containerd/integration/remote"
 	dialer "github.com/containerd/containerd/integration/util"
-	criconfig "github.com/containerd/containerd/pkg/config"
 	"github.com/containerd/containerd/pkg/constants"
-	"github.com/containerd/containerd/pkg/server"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
+	"github.com/containerd/containerd/pkg/cri/server"
 	"github.com/containerd/containerd/pkg/util"
 )
 

pkg/cri/cri.go

@@ -39,10 +39,10 @@ import (
 	"github.com/sirupsen/logrus"
 	"k8s.io/klog/v2"
 
-	criconfig "github.com/containerd/containerd/pkg/config"
 	"github.com/containerd/containerd/pkg/constants"
 	criplatforms "github.com/containerd/containerd/pkg/containerd/platforms"
-	"github.com/containerd/containerd/pkg/server"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
+	"github.com/containerd/containerd/pkg/cri/server"
 )
 
 // TODO(random-liu): Use github.com/pkg/errors for our errors.

pkg/cri/server/container_attach.go

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

pkg/cri/server/container_create.go

@@ -35,14 +35,14 @@ import (
 
 	customopts "github.com/containerd/containerd/pkg/containerd/opts"
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
-	cio "github.com/containerd/containerd/pkg/server/io"
+	cio "github.com/containerd/containerd/pkg/cri/io"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	"github.com/containerd/containerd/pkg/util"
 )
 
 func init() {
 	typeurl.Register(&containerstore.Metadata{},
-		"github.com/containerd/containerd/pkg/store/container", "Metadata")
+		"github.com/containerd/cri/pkg/store/container", "Metadata")
 }
 
 // CreateContainer creates a new container in the given PodSandbox.

pkg/cri/server/container_create_linux.go

@@ -35,8 +35,8 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	"github.com/containerd/containerd/pkg/annotations"
-	"github.com/containerd/containerd/pkg/config"
 	customopts "github.com/containerd/containerd/pkg/containerd/opts"
+	"github.com/containerd/containerd/pkg/cri/config"
 )
 
 const (

pkg/cri/server/container_create_linux_test.go

@@ -41,9 +41,9 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	"github.com/containerd/containerd/pkg/annotations"
-	"github.com/containerd/containerd/pkg/config"
 	"github.com/containerd/containerd/pkg/containerd/opts"
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
+	"github.com/containerd/containerd/pkg/cri/config"
 	ostesting "github.com/containerd/containerd/pkg/os/testing"
 	"github.com/containerd/containerd/pkg/util"
 )

pkg/cri/server/container_create_other.go

@@ -24,7 +24,7 @@ import (
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/config"
+	"github.com/containerd/containerd/pkg/cri/config"
 )
 
 // containerMounts sets up necessary container system file mounts

pkg/cri/server/container_create_test.go

@@ -28,9 +28,9 @@ import (
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/config"
 	"github.com/containerd/containerd/pkg/constants"
 	"github.com/containerd/containerd/pkg/containerd/opts"
+	"github.com/containerd/containerd/pkg/cri/config"
 )
 
 func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string,

pkg/cri/server/container_create_windows.go

@@ -25,8 +25,8 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	"github.com/containerd/containerd/pkg/annotations"
-	"github.com/containerd/containerd/pkg/config"
 	customopts "github.com/containerd/containerd/pkg/containerd/opts"
+	"github.com/containerd/containerd/pkg/cri/config"
 )
 
 // No container mounts for windows.

pkg/cri/server/container_create_windows_test.go

@@ -27,7 +27,7 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	"github.com/containerd/containerd/pkg/annotations"
-	"github.com/containerd/containerd/pkg/config"
+	"github.com/containerd/containerd/pkg/cri/config"
 )
 
 func getCreateContainerTestData() (*runtime.ContainerConfig, *runtime.PodSandboxConfig,

pkg/cri/server/container_execsync.go

@@ -33,8 +33,8 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
+	cio "github.com/containerd/containerd/pkg/cri/io"
 	cioutil "github.com/containerd/containerd/pkg/ioutil"
-	cio "github.com/containerd/containerd/pkg/server/io"
 	"github.com/containerd/containerd/pkg/util"
 )
 

pkg/cri/server/container_list.go

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

pkg/cri/server/container_list_test.go

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

pkg/cri/server/container_remove.go

@@ -25,8 +25,8 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/store"
+	"github.com/containerd/containerd/pkg/cri/store"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 )
 
 // RemoveContainer removes the container.

pkg/cri/server/container_remove_test.go

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

pkg/cri/server/container_start.go

@@ -32,10 +32,10 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
+	cio "github.com/containerd/containerd/pkg/cri/io"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 	cioutil "github.com/containerd/containerd/pkg/ioutil"
-	cio "github.com/containerd/containerd/pkg/server/io"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
 )
 
 // StartContainer starts the container.

pkg/cri/server/container_start_test.go

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

pkg/cri/server/container_stats_list.go

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

pkg/cri/server/container_stats_list_linux.go

@@ -17,8 +17,6 @@
 package server
 
 import (
-	"fmt"
-
 	"github.com/containerd/containerd/api/types"
 	v1 "github.com/containerd/containerd/metrics/types/v1"
 	v2 "github.com/containerd/containerd/metrics/types/v2"
@@ -26,7 +24,7 @@ import (
 	"github.com/pkg/errors"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 )
 
 func (c *criService) containerMetrics(
@@ -94,7 +92,7 @@ func (c *criService) containerMetrics(
 				}
 			}
 		default:
-			return &cs, errors.New(fmt.Sprintf("unxpected metrics type: %v", metrics))
+			return &cs, errors.Errorf("unxpected metrics type: %v", metrics)
 		}
 	}
 

pkg/cri/server/container_stats_list_other.go

@@ -24,7 +24,7 @@ import (
 	"github.com/pkg/errors"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 )
 
 func (c *criService) containerMetrics(

pkg/cri/server/container_stats_list_windows.go

@@ -25,7 +25,7 @@ import (
 	"github.com/pkg/errors"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 )
 
 func (c *criService) containerMetrics(

pkg/cri/server/container_status.go

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

pkg/cri/server/container_status_test.go

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

pkg/cri/server/container_stop.go

@@ -29,8 +29,8 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
-	"github.com/containerd/containerd/pkg/store"
+	"github.com/containerd/containerd/pkg/cri/store"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 )
 
 // StopContainer stops a running container with a grace period (i.e., timeout).

pkg/cri/server/container_stop_test.go

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

pkg/cri/server/container_update_resources_linux.go

@@ -31,7 +31,7 @@ import (
 
 	"github.com/containerd/containerd/pkg/containerd/opts"
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	"github.com/containerd/containerd/pkg/util"
 )
 

pkg/cri/server/container_update_resources_other.go

@@ -23,7 +23,7 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 )
 
 // UpdateContainerResources updates ContainerConfig of the container.

pkg/cri/server/events.go

@@ -34,9 +34,9 @@ import (
 
 	"github.com/containerd/containerd/pkg/constants"
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
-	"github.com/containerd/containerd/pkg/store"
+	"github.com/containerd/containerd/pkg/cri/store"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 )
 
 const (

pkg/cri/server/helpers.go

@@ -37,12 +37,12 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	runtimeoptions "github.com/containerd/containerd/pkg/api/runtimeoptions/v1"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	criconfig "github.com/containerd/containerd/pkg/config"
+	runtimeoptions "github.com/containerd/containerd/pkg/cri/runtimeoptions/v1"
-	"github.com/containerd/containerd/pkg/store"
+	"github.com/containerd/containerd/pkg/cri/store"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
-	imagestore "github.com/containerd/containerd/pkg/store/image"
+	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 )
 
 const (

pkg/cri/server/helpers_test.go

@@ -32,9 +32,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	criconfig "github.com/containerd/containerd/pkg/config"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	"github.com/containerd/containerd/pkg/store"
+	"github.com/containerd/containerd/pkg/cri/store"
-	imagestore "github.com/containerd/containerd/pkg/store/image"
+	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
 )
 
 // TestGetUserFromImage tests the logic of getting image uid or user name of image user.

pkg/cri/server/image_list_test.go

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

pkg/cri/server/image_pull.go

@@ -42,7 +42,7 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	criconfig "github.com/containerd/containerd/pkg/config"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
 )
 
 // For image management:

pkg/cri/server/image_pull_test.go

@@ -28,7 +28,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	criconfig "github.com/containerd/containerd/pkg/config"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
 )
 
 func TestParseAuth(t *testing.T) {

pkg/cri/server/image_remove.go

@@ -23,7 +23,7 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/store"
+	"github.com/containerd/containerd/pkg/cri/store"
 )
 
 // RemoveImage removes the image.

pkg/cri/server/image_status.go

@@ -25,8 +25,8 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/store"
+	"github.com/containerd/containerd/pkg/cri/store"
-	imagestore "github.com/containerd/containerd/pkg/store/image"
+	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
 )
 
 // ImageStatus returns the status of the image, returns nil if the image isn't present.

pkg/cri/server/image_status_test.go

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

pkg/cri/server/imagefs_info_test.go

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

pkg/cri/server/restart.go

@@ -35,10 +35,10 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
+	cio "github.com/containerd/containerd/pkg/cri/io"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 	"github.com/containerd/containerd/pkg/netns"
-	cio "github.com/containerd/containerd/pkg/server/io"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
 )
 
 // NOTE: The recovery logic has following assumption: when the cri plugin is down:

pkg/cri/server/sandbox_list.go

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

pkg/cri/server/sandbox_list_test.go

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

pkg/cri/server/sandbox_portforward.go

@@ -21,7 +21,7 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 )
 
 // PortForward prepares a streaming endpoint to forward ports from a PodSandbox, and returns the address.

pkg/cri/server/sandbox_portforward_windows.go

@@ -27,8 +27,8 @@ import (
 	"golang.org/x/net/context"
 	"k8s.io/utils/exec"
 
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 	"github.com/containerd/containerd/pkg/ioutil"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
 )
 
 func (c *criService) portForward(ctx context.Context, id string, port int32, stream io.ReadWriter) error {

pkg/cri/server/sandbox_remove.go

@@ -25,8 +25,8 @@ import (
 	"golang.org/x/net/context"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/store"
+	"github.com/containerd/containerd/pkg/cri/store"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 )
 
 // RemovePodSandbox removes the sandbox. If there are running containers in the

pkg/cri/server/sandbox_run.go

@@ -37,19 +37,19 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	"github.com/containerd/containerd/pkg/annotations"
-	criconfig "github.com/containerd/containerd/pkg/config"
 	customopts "github.com/containerd/containerd/pkg/containerd/opts"
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
+	"github.com/containerd/containerd/pkg/cri/server/bandwidth"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 	"github.com/containerd/containerd/pkg/netns"
-	"github.com/containerd/containerd/pkg/server/bandwidth"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
 	"github.com/containerd/containerd/pkg/util"
 	selinux "github.com/opencontainers/selinux/go-selinux"
 )
 
 func init() {
 	typeurl.Register(&sandboxstore.Metadata{},
-		"github.com/containerd/containerd/pkg/store/sandbox", "Metadata")
+		"github.com/containerd/cri/pkg/store/sandbox", "Metadata")
 }
 
 // RunPodSandbox creates and starts a pod-level sandbox. Runtimes should ensure

pkg/cri/server/sandbox_run_test.go

@@ -28,8 +28,8 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	"github.com/containerd/containerd/pkg/annotations"
-	criconfig "github.com/containerd/containerd/pkg/config"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 )
 
 func TestSandboxContainerSpec(t *testing.T) {

pkg/cri/server/sandbox_status.go

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

pkg/cri/server/sandbox_status_test.go

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

pkg/cri/server/sandbox_stop.go

@@ -28,7 +28,7 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 )
 
 // StopPodSandbox stops the sandbox. If there are any running containers in the

pkg/cri/server/sandbox_stop_test.go

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

pkg/cri/server/service.go

@@ -35,17 +35,17 @@ import (
 	"google.golang.org/grpc"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/store/label"
+	"github.com/containerd/containerd/pkg/cri/store/label"
 
 	"github.com/containerd/containerd/pkg/atomic"
-	criconfig "github.com/containerd/containerd/pkg/config"
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
+	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
+	snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot"
 	osinterface "github.com/containerd/containerd/pkg/os"
 	"github.com/containerd/containerd/pkg/registrar"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
-	imagestore "github.com/containerd/containerd/pkg/store/image"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
-	snapshotstore "github.com/containerd/containerd/pkg/store/snapshot"
 )
 
 // grpcServices are all the grpc services provided by cri containerd.

pkg/cri/server/service_test.go

@@ -26,15 +26,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	criconfig "github.com/containerd/containerd/pkg/config"
+	criconfig "github.com/containerd/containerd/pkg/cri/config"
+	servertesting "github.com/containerd/containerd/pkg/cri/server/testing"
+	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
+	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
+	"github.com/containerd/containerd/pkg/cri/store/label"
+	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
+	snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot"
 	ostesting "github.com/containerd/containerd/pkg/os/testing"
 	"github.com/containerd/containerd/pkg/registrar"
-	servertesting "github.com/containerd/containerd/pkg/server/testing"
-	containerstore "github.com/containerd/containerd/pkg/store/container"
-	imagestore "github.com/containerd/containerd/pkg/store/image"
-	"github.com/containerd/containerd/pkg/store/label"
-	sandboxstore "github.com/containerd/containerd/pkg/store/sandbox"
-	snapshotstore "github.com/containerd/containerd/pkg/store/snapshot"
 )
 
 const (

pkg/cri/server/snapshots.go

@@ -26,7 +26,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
-	snapshotstore "github.com/containerd/containerd/pkg/store/snapshot"
+	snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot"
 )
 
 // snapshotsSyncer syncs snapshot stats periodically. imagefs info and container stats