Merge pull request #9741 from mxpv/internal_cri

Move CRI from pkg/ to internal/

cmd/containerd-stress/cri_worker.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	internalapi "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis"
-	"github.com/containerd/containerd/v2/pkg/cri/util"
+	"github.com/containerd/containerd/v2/internal/cri/util"
 	"github.com/containerd/log"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )

contrib/fuzz/cri_fuzzer.go

@@ -24,10 +24,10 @@ import (
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	"github.com/containerd/containerd/v2/pkg/cri/server"
-	"github.com/containerd/containerd/v2/pkg/cri/server/images"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
+	"github.com/containerd/containerd/v2/internal/cri/server"
+	"github.com/containerd/containerd/v2/internal/cri/server/images"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
 )
 
 var (

contrib/fuzz/cri_server_fuzzer.go

@@ -24,10 +24,10 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	containerd "github.com/containerd/containerd/v2/client"
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	"github.com/containerd/containerd/v2/pkg/cri/instrument"
-	"github.com/containerd/containerd/v2/pkg/cri/server"
-	"github.com/containerd/containerd/v2/pkg/cri/server/images"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	"github.com/containerd/containerd/v2/internal/cri/instrument"
+	"github.com/containerd/containerd/v2/internal/cri/server"
+	"github.com/containerd/containerd/v2/internal/cri/server/images"
 	"github.com/containerd/containerd/v2/pkg/oci"
 	"github.com/containerd/errdefs"
 )

integration/build_local_containerd_helper_test.go

@@ -27,7 +27,7 @@ import (
 	ctrdsrv "github.com/containerd/containerd/v2/cmd/containerd/server"
 	srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
 	"github.com/containerd/containerd/v2/core/content"
-	"github.com/containerd/containerd/v2/pkg/cri/constants"
+	"github.com/containerd/containerd/v2/internal/cri/constants"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/log/logtest"
 	"github.com/containerd/platforms"

integration/container_update_resources_test.go

@@ -30,7 +30,7 @@ import (
 	cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/integration/images"
-	criopts "github.com/containerd/containerd/v2/pkg/cri/opts"
+	criopts "github.com/containerd/containerd/v2/internal/cri/opts"
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

integration/containerd_image_test.go

@@ -27,7 +27,7 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/integration/images"
-	"github.com/containerd/containerd/v2/pkg/cri/labels"
+	"github.com/containerd/containerd/v2/internal/cri/labels"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/errdefs"
 	"github.com/stretchr/testify/assert"

integration/image_pull_timeout_test.go

@@ -42,9 +42,9 @@ import (
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/containerd/v2/defaults"
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	criserver "github.com/containerd/containerd/v2/pkg/cri/server"
-	"github.com/containerd/containerd/v2/pkg/cri/server/images"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	criserver "github.com/containerd/containerd/v2/internal/cri/server"
+	"github.com/containerd/containerd/v2/internal/cri/server/images"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 )
 

integration/main_test.go

@@ -49,10 +49,10 @@ import (
 	_ "github.com/containerd/containerd/v2/integration/images" // Keep this around to parse `imageListFile` command line var
 	"github.com/containerd/containerd/v2/integration/remote"
 	dialer "github.com/containerd/containerd/v2/integration/remote/util"
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	"github.com/containerd/containerd/v2/pkg/cri/constants"
-	"github.com/containerd/containerd/v2/pkg/cri/types"
-	"github.com/containerd/containerd/v2/pkg/cri/util"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	"github.com/containerd/containerd/v2/internal/cri/constants"
+	"github.com/containerd/containerd/v2/internal/cri/types"
+	"github.com/containerd/containerd/v2/internal/cri/util"
 )
 
 const (

integration/sandbox_run_rollback_test.go

@@ -35,8 +35,8 @@ import (
 	"github.com/stretchr/testify/require"
 	criapiv1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 
+	"github.com/containerd/containerd/v2/internal/cri/types"
 	"github.com/containerd/containerd/v2/internal/failpoint"
-	"github.com/containerd/containerd/v2/pkg/cri/types"
 )
 
 const (

internal/cri/annotations/annotations.go

@@ -17,7 +17,7 @@
 package annotations
 
 import (
-	customopts "github.com/containerd/containerd/v2/pkg/cri/opts"
+	customopts "github.com/containerd/containerd/v2/internal/cri/opts"
 	"github.com/containerd/containerd/v2/pkg/oci"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )

internal/cri/config/config.go

@@ -36,7 +36,7 @@ import (
 
 	runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
-	"github.com/containerd/containerd/v2/pkg/cri/annotations"
+	"github.com/containerd/containerd/v2/internal/cri/annotations"
 	"github.com/containerd/containerd/v2/pkg/deprecation"
 	runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"
 	"github.com/containerd/containerd/v2/plugins"

internal/cri/instrument/instrumented_service.go

@@ -24,7 +24,7 @@ import (
 	"github.com/containerd/log"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
+	ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
 )
 
 const (

internal/cri/io/container_io.go

@@ -25,7 +25,7 @@ import (
 	"github.com/containerd/containerd/v2/pkg/cio"
 	"github.com/containerd/log"
 
-	"github.com/containerd/containerd/v2/pkg/cri/util"
+	"github.com/containerd/containerd/v2/internal/cri/util"
 	cioutil "github.com/containerd/containerd/v2/pkg/ioutil"
 )
 

internal/cri/nri/nri_api.go

@@ -20,9 +20,9 @@ import (
 	"context"
 	"time"
 
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	cstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	cstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	sstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
 	cri "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 

internal/cri/nri/nri_api_linux.go

@@ -23,12 +23,12 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/containers"
+	"github.com/containerd/containerd/v2/internal/cri/annotations"
+	"github.com/containerd/containerd/v2/internal/cri/constants"
+	cstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	sstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
+	ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
 	"github.com/containerd/containerd/v2/pkg/blockio"
-	"github.com/containerd/containerd/v2/pkg/cri/annotations"
-	"github.com/containerd/containerd/v2/pkg/cri/constants"
-	cstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
-	ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
 	"github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/containerd/typeurl/v2"

internal/cri/nri/nri_api_other.go

@@ -23,12 +23,12 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/containers"
-	cstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
+	cstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	sstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	cri "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	"github.com/containerd/containerd/v2/pkg/cri/constants"
+	"github.com/containerd/containerd/v2/internal/cri/constants"
 	"github.com/containerd/containerd/v2/pkg/nri"
 
 	"github.com/containerd/nri/pkg/api"

internal/cri/opts/spec_linux_opts.go

@@ -38,7 +38,7 @@ import (
 	"github.com/containerd/log"
 )
 
-// RuntimeConfig is a subset of [github.com/containerd/containerd/v2/pkg/cri/config].
+// RuntimeConfig is a subset of [github.com/containerd/containerd/v2/internal/cri/config].
 // Needed for avoiding circular imports.
 type RuntimeConfig struct {
 	TreatRoMountsAsRro bool // only applies to volumes

internal/cri/opts/spec_opts.go

@@ -30,7 +30,7 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/containerd/containerd/v2/core/containers"
-	"github.com/containerd/containerd/v2/pkg/cri/util"
+	"github.com/containerd/containerd/v2/internal/cri/util"
 	"github.com/containerd/containerd/v2/pkg/oci"
 )
 

internal/cri/server/container_attach.go

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

internal/cri/server/container_create.go

@@ -36,14 +36,14 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/containers"
+	"github.com/containerd/containerd/v2/internal/cri/annotations"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	cio "github.com/containerd/containerd/v2/internal/cri/io"
+	crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
+	customopts "github.com/containerd/containerd/v2/internal/cri/opts"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	"github.com/containerd/containerd/v2/internal/cri/util"
 	"github.com/containerd/containerd/v2/pkg/blockio"
-	"github.com/containerd/containerd/v2/pkg/cri/annotations"
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	cio "github.com/containerd/containerd/v2/pkg/cri/io"
-	crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
-	customopts "github.com/containerd/containerd/v2/pkg/cri/opts"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	"github.com/containerd/containerd/v2/pkg/cri/util"
 	"github.com/containerd/containerd/v2/pkg/oci"
 	"github.com/containerd/platforms"
 )

internal/cri/server/container_create_linux.go

@@ -33,7 +33,7 @@ import (
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/pkg/oci"
 
-	customopts "github.com/containerd/containerd/v2/pkg/cri/opts"
+	customopts "github.com/containerd/containerd/v2/internal/cri/opts"
 )
 
 const (

internal/cri/server/container_create_linux_test.go

@@ -39,13 +39,13 @@ import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 	"tags.cncf.io/container-device-interface/pkg/cdi"
 
+	"github.com/containerd/containerd/v2/internal/cri/annotations"
+	"github.com/containerd/containerd/v2/internal/cri/config"
+	"github.com/containerd/containerd/v2/internal/cri/opts"
+	customopts "github.com/containerd/containerd/v2/internal/cri/opts"
+	"github.com/containerd/containerd/v2/internal/cri/util"
+	ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
 	"github.com/containerd/containerd/v2/pkg/cap"
-	"github.com/containerd/containerd/v2/pkg/cri/annotations"
-	"github.com/containerd/containerd/v2/pkg/cri/config"
-	"github.com/containerd/containerd/v2/pkg/cri/opts"
-	customopts "github.com/containerd/containerd/v2/pkg/cri/opts"
-	"github.com/containerd/containerd/v2/pkg/cri/util"
-	ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
 	ostesting "github.com/containerd/containerd/v2/pkg/os/testing"
 )
 

internal/cri/server/container_create_other_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	"github.com/containerd/containerd/v2/pkg/cri/annotations"
+	"github.com/containerd/containerd/v2/internal/cri/annotations"
 )
 
 // checkMount is defined by all tests but not used here

internal/cri/server/container_create_test.go

@@ -33,9 +33,9 @@ import (
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	"github.com/containerd/containerd/v2/pkg/cri/config"
-	"github.com/containerd/containerd/v2/pkg/cri/constants"
-	"github.com/containerd/containerd/v2/pkg/cri/opts"
+	"github.com/containerd/containerd/v2/internal/cri/config"
+	"github.com/containerd/containerd/v2/internal/cri/constants"
+	"github.com/containerd/containerd/v2/internal/cri/opts"
 	"github.com/containerd/containerd/v2/pkg/oci"
 )
 

internal/cri/server/container_create_windows_test.go

@@ -26,8 +26,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	"github.com/containerd/containerd/v2/pkg/cri/annotations"
-	"github.com/containerd/containerd/v2/pkg/cri/config"
+	"github.com/containerd/containerd/v2/internal/cri/annotations"
+	"github.com/containerd/containerd/v2/internal/cri/config"
 )
 
 func getSandboxConfig() *runtime.PodSandboxConfig {

internal/cri/server/container_execsync.go

@@ -32,8 +32,8 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	cio "github.com/containerd/containerd/v2/pkg/cri/io"
-	"github.com/containerd/containerd/v2/pkg/cri/util"
+	cio "github.com/containerd/containerd/v2/internal/cri/io"
+	"github.com/containerd/containerd/v2/internal/cri/util"
 	cioutil "github.com/containerd/containerd/v2/pkg/ioutil"
 )
 

internal/cri/server/container_list.go

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

internal/cri/server/container_list_test.go

@@ -25,8 +25,8 @@ import (
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
 )
 
 func TestToCRIContainer(t *testing.T) {

internal/cri/server/container_remove.go

@@ -23,7 +23,7 @@ import (
 	"time"
 
 	containerd "github.com/containerd/containerd/v2/client"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
 	"github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"

internal/cri/server/container_remove_test.go

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

internal/cri/server/container_start.go

@@ -29,10 +29,10 @@ import (
 	"github.com/containerd/log"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	cio "github.com/containerd/containerd/v2/pkg/cri/io"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
-	ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
+	cio "github.com/containerd/containerd/v2/internal/cri/io"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
+	ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
 	cioutil "github.com/containerd/containerd/v2/pkg/ioutil"
 )
 

internal/cri/server/container_start_test.go

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

internal/cri/server/container_stats_list.go

@@ -32,8 +32,8 @@ import (
 
 	"github.com/containerd/containerd/v2/api/services/tasks/v1"
 	"github.com/containerd/containerd/v2/api/types"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	"github.com/containerd/containerd/v2/pkg/cri/store/stats"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	"github.com/containerd/containerd/v2/internal/cri/store/stats"
 	"github.com/containerd/containerd/v2/protobuf"
 	"github.com/containerd/errdefs"
 )

internal/cri/server/container_stats_list_test.go

@@ -26,8 +26,8 @@ import (
 	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
 	"github.com/containerd/containerd/v2/api/types"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
 	"github.com/stretchr/testify/assert"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )

internal/cri/server/container_status.go

@@ -21,8 +21,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	"github.com/containerd/containerd/v2/pkg/cri/util"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	"github.com/containerd/containerd/v2/internal/cri/util"
 	"github.com/containerd/errdefs"
 
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"

internal/cri/server/container_status_test.go

@@ -22,13 +22,13 @@ import (
 	"testing"
 	"time"
 
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	snapshotstore "github.com/containerd/containerd/v2/internal/cri/store/snapshot"
 	"github.com/stretchr/testify/assert"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	imagestore "github.com/containerd/containerd/v2/internal/cri/store/image"
 )
 
 func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status,

internal/cri/server/container_stop.go

@@ -24,8 +24,8 @@ import (
 	"time"
 
 	eventtypes "github.com/containerd/containerd/v2/api/events"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
 	"github.com/containerd/containerd/v2/protobuf"
 	"github.com/containerd/errdefs"
 	"github.com/containerd/log"

internal/cri/server/container_stop_test.go

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

internal/cri/server/container_update_resources.go

@@ -32,8 +32,8 @@ import (
 	"github.com/containerd/errdefs"
 	"github.com/containerd/log"
 
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
 )
 
 // UpdateContainerResources updates ContainerConfig of the container.

internal/cri/server/container_update_resources_linux.go

@@ -23,9 +23,9 @@ import (
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	"github.com/containerd/containerd/v2/pkg/cri/opts"
-	"github.com/containerd/containerd/v2/pkg/cri/util"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	"github.com/containerd/containerd/v2/internal/cri/opts"
+	"github.com/containerd/containerd/v2/internal/cri/util"
 )
 
 // updateOCIResource updates container resource limit.

internal/cri/server/container_update_resources_linux_test.go

@@ -25,8 +25,8 @@ import (
 	"google.golang.org/protobuf/proto"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	criopts "github.com/containerd/containerd/v2/pkg/cri/opts"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	criopts "github.com/containerd/containerd/v2/internal/cri/opts"
 )
 
 func TestUpdateOCILinuxResource(t *testing.T) {

internal/cri/server/container_update_resources_other.go

@@ -24,7 +24,7 @@ import (
 
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
 )
 
 // UpdateContainerResources updates ContainerConfig of the container.

internal/cri/server/container_update_resources_windows.go

@@ -23,9 +23,9 @@ import (
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	"github.com/containerd/containerd/v2/pkg/cri/opts"
-	"github.com/containerd/containerd/v2/pkg/cri/util"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	"github.com/containerd/containerd/v2/internal/cri/opts"
+	"github.com/containerd/containerd/v2/internal/cri/util"
 )
 
 // updateOCIResource updates container resource limit.

internal/cri/server/events.go

@@ -31,11 +31,11 @@ import (
 	eventtypes "github.com/containerd/containerd/v2/api/events"
 	apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
 	containerd "github.com/containerd/containerd/v2/client"
+	"github.com/containerd/containerd/v2/internal/cri/constants"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
+	ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
 	containerdio "github.com/containerd/containerd/v2/pkg/cio"
-	"github.com/containerd/containerd/v2/pkg/cri/constants"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
-	ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
 	"github.com/containerd/containerd/v2/pkg/events"
 	"github.com/containerd/containerd/v2/protobuf"
 	"github.com/containerd/errdefs"

internal/cri/server/fuzz.go

@@ -21,7 +21,7 @@ package server
 import (
 	"fmt"
 
-	"github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
+	"github.com/containerd/containerd/v2/internal/cri/store/sandbox"
 )
 
 func SandboxStore(cs CRIService) (*sandbox.Store, error) {

internal/cri/server/helpers.go

@@ -33,9 +33,9 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/containers"
-	crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
-	imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image"
+	crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
+	imagestore "github.com/containerd/containerd/v2/internal/cri/store/image"
 	clabels "github.com/containerd/containerd/v2/pkg/labels"
 	"github.com/containerd/errdefs"
 	"github.com/containerd/log"

internal/cri/server/helpers_test.go

@@ -28,9 +28,9 @@ import (
 
 	"github.com/containerd/containerd/v2/core/containers"
 	runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
-	containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
+	containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
 	"github.com/containerd/containerd/v2/pkg/oci"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/protobuf/types"

internal/cri/server/images/image_list_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image"
+	imagestore "github.com/containerd/containerd/v2/internal/cri/store/image"
 )
 
 func TestListImages(t *testing.T) {

internal/cri/server/images/image_pull.go

@@ -44,9 +44,9 @@ import (
 	containerdimages "github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/core/remotes/docker"
 	"github.com/containerd/containerd/v2/core/remotes/docker/config"
-	"github.com/containerd/containerd/v2/pkg/cri/annotations"
-	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
-	crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
+	"github.com/containerd/containerd/v2/internal/cri/annotations"
+	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
+	crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
 	snpkg "github.com/containerd/containerd/v2/pkg/snapshotters"
 	"github.com/containerd/containerd/v2/pkg/tracing"
 	"github.com/containerd/errdefs"