diff --git a/cmd/containerd-stress/cri_worker.go b/cmd/containerd-stress/cri_worker.go index a206f0534..332227cfb 100644 --- a/cmd/containerd-stress/cri_worker.go +++ b/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" ) diff --git a/contrib/fuzz/cri_fuzzer.go b/contrib/fuzz/cri_fuzzer.go index 6a08fc241..24818c202 100644 --- a/contrib/fuzz/cri_fuzzer.go +++ b/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 ( diff --git a/contrib/fuzz/cri_server_fuzzer.go b/contrib/fuzz/cri_server_fuzzer.go index 08cf4a645..3eaaa514b 100644 --- a/contrib/fuzz/cri_server_fuzzer.go +++ b/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" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 0a4471df6..1a3a44193 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/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" diff --git a/integration/container_update_resources_test.go b/integration/container_update_resources_test.go index 5bdcf16e6..a489c48ff 100644 --- a/integration/container_update_resources_test.go +++ b/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" diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go index 03955b51c..57e4f0b9a 100644 --- a/integration/containerd_image_test.go +++ b/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" diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index 3492fb26e..cc9a84692 100644 --- a/integration/image_pull_timeout_test.go +++ b/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" ) diff --git a/integration/main_test.go b/integration/main_test.go index 57e1617d6..4d4f8ec46 100644 --- a/integration/main_test.go +++ b/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 ( diff --git a/integration/sandbox_run_rollback_test.go b/integration/sandbox_run_rollback_test.go index bd580aa49..41d068f60 100644 --- a/integration/sandbox_run_rollback_test.go +++ b/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 ( diff --git a/pkg/cri/annotations/annotations.go b/internal/cri/annotations/annotations.go similarity index 98% rename from pkg/cri/annotations/annotations.go rename to internal/cri/annotations/annotations.go index 0288be67f..a6aa15109 100644 --- a/pkg/cri/annotations/annotations.go +++ b/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" ) diff --git a/pkg/cri/bandwidth/doc.go b/internal/cri/bandwidth/doc.go similarity index 100% rename from pkg/cri/bandwidth/doc.go rename to internal/cri/bandwidth/doc.go diff --git a/pkg/cri/bandwidth/fake_shaper.go b/internal/cri/bandwidth/fake_shaper.go similarity index 100% rename from pkg/cri/bandwidth/fake_shaper.go rename to internal/cri/bandwidth/fake_shaper.go diff --git a/pkg/cri/bandwidth/interfaces.go b/internal/cri/bandwidth/interfaces.go similarity index 100% rename from pkg/cri/bandwidth/interfaces.go rename to internal/cri/bandwidth/interfaces.go diff --git a/pkg/cri/bandwidth/linux.go b/internal/cri/bandwidth/linux.go similarity index 100% rename from pkg/cri/bandwidth/linux.go rename to internal/cri/bandwidth/linux.go diff --git a/pkg/cri/bandwidth/unsupported.go b/internal/cri/bandwidth/unsupported.go similarity index 100% rename from pkg/cri/bandwidth/unsupported.go rename to internal/cri/bandwidth/unsupported.go diff --git a/pkg/cri/bandwidth/utils.go b/internal/cri/bandwidth/utils.go similarity index 100% rename from pkg/cri/bandwidth/utils.go rename to internal/cri/bandwidth/utils.go diff --git a/pkg/cri/config/config.go b/internal/cri/config/config.go similarity index 99% rename from pkg/cri/config/config.go rename to internal/cri/config/config.go index a8bde65cf..b8bf9e162 100644 --- a/pkg/cri/config/config.go +++ b/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" diff --git a/pkg/cri/config/config_kernel_linux.go b/internal/cri/config/config_kernel_linux.go similarity index 100% rename from pkg/cri/config/config_kernel_linux.go rename to internal/cri/config/config_kernel_linux.go diff --git a/pkg/cri/config/config_kernel_linux_test.go b/internal/cri/config/config_kernel_linux_test.go similarity index 100% rename from pkg/cri/config/config_kernel_linux_test.go rename to internal/cri/config/config_kernel_linux_test.go diff --git a/pkg/cri/config/config_kernel_other.go b/internal/cri/config/config_kernel_other.go similarity index 100% rename from pkg/cri/config/config_kernel_other.go rename to internal/cri/config/config_kernel_other.go diff --git a/pkg/cri/config/config_test.go b/internal/cri/config/config_test.go similarity index 100% rename from pkg/cri/config/config_test.go rename to internal/cri/config/config_test.go diff --git a/pkg/cri/config/config_unix.go b/internal/cri/config/config_unix.go similarity index 100% rename from pkg/cri/config/config_unix.go rename to internal/cri/config/config_unix.go diff --git a/pkg/cri/config/config_windows.go b/internal/cri/config/config_windows.go similarity index 100% rename from pkg/cri/config/config_windows.go rename to internal/cri/config/config_windows.go diff --git a/pkg/cri/config/streaming.go b/internal/cri/config/streaming.go similarity index 100% rename from pkg/cri/config/streaming.go rename to internal/cri/config/streaming.go diff --git a/pkg/cri/config/streaming_test.go b/internal/cri/config/streaming_test.go similarity index 100% rename from pkg/cri/config/streaming_test.go rename to internal/cri/config/streaming_test.go diff --git a/pkg/cri/constants/constants.go b/internal/cri/constants/constants.go similarity index 100% rename from pkg/cri/constants/constants.go rename to internal/cri/constants/constants.go diff --git a/pkg/cri/instrument/instrumented_service.go b/internal/cri/instrument/instrumented_service.go similarity index 99% rename from pkg/cri/instrument/instrumented_service.go rename to internal/cri/instrument/instrumented_service.go index a030bc7f8..97c9a6172 100644 --- a/pkg/cri/instrument/instrumented_service.go +++ b/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 ( diff --git a/pkg/cri/io/container_io.go b/internal/cri/io/container_io.go similarity index 99% rename from pkg/cri/io/container_io.go rename to internal/cri/io/container_io.go index 1b7152df0..c916df55c 100644 --- a/pkg/cri/io/container_io.go +++ b/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" ) diff --git a/pkg/cri/io/exec_io.go b/internal/cri/io/exec_io.go similarity index 100% rename from pkg/cri/io/exec_io.go rename to internal/cri/io/exec_io.go diff --git a/pkg/cri/io/helpers.go b/internal/cri/io/helpers.go similarity index 100% rename from pkg/cri/io/helpers.go rename to internal/cri/io/helpers.go diff --git a/pkg/cri/io/helpers_unix.go b/internal/cri/io/helpers_unix.go similarity index 100% rename from pkg/cri/io/helpers_unix.go rename to internal/cri/io/helpers_unix.go diff --git a/pkg/cri/io/helpers_windows.go b/internal/cri/io/helpers_windows.go similarity index 100% rename from pkg/cri/io/helpers_windows.go rename to internal/cri/io/helpers_windows.go diff --git a/pkg/cri/io/logger.go b/internal/cri/io/logger.go similarity index 100% rename from pkg/cri/io/logger.go rename to internal/cri/io/logger.go diff --git a/pkg/cri/io/logger_test.go b/internal/cri/io/logger_test.go similarity index 100% rename from pkg/cri/io/logger_test.go rename to internal/cri/io/logger_test.go diff --git a/pkg/cri/io/metrics.go b/internal/cri/io/metrics.go similarity index 100% rename from pkg/cri/io/metrics.go rename to internal/cri/io/metrics.go diff --git a/pkg/cri/labels/labels.go b/internal/cri/labels/labels.go similarity index 100% rename from pkg/cri/labels/labels.go rename to internal/cri/labels/labels.go diff --git a/pkg/cri/nri/nri_api.go b/internal/cri/nri/nri_api.go similarity index 82% rename from pkg/cri/nri/nri_api.go rename to internal/cri/nri/nri_api.go index 26df03cfd..97ef52f37 100644 --- a/pkg/cri/nri/nri_api.go +++ b/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" ) diff --git a/pkg/cri/nri/nri_api_linux.go b/internal/cri/nri/nri_api_linux.go similarity index 98% rename from pkg/cri/nri/nri_api_linux.go rename to internal/cri/nri/nri_api_linux.go index e01aebe34..5387415b7 100644 --- a/pkg/cri/nri/nri_api_linux.go +++ b/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" diff --git a/pkg/cri/nri/nri_api_other.go b/internal/cri/nri/nri_api_other.go similarity index 94% rename from pkg/cri/nri/nri_api_other.go rename to internal/cri/nri/nri_api_other.go index dc791527b..33ae5891b 100644 --- a/pkg/cri/nri/nri_api_other.go +++ b/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" diff --git a/pkg/cri/opts/container.go b/internal/cri/opts/container.go similarity index 100% rename from pkg/cri/opts/container.go rename to internal/cri/opts/container.go diff --git a/pkg/cri/opts/spec_darwin_opts.go b/internal/cri/opts/spec_darwin_opts.go similarity index 100% rename from pkg/cri/opts/spec_darwin_opts.go rename to internal/cri/opts/spec_darwin_opts.go diff --git a/pkg/cri/opts/spec_linux.go b/internal/cri/opts/spec_linux.go similarity index 100% rename from pkg/cri/opts/spec_linux.go rename to internal/cri/opts/spec_linux.go diff --git a/pkg/cri/opts/spec_linux_opts.go b/internal/cri/opts/spec_linux_opts.go similarity index 99% rename from pkg/cri/opts/spec_linux_opts.go rename to internal/cri/opts/spec_linux_opts.go index 6deac3628..10325b363 100644 --- a/pkg/cri/opts/spec_linux_opts.go +++ b/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 diff --git a/pkg/cri/opts/spec_linux_test.go b/internal/cri/opts/spec_linux_test.go similarity index 100% rename from pkg/cri/opts/spec_linux_test.go rename to internal/cri/opts/spec_linux_test.go diff --git a/pkg/cri/opts/spec_nonlinux.go b/internal/cri/opts/spec_nonlinux.go similarity index 100% rename from pkg/cri/opts/spec_nonlinux.go rename to internal/cri/opts/spec_nonlinux.go diff --git a/pkg/cri/opts/spec_nonwindows.go b/internal/cri/opts/spec_nonwindows.go similarity index 100% rename from pkg/cri/opts/spec_nonwindows.go rename to internal/cri/opts/spec_nonwindows.go diff --git a/pkg/cri/opts/spec_opts.go b/internal/cri/opts/spec_opts.go similarity index 99% rename from pkg/cri/opts/spec_opts.go rename to internal/cri/opts/spec_opts.go index b3d61cec7..49dc70076 100644 --- a/pkg/cri/opts/spec_opts.go +++ b/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" ) diff --git a/pkg/cri/opts/spec_opts_test.go b/internal/cri/opts/spec_opts_test.go similarity index 100% rename from pkg/cri/opts/spec_opts_test.go rename to internal/cri/opts/spec_opts_test.go diff --git a/pkg/cri/opts/spec_windows.go b/internal/cri/opts/spec_windows.go similarity index 100% rename from pkg/cri/opts/spec_windows.go rename to internal/cri/opts/spec_windows.go diff --git a/pkg/cri/opts/spec_windows_opts.go b/internal/cri/opts/spec_windows_opts.go similarity index 100% rename from pkg/cri/opts/spec_windows_opts.go rename to internal/cri/opts/spec_windows_opts.go diff --git a/pkg/cri/opts/spec_windows_test.go b/internal/cri/opts/spec_windows_test.go similarity index 100% rename from pkg/cri/opts/spec_windows_test.go rename to internal/cri/opts/spec_windows_test.go diff --git a/pkg/cri/server/blockio_linux.go b/internal/cri/server/blockio_linux.go similarity index 100% rename from pkg/cri/server/blockio_linux.go rename to internal/cri/server/blockio_linux.go diff --git a/pkg/cri/server/blockio_stub.go b/internal/cri/server/blockio_stub.go similarity index 100% rename from pkg/cri/server/blockio_stub.go rename to internal/cri/server/blockio_stub.go diff --git a/pkg/cri/server/cni_conf_syncer.go b/internal/cri/server/cni_conf_syncer.go similarity index 100% rename from pkg/cri/server/cni_conf_syncer.go rename to internal/cri/server/cni_conf_syncer.go diff --git a/pkg/cri/server/container_attach.go b/internal/cri/server/container_attach.go similarity index 97% rename from pkg/cri/server/container_attach.go rename to internal/cri/server/container_attach.go index 696653eba..cd7bea720 100644 --- a/pkg/cri/server/container_attach.go +++ b/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. diff --git a/pkg/cri/server/container_checkpoint.go b/internal/cri/server/container_checkpoint.go similarity index 100% rename from pkg/cri/server/container_checkpoint.go rename to internal/cri/server/container_checkpoint.go diff --git a/pkg/cri/server/container_create.go b/internal/cri/server/container_create.go similarity index 98% rename from pkg/cri/server/container_create.go rename to internal/cri/server/container_create.go index b579200e9..8f85fbf98 100644 --- a/pkg/cri/server/container_create.go +++ b/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" ) diff --git a/pkg/cri/server/container_create_linux.go b/internal/cri/server/container_create_linux.go similarity index 99% rename from pkg/cri/server/container_create_linux.go rename to internal/cri/server/container_create_linux.go index aecd80527..e2e69b6e1 100644 --- a/pkg/cri/server/container_create_linux.go +++ b/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 ( diff --git a/pkg/cri/server/container_create_linux_test.go b/internal/cri/server/container_create_linux_test.go similarity index 99% rename from pkg/cri/server/container_create_linux_test.go rename to internal/cri/server/container_create_linux_test.go index 6b7992cc1..9968c5558 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/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" ) diff --git a/pkg/cri/server/container_create_other.go b/internal/cri/server/container_create_other.go similarity index 100% rename from pkg/cri/server/container_create_other.go rename to internal/cri/server/container_create_other.go diff --git a/pkg/cri/server/container_create_other_test.go b/internal/cri/server/container_create_other_test.go similarity index 98% rename from pkg/cri/server/container_create_other_test.go rename to internal/cri/server/container_create_other_test.go index b801d9122..4b3c61744 100644 --- a/pkg/cri/server/container_create_other_test.go +++ b/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 diff --git a/pkg/cri/server/container_create_test.go b/internal/cri/server/container_create_test.go similarity index 99% rename from pkg/cri/server/container_create_test.go rename to internal/cri/server/container_create_test.go index fa5f6bbf7..b2b2c9678 100644 --- a/pkg/cri/server/container_create_test.go +++ b/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" ) diff --git a/pkg/cri/server/container_create_windows.go b/internal/cri/server/container_create_windows.go similarity index 100% rename from pkg/cri/server/container_create_windows.go rename to internal/cri/server/container_create_windows.go diff --git a/pkg/cri/server/container_create_windows_test.go b/internal/cri/server/container_create_windows_test.go similarity index 99% rename from pkg/cri/server/container_create_windows_test.go rename to internal/cri/server/container_create_windows_test.go index 9a5e11f5d..6a33c44ea 100644 --- a/pkg/cri/server/container_create_windows_test.go +++ b/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 { diff --git a/pkg/cri/server/container_events.go b/internal/cri/server/container_events.go similarity index 100% rename from pkg/cri/server/container_events.go rename to internal/cri/server/container_events.go diff --git a/pkg/cri/server/container_exec.go b/internal/cri/server/container_exec.go similarity index 100% rename from pkg/cri/server/container_exec.go rename to internal/cri/server/container_exec.go diff --git a/pkg/cri/server/container_execsync.go b/internal/cri/server/container_execsync.go similarity index 98% rename from pkg/cri/server/container_execsync.go rename to internal/cri/server/container_execsync.go index 53160e1d8..44197d4b2 100644 --- a/pkg/cri/server/container_execsync.go +++ b/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" ) diff --git a/pkg/cri/server/container_execsync_test.go b/internal/cri/server/container_execsync_test.go similarity index 100% rename from pkg/cri/server/container_execsync_test.go rename to internal/cri/server/container_execsync_test.go diff --git a/pkg/cri/server/container_list.go b/internal/cri/server/container_list.go similarity index 97% rename from pkg/cri/server/container_list.go rename to internal/cri/server/container_list.go index eb8025cef..3552f92cf 100644 --- a/pkg/cri/server/container_list.go +++ b/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. diff --git a/pkg/cri/server/container_list_test.go b/internal/cri/server/container_list_test.go similarity index 98% rename from pkg/cri/server/container_list_test.go rename to internal/cri/server/container_list_test.go index e618f4772..6c197c54f 100644 --- a/pkg/cri/server/container_list_test.go +++ b/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) { diff --git a/pkg/cri/server/container_log_reopen.go b/internal/cri/server/container_log_reopen.go similarity index 100% rename from pkg/cri/server/container_log_reopen.go rename to internal/cri/server/container_log_reopen.go diff --git a/pkg/cri/server/container_remove.go b/internal/cri/server/container_remove.go similarity index 98% rename from pkg/cri/server/container_remove.go rename to internal/cri/server/container_remove.go index 1bf53f8ba..c3e4d000e 100644 --- a/pkg/cri/server/container_remove.go +++ b/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" diff --git a/pkg/cri/server/container_remove_test.go b/internal/cri/server/container_remove_test.go similarity index 96% rename from pkg/cri/server/container_remove_test.go rename to internal/cri/server/container_remove_test.go index 6e6c99b34..bf6ea5f8b 100644 --- a/pkg/cri/server/container_remove_test.go +++ b/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 diff --git a/pkg/cri/server/container_start.go b/internal/cri/server/container_start.go similarity index 96% rename from pkg/cri/server/container_start.go rename to internal/cri/server/container_start.go index 2a80d683b..8207335a5 100644 --- a/pkg/cri/server/container_start.go +++ b/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" ) diff --git a/pkg/cri/server/container_start_test.go b/internal/cri/server/container_start_test.go similarity index 97% rename from pkg/cri/server/container_start_test.go rename to internal/cri/server/container_start_test.go index ce3d56b8b..a2da3595e 100644 --- a/pkg/cri/server/container_start_test.go +++ b/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 diff --git a/pkg/cri/server/container_stats.go b/internal/cri/server/container_stats.go similarity index 100% rename from pkg/cri/server/container_stats.go rename to internal/cri/server/container_stats.go diff --git a/pkg/cri/server/container_stats_list.go b/internal/cri/server/container_stats_list.go similarity index 99% rename from pkg/cri/server/container_stats_list.go rename to internal/cri/server/container_stats_list.go index 363a51a08..4279c544a 100644 --- a/pkg/cri/server/container_stats_list.go +++ b/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" ) diff --git a/pkg/cri/server/container_stats_list_test.go b/internal/cri/server/container_stats_list_test.go similarity index 98% rename from pkg/cri/server/container_stats_list_test.go rename to internal/cri/server/container_stats_list_test.go index 90b66ae95..5d042ce85 100644 --- a/pkg/cri/server/container_stats_list_test.go +++ b/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" ) diff --git a/pkg/cri/server/container_status.go b/internal/cri/server/container_status.go similarity index 97% rename from pkg/cri/server/container_status.go rename to internal/cri/server/container_status.go index 7100e12e1..9091212eb 100644 --- a/pkg/cri/server/container_status.go +++ b/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" diff --git a/pkg/cri/server/container_status_test.go b/internal/cri/server/container_status_test.go similarity index 96% rename from pkg/cri/server/container_status_test.go rename to internal/cri/server/container_status_test.go index d20d1f12a..284cf4e99 100644 --- a/pkg/cri/server/container_status_test.go +++ b/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, diff --git a/pkg/cri/server/container_stop.go b/internal/cri/server/container_stop.go similarity index 98% rename from pkg/cri/server/container_stop.go rename to internal/cri/server/container_stop.go index 0c7047d72..ea667e061 100644 --- a/pkg/cri/server/container_stop.go +++ b/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" diff --git a/pkg/cri/server/container_stop_test.go b/internal/cri/server/container_stop_test.go similarity index 96% rename from pkg/cri/server/container_stop_test.go rename to internal/cri/server/container_stop_test.go index 48df17e58..765940baf 100644 --- a/pkg/cri/server/container_stop_test.go +++ b/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) { diff --git a/pkg/cri/server/container_update_resources.go b/internal/cri/server/container_update_resources.go similarity index 97% rename from pkg/cri/server/container_update_resources.go rename to internal/cri/server/container_update_resources.go index 605056d2b..58366665e 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/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. diff --git a/pkg/cri/server/container_update_resources_linux.go b/internal/cri/server/container_update_resources_linux.go similarity index 89% rename from pkg/cri/server/container_update_resources_linux.go rename to internal/cri/server/container_update_resources_linux.go index 2bf25f229..c4ece123e 100644 --- a/pkg/cri/server/container_update_resources_linux.go +++ b/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. diff --git a/pkg/cri/server/container_update_resources_linux_test.go b/internal/cri/server/container_update_resources_linux_test.go similarity index 98% rename from pkg/cri/server/container_update_resources_linux_test.go rename to internal/cri/server/container_update_resources_linux_test.go index ea9b36cff..1e3132b17 100644 --- a/pkg/cri/server/container_update_resources_linux_test.go +++ b/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) { diff --git a/pkg/cri/server/container_update_resources_other.go b/internal/cri/server/container_update_resources_other.go similarity index 94% rename from pkg/cri/server/container_update_resources_other.go rename to internal/cri/server/container_update_resources_other.go index b87f74735..40c906352 100644 --- a/pkg/cri/server/container_update_resources_other.go +++ b/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. diff --git a/pkg/cri/server/container_update_resources_windows.go b/internal/cri/server/container_update_resources_windows.go similarity index 89% rename from pkg/cri/server/container_update_resources_windows.go rename to internal/cri/server/container_update_resources_windows.go index 8fd6f9fc3..110e6e02c 100644 --- a/pkg/cri/server/container_update_resources_windows.go +++ b/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. diff --git a/pkg/cri/server/events.go b/internal/cri/server/events.go similarity index 98% rename from pkg/cri/server/events.go rename to internal/cri/server/events.go index 0b88da227..c8fc06786 100644 --- a/pkg/cri/server/events.go +++ b/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" diff --git a/pkg/cri/server/events_test.go b/internal/cri/server/events_test.go similarity index 100% rename from pkg/cri/server/events_test.go rename to internal/cri/server/events_test.go diff --git a/pkg/cri/server/fuzz.go b/internal/cri/server/fuzz.go similarity index 92% rename from pkg/cri/server/fuzz.go rename to internal/cri/server/fuzz.go index d37d76088..d217d0ec7 100644 --- a/pkg/cri/server/fuzz.go +++ b/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) { diff --git a/pkg/cri/server/helpers.go b/internal/cri/server/helpers.go similarity index 98% rename from pkg/cri/server/helpers.go rename to internal/cri/server/helpers.go index a5b1fe8e8..d94360b7c 100644 --- a/pkg/cri/server/helpers.go +++ b/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" diff --git a/pkg/cri/server/helpers_linux.go b/internal/cri/server/helpers_linux.go similarity index 100% rename from pkg/cri/server/helpers_linux.go rename to internal/cri/server/helpers_linux.go diff --git a/pkg/cri/server/helpers_other.go b/internal/cri/server/helpers_other.go similarity index 100% rename from pkg/cri/server/helpers_other.go rename to internal/cri/server/helpers_other.go diff --git a/pkg/cri/server/helpers_test.go b/internal/cri/server/helpers_test.go similarity index 98% rename from pkg/cri/server/helpers_test.go rename to internal/cri/server/helpers_test.go index 795af0327..d2c347837 100644 --- a/pkg/cri/server/helpers_test.go +++ b/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" diff --git a/pkg/cri/server/helpers_windows.go b/internal/cri/server/helpers_windows.go similarity index 100% rename from pkg/cri/server/helpers_windows.go rename to internal/cri/server/helpers_windows.go diff --git a/pkg/cri/server/helpers_windows_test.go b/internal/cri/server/helpers_windows_test.go similarity index 100% rename from pkg/cri/server/helpers_windows_test.go rename to internal/cri/server/helpers_windows_test.go diff --git a/pkg/cri/server/images/check.go b/internal/cri/server/images/check.go similarity index 100% rename from pkg/cri/server/images/check.go rename to internal/cri/server/images/check.go diff --git a/pkg/cri/server/images/image_list.go b/internal/cri/server/images/image_list.go similarity index 100% rename from pkg/cri/server/images/image_list.go rename to internal/cri/server/images/image_list.go diff --git a/pkg/cri/server/images/image_list_test.go b/internal/cri/server/images/image_list_test.go similarity index 97% rename from pkg/cri/server/images/image_list_test.go rename to internal/cri/server/images/image_list_test.go index 919851205..fd046183f 100644 --- a/pkg/cri/server/images/image_list_test.go +++ b/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) { diff --git a/pkg/cri/server/images/image_pull.go b/internal/cri/server/images/image_pull.go similarity index 99% rename from pkg/cri/server/images/image_pull.go rename to internal/cri/server/images/image_pull.go index 6355a161f..a1df05c1b 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/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" diff --git a/pkg/cri/server/images/image_pull_test.go b/internal/cri/server/images/image_pull_test.go similarity index 98% rename from pkg/cri/server/images/image_pull_test.go rename to internal/cri/server/images/image_pull_test.go index a3994e689..4ef6d7d79 100644 --- a/pkg/cri/server/images/image_pull_test.go +++ b/internal/cri/server/images/image_pull_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/pkg/cri/annotations" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "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" + "github.com/containerd/containerd/v2/internal/cri/labels" "github.com/containerd/platforms" ) diff --git a/pkg/cri/server/images/image_remove.go b/internal/cri/server/images/image_remove.go similarity index 100% rename from pkg/cri/server/images/image_remove.go rename to internal/cri/server/images/image_remove.go diff --git a/pkg/cri/server/images/image_status.go b/internal/cri/server/images/image_status.go similarity index 96% rename from pkg/cri/server/images/image_status.go rename to internal/cri/server/images/image_status.go index cc4f022dc..1bb85549a 100644 --- a/pkg/cri/server/images/image_status.go +++ b/internal/cri/server/images/image_status.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" - "github.com/containerd/containerd/v2/pkg/cri/util" + imagestore "github.com/containerd/containerd/v2/internal/cri/store/image" + "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/errdefs" "github.com/containerd/log" diff --git a/pkg/cri/server/images/image_status_test.go b/internal/cri/server/images/image_status_test.go similarity index 96% rename from pkg/cri/server/images/image_status_test.go rename to internal/cri/server/images/image_status_test.go index cc38b2237..e4405be78 100644 --- a/pkg/cri/server/images/image_status_test.go +++ b/internal/cri/server/images/image_status_test.go @@ -25,8 +25,8 @@ 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" - "github.com/containerd/containerd/v2/pkg/cri/util" + imagestore "github.com/containerd/containerd/v2/internal/cri/store/image" + "github.com/containerd/containerd/v2/internal/cri/util" ) func TestImageStatus(t *testing.T) { diff --git a/pkg/cri/server/images/imagefs_info.go b/internal/cri/server/images/imagefs_info.go similarity index 97% rename from pkg/cri/server/images/imagefs_info.go rename to internal/cri/server/images/imagefs_info.go index abb3c4787..028095546 100644 --- a/pkg/cri/server/images/imagefs_info.go +++ b/internal/cri/server/images/imagefs_info.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" + "github.com/containerd/containerd/v2/internal/cri/store/snapshot" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/images/imagefs_info_test.go b/internal/cri/server/images/imagefs_info_test.go similarity index 96% rename from pkg/cri/server/images/imagefs_info_test.go rename to internal/cri/server/images/imagefs_info_test.go index e61edbfcf..edc3861f0 100644 --- a/pkg/cri/server/images/imagefs_info_test.go +++ b/internal/cri/server/images/imagefs_info_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" + snapshotstore "github.com/containerd/containerd/v2/internal/cri/store/snapshot" ) func TestImageFsInfo(t *testing.T) { diff --git a/pkg/cri/server/images/metrics.go b/internal/cri/server/images/metrics.go similarity index 100% rename from pkg/cri/server/images/metrics.go rename to internal/cri/server/images/metrics.go diff --git a/pkg/cri/server/images/service.go b/internal/cri/server/images/service.go similarity index 96% rename from pkg/cri/server/images/service.go rename to internal/cri/server/images/service.go index a73f988b1..40d695cc6 100644 --- a/pkg/cri/server/images/service.go +++ b/internal/cri/server/images/service.go @@ -24,10 +24,10 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/snapshots" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + imagestore "github.com/containerd/containerd/v2/internal/cri/store/image" + snapshotstore "github.com/containerd/containerd/v2/internal/cri/store/snapshot" "github.com/containerd/containerd/v2/internal/kmutex" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" - snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/log" "github.com/containerd/platforms" diff --git a/pkg/cri/server/images/service_test.go b/internal/cri/server/images/service_test.go similarity index 94% rename from pkg/cri/server/images/service_test.go rename to internal/cri/server/images/service_test.go index 0e9272e66..edd93f5ce 100644 --- a/pkg/cri/server/images/service_test.go +++ b/internal/cri/server/images/service_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" - snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + imagestore "github.com/containerd/containerd/v2/internal/cri/store/image" + snapshotstore "github.com/containerd/containerd/v2/internal/cri/store/snapshot" "github.com/containerd/errdefs" "github.com/containerd/platforms" "github.com/stretchr/testify/assert" diff --git a/pkg/cri/server/images/snapshots.go b/internal/cri/server/images/snapshots.go similarity index 96% rename from pkg/cri/server/images/snapshots.go rename to internal/cri/server/images/snapshots.go index d8c98d69e..bd41e163d 100644 --- a/pkg/cri/server/images/snapshots.go +++ b/internal/cri/server/images/snapshots.go @@ -22,8 +22,8 @@ import ( "time" snapshot "github.com/containerd/containerd/v2/core/snapshots" - snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" - ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + snapshotstore "github.com/containerd/containerd/v2/internal/cri/store/snapshot" + ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/errdefs" "github.com/containerd/log" ) diff --git a/pkg/cri/server/list_metric_descriptors.go b/internal/cri/server/list_metric_descriptors.go similarity index 100% rename from pkg/cri/server/list_metric_descriptors.go rename to internal/cri/server/list_metric_descriptors.go diff --git a/pkg/cri/server/list_pod_sandbox_metrics.go b/internal/cri/server/list_pod_sandbox_metrics.go similarity index 100% rename from pkg/cri/server/list_pod_sandbox_metrics.go rename to internal/cri/server/list_pod_sandbox_metrics.go diff --git a/pkg/cri/server/metrics.go b/internal/cri/server/metrics.go similarity index 100% rename from pkg/cri/server/metrics.go rename to internal/cri/server/metrics.go diff --git a/pkg/cri/server/nri.go b/internal/cri/server/nri.go similarity index 78% rename from pkg/cri/server/nri.go rename to internal/cri/server/nri.go index 58ac0798e..f9f769e5f 100644 --- a/pkg/cri/server/nri.go +++ b/internal/cri/server/nri.go @@ -17,10 +17,10 @@ package server import ( - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" - 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" + crilabels "github.com/containerd/containerd/v2/internal/cri/labels" + cstore "github.com/containerd/containerd/v2/internal/cri/store/container" + sstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) type criImplementation struct { diff --git a/pkg/cri/server/nri_linux.go b/internal/cri/server/nri_linux.go similarity index 93% rename from pkg/cri/server/nri_linux.go rename to internal/cri/server/nri_linux.go index 6c33b01db..4f78f3380 100644 --- a/pkg/cri/server/nri_linux.go +++ b/internal/cri/server/nri_linux.go @@ -22,7 +22,7 @@ import ( "context" "time" - cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + cstore "github.com/containerd/containerd/v2/internal/cri/store/container" cri "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/nri_other.go b/internal/cri/server/nri_other.go similarity index 93% rename from pkg/cri/server/nri_other.go rename to internal/cri/server/nri_other.go index 51c7d3ccb..f4e8dfe10 100644 --- a/pkg/cri/server/nri_other.go +++ b/internal/cri/server/nri_other.go @@ -22,7 +22,7 @@ import ( "context" "time" - cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + cstore "github.com/containerd/containerd/v2/internal/cri/store/container" cri "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/podsandbox/container_linux.go b/internal/cri/server/podsandbox/container_linux.go similarity index 100% rename from pkg/cri/server/podsandbox/container_linux.go rename to internal/cri/server/podsandbox/container_linux.go diff --git a/pkg/cri/server/podsandbox/controller.go b/internal/cri/server/podsandbox/controller.go similarity index 94% rename from pkg/cri/server/podsandbox/controller.go rename to internal/cri/server/podsandbox/controller.go index 604b5168d..bce542912 100644 --- a/pkg/cri/server/podsandbox/controller.go +++ b/internal/cri/server/podsandbox/controller.go @@ -29,11 +29,11 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "github.com/containerd/containerd/v2/pkg/cri/constants" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" - imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" - ctrdutil "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/server/podsandbox/types" + imagestore "github.com/containerd/containerd/v2/internal/cri/store/image" + ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/containerd/v2/plugins" diff --git a/pkg/cri/server/podsandbox/controller_test.go b/internal/cri/server/podsandbox/controller_test.go similarity index 91% rename from pkg/cri/server/podsandbox/controller_test.go rename to internal/cri/server/podsandbox/controller_test.go index 3a1580a10..fccc24073 100644 --- a/pkg/cri/server/podsandbox/controller_test.go +++ b/internal/cri/server/podsandbox/controller_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" containerd "github.com/containerd/containerd/v2/client" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + "github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ostesting "github.com/containerd/containerd/v2/pkg/os/testing" ) diff --git a/pkg/cri/server/podsandbox/helpers.go b/internal/cri/server/podsandbox/helpers.go similarity index 95% rename from pkg/cri/server/podsandbox/helpers.go rename to internal/cri/server/podsandbox/helpers.go index 67b380d3a..3a0c376b6 100644 --- a/pkg/cri/server/podsandbox/helpers.go +++ b/internal/cri/server/podsandbox/helpers.go @@ -31,10 +31,10 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" - imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + crilabels "github.com/containerd/containerd/v2/internal/cri/labels" + imagestore "github.com/containerd/containerd/v2/internal/cri/store/image" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" clabels "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/oci" ) diff --git a/pkg/cri/server/podsandbox/helpers_linux.go b/internal/cri/server/podsandbox/helpers_linux.go similarity index 100% rename from pkg/cri/server/podsandbox/helpers_linux.go rename to internal/cri/server/podsandbox/helpers_linux.go diff --git a/pkg/cri/server/podsandbox/helpers_linux_test.go b/internal/cri/server/podsandbox/helpers_linux_test.go similarity index 100% rename from pkg/cri/server/podsandbox/helpers_linux_test.go rename to internal/cri/server/podsandbox/helpers_linux_test.go diff --git a/pkg/cri/server/podsandbox/helpers_other.go b/internal/cri/server/podsandbox/helpers_other.go similarity index 100% rename from pkg/cri/server/podsandbox/helpers_other.go rename to internal/cri/server/podsandbox/helpers_other.go diff --git a/pkg/cri/server/podsandbox/helpers_selinux_linux_test.go b/internal/cri/server/podsandbox/helpers_selinux_linux_test.go similarity index 100% rename from pkg/cri/server/podsandbox/helpers_selinux_linux_test.go rename to internal/cri/server/podsandbox/helpers_selinux_linux_test.go diff --git a/pkg/cri/server/podsandbox/helpers_test.go b/internal/cri/server/podsandbox/helpers_test.go similarity index 99% rename from pkg/cri/server/podsandbox/helpers_test.go rename to internal/cri/server/podsandbox/helpers_test.go index 5bff0cd5a..af4112169 100644 --- a/pkg/cri/server/podsandbox/helpers_test.go +++ b/internal/cri/server/podsandbox/helpers_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" + crilabels "github.com/containerd/containerd/v2/internal/cri/labels" "github.com/containerd/containerd/v2/pkg/oci" docker "github.com/distribution/reference" imagedigest "github.com/opencontainers/go-digest" diff --git a/pkg/cri/server/podsandbox/helpers_windows.go b/internal/cri/server/podsandbox/helpers_windows.go similarity index 100% rename from pkg/cri/server/podsandbox/helpers_windows.go rename to internal/cri/server/podsandbox/helpers_windows.go diff --git a/pkg/cri/server/podsandbox/opts.go b/internal/cri/server/podsandbox/opts.go similarity index 100% rename from pkg/cri/server/podsandbox/opts.go rename to internal/cri/server/podsandbox/opts.go diff --git a/pkg/cri/server/podsandbox/recover.go b/internal/cri/server/podsandbox/recover.go similarity index 96% rename from pkg/cri/server/podsandbox/recover.go rename to internal/cri/server/podsandbox/recover.go index 6ae3214c2..bd8c1fb56 100644 --- a/pkg/cri/server/podsandbox/recover.go +++ b/internal/cri/server/podsandbox/recover.go @@ -27,9 +27,9 @@ import ( containerd "github.com/containerd/containerd/v2/client" sandbox2 "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/containerd/v2/pkg/netns" "github.com/containerd/errdefs" ) diff --git a/pkg/cri/server/podsandbox/sandbox_delete.go b/internal/cri/server/podsandbox/sandbox_delete.go similarity index 100% rename from pkg/cri/server/podsandbox/sandbox_delete.go rename to internal/cri/server/podsandbox/sandbox_delete.go diff --git a/pkg/cri/server/podsandbox/sandbox_run.go b/internal/cri/server/podsandbox/sandbox_run.go similarity index 95% rename from pkg/cri/server/podsandbox/sandbox_run.go rename to internal/cri/server/podsandbox/sandbox_run.go index c791ff7ef..98b52d27e 100644 --- a/pkg/cri/server/podsandbox/sandbox_run.go +++ b/internal/cri/server/podsandbox/sandbox_run.go @@ -32,14 +32,14 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/snapshots" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + crilabels "github.com/containerd/containerd/v2/internal/cri/labels" + customopts "github.com/containerd/containerd/v2/internal/cri/opts" + "github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types" + imagestore "github.com/containerd/containerd/v2/internal/cri/store/image" + 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" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" - customopts "github.com/containerd/containerd/v2/pkg/cri/opts" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" - imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/errdefs" ) diff --git a/pkg/cri/server/podsandbox/sandbox_run_linux.go b/internal/cri/server/podsandbox/sandbox_run_linux.go similarity index 98% rename from pkg/cri/server/podsandbox/sandbox_run_linux.go rename to internal/cri/server/podsandbox/sandbox_run_linux.go index 6d0d7f2f8..125756b31 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_linux.go +++ b/internal/cri/server/podsandbox/sandbox_run_linux.go @@ -30,8 +30,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/pkg/cri/annotations" - customopts "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/internal/cri/annotations" + customopts "github.com/containerd/containerd/v2/internal/cri/opts" "github.com/containerd/containerd/v2/pkg/userns" ) diff --git a/pkg/cri/server/podsandbox/sandbox_run_linux_test.go b/internal/cri/server/podsandbox/sandbox_run_linux_test.go similarity index 99% rename from pkg/cri/server/podsandbox/sandbox_run_linux_test.go rename to internal/cri/server/podsandbox/sandbox_run_linux_test.go index 774df137b..2c480da98 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_linux_test.go +++ b/internal/cri/server/podsandbox/sandbox_run_linux_test.go @@ -30,8 +30,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" v1 "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/pkg/cri/annotations" - "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/internal/cri/annotations" + "github.com/containerd/containerd/v2/internal/cri/opts" ostesting "github.com/containerd/containerd/v2/pkg/os/testing" ) diff --git a/pkg/cri/server/podsandbox/sandbox_run_other.go b/internal/cri/server/podsandbox/sandbox_run_other.go similarity index 97% rename from pkg/cri/server/podsandbox/sandbox_run_other.go rename to internal/cri/server/podsandbox/sandbox_run_other.go index e3799b934..9aef21b8b 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_other.go +++ b/internal/cri/server/podsandbox/sandbox_run_other.go @@ -20,7 +20,7 @@ package podsandbox import ( "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/internal/cri/annotations" "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/podsandbox/sandbox_run_other_test.go b/internal/cri/server/podsandbox/sandbox_run_other_test.go similarity index 100% rename from pkg/cri/server/podsandbox/sandbox_run_other_test.go rename to internal/cri/server/podsandbox/sandbox_run_other_test.go diff --git a/pkg/cri/server/podsandbox/sandbox_run_test.go b/internal/cri/server/podsandbox/sandbox_run_test.go similarity index 98% rename from pkg/cri/server/podsandbox/sandbox_run_test.go rename to internal/cri/server/podsandbox/sandbox_run_test.go index 5399fe1e0..f74a24dc3 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_test.go +++ b/internal/cri/server/podsandbox/sandbox_run_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) func TestSandboxContainerSpec(t *testing.T) { diff --git a/pkg/cri/server/podsandbox/sandbox_run_windows.go b/internal/cri/server/podsandbox/sandbox_run_windows.go similarity index 96% rename from pkg/cri/server/podsandbox/sandbox_run_windows.go rename to internal/cri/server/podsandbox/sandbox_run_windows.go index e34aa63a4..cf8cad493 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_windows.go +++ b/internal/cri/server/podsandbox/sandbox_run_windows.go @@ -26,8 +26,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/pkg/cri/annotations" - customopts "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/internal/cri/annotations" + customopts "github.com/containerd/containerd/v2/internal/cri/opts" ) func (c *Controller) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig, diff --git a/pkg/cri/server/podsandbox/sandbox_run_windows_test.go b/internal/cri/server/podsandbox/sandbox_run_windows_test.go similarity index 97% rename from pkg/cri/server/podsandbox/sandbox_run_windows_test.go rename to internal/cri/server/podsandbox/sandbox_run_windows_test.go index 6d13385f1..d31ec6835 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_windows_test.go +++ b/internal/cri/server/podsandbox/sandbox_run_windows_test.go @@ -24,8 +24,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/opts" + "github.com/containerd/containerd/v2/internal/cri/annotations" + "github.com/containerd/containerd/v2/internal/cri/opts" ) func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) { diff --git a/pkg/cri/server/podsandbox/sandbox_stats.go b/internal/cri/server/podsandbox/sandbox_stats.go similarity index 100% rename from pkg/cri/server/podsandbox/sandbox_stats.go rename to internal/cri/server/podsandbox/sandbox_stats.go diff --git a/pkg/cri/server/podsandbox/sandbox_status.go b/internal/cri/server/podsandbox/sandbox_status.go similarity index 96% rename from pkg/cri/server/podsandbox/sandbox_status.go rename to internal/cri/server/podsandbox/sandbox_status.go index f48fddd4a..e6925b3dc 100644 --- a/pkg/cri/server/podsandbox/sandbox_status.go +++ b/internal/cri/server/podsandbox/sandbox_status.go @@ -26,8 +26,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" - critypes "github.com/containerd/containerd/v2/pkg/cri/types" + "github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types" + critypes "github.com/containerd/containerd/v2/internal/cri/types" "github.com/containerd/errdefs" ) diff --git a/pkg/cri/server/podsandbox/sandbox_stop.go b/internal/cri/server/podsandbox/sandbox_stop.go similarity index 95% rename from pkg/cri/server/podsandbox/sandbox_stop.go rename to internal/cri/server/podsandbox/sandbox_stop.go index d0c30580f..b625621f5 100644 --- a/pkg/cri/server/podsandbox/sandbox_stop.go +++ b/internal/cri/server/podsandbox/sandbox_stop.go @@ -27,9 +27,9 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/errdefs" ) diff --git a/pkg/cri/server/podsandbox/store.go b/internal/cri/server/podsandbox/store.go similarity index 93% rename from pkg/cri/server/podsandbox/store.go rename to internal/cri/server/podsandbox/store.go index 31248f1e1..c04d9228c 100644 --- a/pkg/cri/server/podsandbox/store.go +++ b/internal/cri/server/podsandbox/store.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" + "github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types" ) type Store struct { diff --git a/pkg/cri/server/podsandbox/types/podsandbox.go b/internal/cri/server/podsandbox/types/podsandbox.go similarity index 93% rename from pkg/cri/server/podsandbox/types/podsandbox.go rename to internal/cri/server/podsandbox/types/podsandbox.go index 321d845a7..5dd08e5bb 100644 --- a/pkg/cri/server/podsandbox/types/podsandbox.go +++ b/internal/cri/server/podsandbox/types/podsandbox.go @@ -23,8 +23,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/pkg/cri/store" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/internal/cri/store" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) type PodSandbox struct { diff --git a/pkg/cri/server/rdt.go b/internal/cri/server/rdt.go similarity index 100% rename from pkg/cri/server/rdt.go rename to internal/cri/server/rdt.go diff --git a/pkg/cri/server/rdt_stub.go b/internal/cri/server/rdt_stub.go similarity index 100% rename from pkg/cri/server/rdt_stub.go rename to internal/cri/server/rdt_stub.go diff --git a/pkg/cri/server/restart.go b/internal/cri/server/restart.go similarity index 97% rename from pkg/cri/server/restart.go rename to internal/cri/server/restart.go index a6353bc9c..63b87b37c 100644 --- a/pkg/cri/server/restart.go +++ b/internal/cri/server/restart.go @@ -24,10 +24,10 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + crilabels "github.com/containerd/containerd/v2/internal/cri/labels" + "github.com/containerd/containerd/v2/internal/cri/server/podsandbox" containerdio "github.com/containerd/containerd/v2/pkg/cio" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" "github.com/containerd/containerd/v2/pkg/netns" "github.com/containerd/errdefs" "github.com/containerd/log" @@ -35,10 +35,10 @@ import ( "golang.org/x/sync/errgroup" 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" ) // NOTE: The recovery logic has following assumption: when the cri plugin is down: diff --git a/pkg/cri/server/runtime_config.go b/internal/cri/server/runtime_config.go similarity index 100% rename from pkg/cri/server/runtime_config.go rename to internal/cri/server/runtime_config.go diff --git a/pkg/cri/server/runtime_config_linux.go b/internal/cri/server/runtime_config_linux.go similarity index 97% rename from pkg/cri/server/runtime_config_linux.go rename to internal/cri/server/runtime_config_linux.go index 2768620ea..f2cce470c 100644 --- a/pkg/cri/server/runtime_config_linux.go +++ b/internal/cri/server/runtime_config_linux.go @@ -21,7 +21,7 @@ import ( "sort" runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" "github.com/containerd/containerd/v2/pkg/systemd" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/runtime_config_linux_test.go b/internal/cri/server/runtime_config_linux_test.go similarity index 97% rename from pkg/cri/server/runtime_config_linux_test.go rename to internal/cri/server/runtime_config_linux_test.go index 4f409e21b..e42547974 100644 --- a/pkg/cri/server/runtime_config_linux_test.go +++ b/internal/cri/server/runtime_config_linux_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" "github.com/containerd/containerd/v2/pkg/systemd" "github.com/containerd/containerd/v2/plugins" "github.com/stretchr/testify/assert" diff --git a/pkg/cri/server/runtime_config_other.go b/internal/cri/server/runtime_config_other.go similarity index 100% rename from pkg/cri/server/runtime_config_other.go rename to internal/cri/server/runtime_config_other.go diff --git a/pkg/cri/server/sandbox_list.go b/internal/cri/server/sandbox_list.go similarity index 97% rename from pkg/cri/server/sandbox_list.go rename to internal/cri/server/sandbox_list.go index 890112c2e..f8eb4c54c 100644 --- a/pkg/cri/server/sandbox_list.go +++ b/internal/cri/server/sandbox_list.go @@ -22,7 +22,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) // ListPodSandbox returns a list of Sandbox. diff --git a/pkg/cri/server/sandbox_list_test.go b/internal/cri/server/sandbox_list_test.go similarity index 98% rename from pkg/cri/server/sandbox_list_test.go rename to internal/cri/server/sandbox_list_test.go index b4fa895e5..a4e9c6cfb 100644 --- a/pkg/cri/server/sandbox_list_test.go +++ b/internal/cri/server/sandbox_list_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) func TestToCRISandbox(t *testing.T) { diff --git a/pkg/cri/server/sandbox_portforward.go b/internal/cri/server/sandbox_portforward.go similarity index 94% rename from pkg/cri/server/sandbox_portforward.go rename to internal/cri/server/sandbox_portforward.go index e4595cdc9..6b3478cec 100644 --- a/pkg/cri/server/sandbox_portforward.go +++ b/internal/cri/server/sandbox_portforward.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) // PortForward prepares a streaming endpoint to forward ports from a PodSandbox, and returns the address. diff --git a/pkg/cri/server/sandbox_portforward_linux.go b/internal/cri/server/sandbox_portforward_linux.go similarity index 100% rename from pkg/cri/server/sandbox_portforward_linux.go rename to internal/cri/server/sandbox_portforward_linux.go diff --git a/pkg/cri/server/sandbox_portforward_other.go b/internal/cri/server/sandbox_portforward_other.go similarity index 100% rename from pkg/cri/server/sandbox_portforward_other.go rename to internal/cri/server/sandbox_portforward_other.go diff --git a/pkg/cri/server/sandbox_portforward_windows.go b/internal/cri/server/sandbox_portforward_windows.go similarity index 96% rename from pkg/cri/server/sandbox_portforward_windows.go rename to internal/cri/server/sandbox_portforward_windows.go index cdb75a917..d6c4316f5 100644 --- a/pkg/cri/server/sandbox_portforward_windows.go +++ b/internal/cri/server/sandbox_portforward_windows.go @@ -24,7 +24,7 @@ import ( "k8s.io/utils/exec" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" cioutil "github.com/containerd/containerd/v2/pkg/ioutil" ) diff --git a/pkg/cri/server/sandbox_remove.go b/internal/cri/server/sandbox_remove.go similarity index 100% rename from pkg/cri/server/sandbox_remove.go rename to internal/cri/server/sandbox_remove.go diff --git a/pkg/cri/server/sandbox_run.go b/internal/cri/server/sandbox_run.go similarity index 98% rename from pkg/cri/server/sandbox_run.go rename to internal/cri/server/sandbox_run.go index 516ab3ac8..d2d6822bd 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/internal/cri/server/sandbox_run.go @@ -33,12 +33,12 @@ import ( containerd "github.com/containerd/containerd/v2/client" sb "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/pkg/cri/annotations" - "github.com/containerd/containerd/v2/pkg/cri/bandwidth" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/internal/cri/annotations" + "github.com/containerd/containerd/v2/internal/cri/bandwidth" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + "github.com/containerd/containerd/v2/internal/cri/server/podsandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" + "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/containerd/v2/pkg/netns" ) diff --git a/pkg/cri/server/sandbox_run_test.go b/internal/cri/server/sandbox_run_test.go similarity index 100% rename from pkg/cri/server/sandbox_run_test.go rename to internal/cri/server/sandbox_run_test.go diff --git a/pkg/cri/server/sandbox_service.go b/internal/cri/server/sandbox_service.go similarity index 95% rename from pkg/cri/server/sandbox_service.go rename to internal/cri/server/sandbox_service.go index 4371bca86..b4041ccd5 100644 --- a/pkg/cri/server/sandbox_service.go +++ b/internal/cri/server/sandbox_service.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" ) type criSandboxService struct { diff --git a/pkg/cri/server/sandbox_stats.go b/internal/cri/server/sandbox_stats.go similarity index 100% rename from pkg/cri/server/sandbox_stats.go rename to internal/cri/server/sandbox_stats.go diff --git a/pkg/cri/server/sandbox_stats_linux.go b/internal/cri/server/sandbox_stats_linux.go similarity index 98% rename from pkg/cri/server/sandbox_stats_linux.go rename to internal/cri/server/sandbox_stats_linux.go index a781db4a0..e1e07d99d 100644 --- a/pkg/cri/server/sandbox_stats_linux.go +++ b/internal/cri/server/sandbox_stats_linux.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containernetworking/plugins/pkg/ns" diff --git a/pkg/cri/server/sandbox_stats_list.go b/internal/cri/server/sandbox_stats_list.go similarity index 96% rename from pkg/cri/server/sandbox_stats_list.go rename to internal/cri/server/sandbox_stats_list.go index 95381bbb7..a4f9f826f 100644 --- a/pkg/cri/server/sandbox_stats_list.go +++ b/internal/cri/server/sandbox_stats_list.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" "github.com/containerd/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_stats_other.go b/internal/cri/server/sandbox_stats_other.go similarity index 92% rename from pkg/cri/server/sandbox_stats_other.go rename to internal/cri/server/sandbox_stats_other.go index 585a478ca..c84ea50d2 100644 --- a/pkg/cri/server/sandbox_stats_other.go +++ b/internal/cri/server/sandbox_stats_other.go @@ -22,7 +22,7 @@ import ( "context" "fmt" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_stats_windows.go b/internal/cri/server/sandbox_stats_windows.go similarity index 98% rename from pkg/cri/server/sandbox_stats_windows.go rename to internal/cri/server/sandbox_stats_windows.go index 6fb9773f9..bc5e77142 100644 --- a/pkg/cri/server/sandbox_stats_windows.go +++ b/internal/cri/server/sandbox_stats_windows.go @@ -26,10 +26,10 @@ import ( "github.com/Microsoft/hcsshim/hcn" "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" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - "github.com/containerd/containerd/v2/pkg/cri/store/stats" - ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" + "github.com/containerd/containerd/v2/internal/cri/store/stats" + ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/errdefs" "github.com/containerd/log" diff --git a/pkg/cri/server/sandbox_stats_windows_test.go b/internal/cri/server/sandbox_stats_windows_test.go similarity index 98% rename from pkg/cri/server/sandbox_stats_windows_test.go rename to internal/cri/server/sandbox_stats_windows_test.go index 17d5872c9..c14d9b11e 100644 --- a/pkg/cri/server/sandbox_stats_windows_test.go +++ b/internal/cri/server/sandbox_stats_windows_test.go @@ -21,9 +21,9 @@ import ( "time" wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats" - 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/pkg/cri/store/stats" + containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" + "github.com/containerd/containerd/v2/internal/cri/store/stats" "github.com/containerd/containerd/v2/protobuf" "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_status.go b/internal/cri/server/sandbox_status.go similarity index 97% rename from pkg/cri/server/sandbox_status.go rename to internal/cri/server/sandbox_status.go index 5dc9163a9..b0c1f728f 100644 --- a/pkg/cri/server/sandbox_status.go +++ b/internal/cri/server/sandbox_status.go @@ -24,8 +24,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - "github.com/containerd/containerd/v2/pkg/cri/types" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" + "github.com/containerd/containerd/v2/internal/cri/types" "github.com/containerd/errdefs" ) diff --git a/pkg/cri/server/sandbox_status_test.go b/internal/cri/server/sandbox_status_test.go similarity index 97% rename from pkg/cri/server/sandbox_status_test.go rename to internal/cri/server/sandbox_status_test.go index 19975ce88..3516ab8d3 100644 --- a/pkg/cri/server/sandbox_status_test.go +++ b/internal/cri/server/sandbox_status_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) func TestPodSandboxStatus(t *testing.T) { diff --git a/pkg/cri/server/sandbox_stop.go b/internal/cri/server/sandbox_stop.go similarity index 98% rename from pkg/cri/server/sandbox_stop.go rename to internal/cri/server/sandbox_stop.go index 687962726..889bd75ec 100644 --- a/pkg/cri/server/sandbox_stop.go +++ b/internal/cri/server/sandbox_stop.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" "github.com/containerd/errdefs" ) diff --git a/pkg/cri/server/sandbox_stop_test.go b/internal/cri/server/sandbox_stop_test.go similarity index 96% rename from pkg/cri/server/sandbox_stop_test.go rename to internal/cri/server/sandbox_stop_test.go index 7fad6b01b..34844c743 100644 --- a/pkg/cri/server/sandbox_stop_test.go +++ b/internal/cri/server/sandbox_stop_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) func TestWaitSandboxStop(t *testing.T) { diff --git a/pkg/cri/server/service.go b/internal/cri/server/service.go similarity index 94% rename from pkg/cri/server/service.go rename to internal/cri/server/service.go index 825287456..1f77da0e8 100644 --- a/pkg/cri/server/service.go +++ b/internal/cri/server/service.go @@ -33,17 +33,17 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + "github.com/containerd/containerd/v2/internal/cri/nri" + "github.com/containerd/containerd/v2/internal/cri/server/podsandbox" + containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" + imagestore "github.com/containerd/containerd/v2/internal/cri/store/image" + "github.com/containerd/containerd/v2/internal/cri/store/label" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" + snapshotstore "github.com/containerd/containerd/v2/internal/cri/store/snapshot" + ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/containerd/v2/internal/eventq" "github.com/containerd/containerd/v2/internal/registrar" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "github.com/containerd/containerd/v2/pkg/cri/nri" - "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" - containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" - imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" - "github.com/containerd/containerd/v2/pkg/cri/store/label" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" - ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" ) diff --git a/pkg/cri/server/service_linux.go b/internal/cri/server/service_linux.go similarity index 100% rename from pkg/cri/server/service_linux.go rename to internal/cri/server/service_linux.go diff --git a/pkg/cri/server/service_other.go b/internal/cri/server/service_other.go similarity index 100% rename from pkg/cri/server/service_other.go rename to internal/cri/server/service_other.go diff --git a/pkg/cri/server/service_test.go b/internal/cri/server/service_test.go similarity index 91% rename from pkg/cri/server/service_test.go rename to internal/cri/server/service_test.go index f6d2c1d5f..2507632bb 100644 --- a/pkg/cri/server/service_test.go +++ b/internal/cri/server/service_test.go @@ -24,12 +24,12 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/sandbox" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" + "github.com/containerd/containerd/v2/internal/cri/store/label" + sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" + servertesting "github.com/containerd/containerd/v2/internal/cri/testing" "github.com/containerd/containerd/v2/internal/registrar" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" - "github.com/containerd/containerd/v2/pkg/cri/store/label" - sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - servertesting "github.com/containerd/containerd/v2/pkg/cri/testing" "github.com/containerd/containerd/v2/pkg/oci" ostesting "github.com/containerd/containerd/v2/pkg/os/testing" "github.com/containerd/errdefs" diff --git a/pkg/cri/server/service_windows.go b/internal/cri/server/service_windows.go similarity index 100% rename from pkg/cri/server/service_windows.go rename to internal/cri/server/service_windows.go diff --git a/pkg/cri/server/status.go b/internal/cri/server/status.go similarity index 100% rename from pkg/cri/server/status.go rename to internal/cri/server/status.go diff --git a/pkg/cri/server/streaming.go b/internal/cri/server/streaming.go similarity index 97% rename from pkg/cri/server/streaming.go rename to internal/cri/server/streaming.go index d3e9f9f27..9cf1870b4 100644 --- a/pkg/cri/server/streaming.go +++ b/internal/cri/server/streaming.go @@ -26,7 +26,7 @@ import ( "k8s.io/client-go/tools/remotecommand" "k8s.io/utils/exec" - ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" "k8s.io/kubelet/pkg/cri/streaming" ) diff --git a/pkg/cri/server/test_config.go b/internal/cri/server/test_config.go similarity index 93% rename from pkg/cri/server/test_config.go rename to internal/cri/server/test_config.go index 6c0eaeaf7..bbec77160 100644 --- a/pkg/cri/server/test_config.go +++ b/internal/cri/server/test_config.go @@ -16,7 +16,7 @@ package server -import criconfig "github.com/containerd/containerd/v2/pkg/cri/config" +import criconfig "github.com/containerd/containerd/v2/internal/cri/config" const ( testRootDir = "/test/root" diff --git a/pkg/cri/server/update_runtime_config.go b/internal/cri/server/update_runtime_config.go similarity index 100% rename from pkg/cri/server/update_runtime_config.go rename to internal/cri/server/update_runtime_config.go diff --git a/pkg/cri/server/update_runtime_config_test.go b/internal/cri/server/update_runtime_config_test.go similarity index 96% rename from pkg/cri/server/update_runtime_config_test.go rename to internal/cri/server/update_runtime_config_test.go index a78b64a20..85a6612b4 100644 --- a/pkg/cri/server/update_runtime_config_test.go +++ b/internal/cri/server/update_runtime_config_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - servertesting "github.com/containerd/containerd/v2/pkg/cri/testing" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + servertesting "github.com/containerd/containerd/v2/internal/cri/testing" ) func TestUpdateRuntimeConfig(t *testing.T) { diff --git a/pkg/cri/server/version.go b/internal/cri/server/version.go similarity index 95% rename from pkg/cri/server/version.go rename to internal/cri/server/version.go index ef68e9f43..6c9415dba 100644 --- a/pkg/cri/server/version.go +++ b/internal/cri/server/version.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/version" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/pkg/cri/constants" + "github.com/containerd/containerd/v2/internal/cri/constants" ) const ( diff --git a/pkg/cri/store/container/container.go b/internal/cri/store/container/container.go similarity index 95% rename from pkg/cri/store/container/container.go rename to internal/cri/store/container/container.go index e3839c6d4..6054a1576 100644 --- a/pkg/cri/store/container/container.go +++ b/internal/cri/store/container/container.go @@ -20,11 +20,11 @@ import ( "sync" containerd "github.com/containerd/containerd/v2/client" + cio "github.com/containerd/containerd/v2/internal/cri/io" + "github.com/containerd/containerd/v2/internal/cri/store" + "github.com/containerd/containerd/v2/internal/cri/store/label" + "github.com/containerd/containerd/v2/internal/cri/store/stats" "github.com/containerd/containerd/v2/internal/truncindex" - cio "github.com/containerd/containerd/v2/pkg/cri/io" - "github.com/containerd/containerd/v2/pkg/cri/store" - "github.com/containerd/containerd/v2/pkg/cri/store/label" - "github.com/containerd/containerd/v2/pkg/cri/store/stats" "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/store/container/container_test.go b/internal/cri/store/container/container_test.go similarity index 97% rename from pkg/cri/store/container/container_test.go rename to internal/cri/store/container/container_test.go index 56143c5b5..ee41422c9 100644 --- a/pkg/cri/store/container/container_test.go +++ b/internal/cri/store/container/container_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - cio "github.com/containerd/containerd/v2/pkg/cri/io" - "github.com/containerd/containerd/v2/pkg/cri/store/label" - "github.com/containerd/containerd/v2/pkg/cri/store/stats" + cio "github.com/containerd/containerd/v2/internal/cri/io" + "github.com/containerd/containerd/v2/internal/cri/store/label" + "github.com/containerd/containerd/v2/internal/cri/store/stats" "github.com/containerd/errdefs" "github.com/opencontainers/selinux/go-selinux" diff --git a/pkg/cri/store/container/fake_status.go b/internal/cri/store/container/fake_status.go similarity index 100% rename from pkg/cri/store/container/fake_status.go rename to internal/cri/store/container/fake_status.go diff --git a/pkg/cri/store/container/metadata.go b/internal/cri/store/container/metadata.go similarity index 100% rename from pkg/cri/store/container/metadata.go rename to internal/cri/store/container/metadata.go diff --git a/pkg/cri/store/container/metadata_test.go b/internal/cri/store/container/metadata_test.go similarity index 100% rename from pkg/cri/store/container/metadata_test.go rename to internal/cri/store/container/metadata_test.go diff --git a/pkg/cri/store/container/status.go b/internal/cri/store/container/status.go similarity index 100% rename from pkg/cri/store/container/status.go rename to internal/cri/store/container/status.go diff --git a/pkg/cri/store/container/status_test.go b/internal/cri/store/container/status_test.go similarity index 100% rename from pkg/cri/store/container/status_test.go rename to internal/cri/store/container/status_test.go diff --git a/pkg/cri/store/image/fake_image.go b/internal/cri/store/image/fake_image.go similarity index 100% rename from pkg/cri/store/image/fake_image.go rename to internal/cri/store/image/fake_image.go diff --git a/pkg/cri/store/image/image.go b/internal/cri/store/image/image.go similarity index 98% rename from pkg/cri/store/image/image.go rename to internal/cri/store/image/image.go index bcbd515df..5887e757b 100644 --- a/pkg/cri/store/image/image.go +++ b/internal/cri/store/image/image.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/usage" - "github.com/containerd/containerd/v2/pkg/cri/labels" - "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/internal/cri/labels" + "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/errdefs" "github.com/containerd/platforms" docker "github.com/distribution/reference" diff --git a/pkg/cri/store/image/image_test.go b/internal/cri/store/image/image_test.go similarity index 100% rename from pkg/cri/store/image/image_test.go rename to internal/cri/store/image/image_test.go diff --git a/pkg/cri/store/label/label.go b/internal/cri/store/label/label.go similarity index 100% rename from pkg/cri/store/label/label.go rename to internal/cri/store/label/label.go diff --git a/pkg/cri/store/label/label_test.go b/internal/cri/store/label/label_test.go similarity index 100% rename from pkg/cri/store/label/label_test.go rename to internal/cri/store/label/label_test.go diff --git a/pkg/cri/store/sandbox/metadata.go b/internal/cri/store/sandbox/metadata.go similarity index 100% rename from pkg/cri/store/sandbox/metadata.go rename to internal/cri/store/sandbox/metadata.go diff --git a/pkg/cri/store/sandbox/metadata_test.go b/internal/cri/store/sandbox/metadata_test.go similarity index 100% rename from pkg/cri/store/sandbox/metadata_test.go rename to internal/cri/store/sandbox/metadata_test.go diff --git a/pkg/cri/store/sandbox/sandbox.go b/internal/cri/store/sandbox/sandbox.go similarity index 95% rename from pkg/cri/store/sandbox/sandbox.go rename to internal/cri/store/sandbox/sandbox.go index 9e4aa58cb..40074069e 100644 --- a/pkg/cri/store/sandbox/sandbox.go +++ b/internal/cri/store/sandbox/sandbox.go @@ -20,10 +20,10 @@ import ( "sync" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/internal/cri/store" + "github.com/containerd/containerd/v2/internal/cri/store/label" + "github.com/containerd/containerd/v2/internal/cri/store/stats" "github.com/containerd/containerd/v2/internal/truncindex" - "github.com/containerd/containerd/v2/pkg/cri/store" - "github.com/containerd/containerd/v2/pkg/cri/store/label" - "github.com/containerd/containerd/v2/pkg/cri/store/stats" "github.com/containerd/containerd/v2/pkg/netns" "github.com/containerd/errdefs" ) diff --git a/pkg/cri/store/sandbox/sandbox_test.go b/internal/cri/store/sandbox/sandbox_test.go similarity index 97% rename from pkg/cri/store/sandbox/sandbox_test.go rename to internal/cri/store/sandbox/sandbox_test.go index 5e70f75d2..a79df9092 100644 --- a/pkg/cri/store/sandbox/sandbox_test.go +++ b/internal/cri/store/sandbox/sandbox_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/pkg/cri/store/label" - "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/internal/cri/store/label" + "github.com/containerd/containerd/v2/internal/cri/store/stats" "github.com/containerd/errdefs" assertlib "github.com/stretchr/testify/assert" diff --git a/pkg/cri/store/sandbox/status.go b/internal/cri/store/sandbox/status.go similarity index 100% rename from pkg/cri/store/sandbox/status.go rename to internal/cri/store/sandbox/status.go diff --git a/pkg/cri/store/sandbox/status_test.go b/internal/cri/store/sandbox/status_test.go similarity index 100% rename from pkg/cri/store/sandbox/status_test.go rename to internal/cri/store/sandbox/status_test.go diff --git a/pkg/cri/store/snapshot/snapshot.go b/internal/cri/store/snapshot/snapshot.go similarity index 100% rename from pkg/cri/store/snapshot/snapshot.go rename to internal/cri/store/snapshot/snapshot.go diff --git a/pkg/cri/store/snapshot/snapshot_test.go b/internal/cri/store/snapshot/snapshot_test.go similarity index 100% rename from pkg/cri/store/snapshot/snapshot_test.go rename to internal/cri/store/snapshot/snapshot_test.go diff --git a/pkg/cri/store/stats/stats.go b/internal/cri/store/stats/stats.go similarity index 100% rename from pkg/cri/store/stats/stats.go rename to internal/cri/store/stats/stats.go diff --git a/pkg/cri/store/util.go b/internal/cri/store/util.go similarity index 100% rename from pkg/cri/store/util.go rename to internal/cri/store/util.go diff --git a/pkg/cri/testing/fake_cni_plugin.go b/internal/cri/testing/fake_cni_plugin.go similarity index 100% rename from pkg/cri/testing/fake_cni_plugin.go rename to internal/cri/testing/fake_cni_plugin.go diff --git a/pkg/cri/types/sandbox_info.go b/internal/cri/types/sandbox_info.go similarity index 96% rename from pkg/cri/types/sandbox_info.go rename to internal/cri/types/sandbox_info.go index 1f5e63c8d..bfb36f2e4 100644 --- a/pkg/cri/types/sandbox_info.go +++ b/internal/cri/types/sandbox_info.go @@ -21,7 +21,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) // SandboxInfo is extra information for sandbox. diff --git a/pkg/cri/util/deep_copy.go b/internal/cri/util/deep_copy.go similarity index 100% rename from pkg/cri/util/deep_copy.go rename to internal/cri/util/deep_copy.go diff --git a/pkg/cri/util/deep_copy_test.go b/internal/cri/util/deep_copy_test.go similarity index 100% rename from pkg/cri/util/deep_copy_test.go rename to internal/cri/util/deep_copy_test.go diff --git a/pkg/cri/util/id.go b/internal/cri/util/id.go similarity index 100% rename from pkg/cri/util/id.go rename to internal/cri/util/id.go diff --git a/pkg/cri/util/references.go b/internal/cri/util/references.go similarity index 100% rename from pkg/cri/util/references.go rename to internal/cri/util/references.go diff --git a/pkg/cri/util/strings.go b/internal/cri/util/strings.go similarity index 100% rename from pkg/cri/util/strings.go rename to internal/cri/util/strings.go diff --git a/pkg/cri/util/strings_test.go b/internal/cri/util/strings_test.go similarity index 100% rename from pkg/cri/util/strings_test.go rename to internal/cri/util/strings_test.go diff --git a/pkg/cri/util/util.go b/internal/cri/util/util.go similarity index 95% rename from pkg/cri/util/util.go rename to internal/cri/util/util.go index 0f641b72d..3eb1d644d 100644 --- a/pkg/cri/util/util.go +++ b/internal/cri/util/util.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/pkg/cri/constants" + "github.com/containerd/containerd/v2/internal/cri/constants" ) // deferCleanupTimeout is the default timeout for containerd cleanup operations diff --git a/plugins/cri/cri.go b/plugins/cri/cri.go index 1f1956c89..1747b6b4f 100644 --- a/plugins/cri/cri.go +++ b/plugins/cri/cri.go @@ -28,11 +28,11 @@ import ( containerd "github.com/containerd/containerd/v2/client" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/sandbox" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "github.com/containerd/containerd/v2/pkg/cri/constants" - "github.com/containerd/containerd/v2/pkg/cri/instrument" - "github.com/containerd/containerd/v2/pkg/cri/nri" - "github.com/containerd/containerd/v2/pkg/cri/server" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + "github.com/containerd/containerd/v2/internal/cri/constants" + "github.com/containerd/containerd/v2/internal/cri/instrument" + "github.com/containerd/containerd/v2/internal/cri/nri" + "github.com/containerd/containerd/v2/internal/cri/server" nriservice "github.com/containerd/containerd/v2/pkg/nri" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/warning" diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go index a0f2de88c..f2ae02f4e 100644 --- a/plugins/cri/images/plugin.go +++ b/plugins/cri/images/plugin.go @@ -25,9 +25,9 @@ import ( srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/snapshots" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "github.com/containerd/containerd/v2/pkg/cri/constants" - "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/constants" + "github.com/containerd/containerd/v2/internal/cri/server/images" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/warning" diff --git a/plugins/cri/runtime/load_test.go b/plugins/cri/runtime/load_test.go index 2abd21580..a808e6df8 100644 --- a/plugins/cri/runtime/load_test.go +++ b/plugins/cri/runtime/load_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" "github.com/containerd/containerd/v2/pkg/oci" ) diff --git a/plugins/cri/runtime/plugin.go b/plugins/cri/runtime/plugin.go index 521f6ed7b..8b97752d0 100644 --- a/plugins/cri/runtime/plugin.go +++ b/plugins/cri/runtime/plugin.go @@ -32,8 +32,8 @@ import ( "k8s.io/klog/v2" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" - criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "github.com/containerd/containerd/v2/pkg/cri/constants" + criconfig "github.com/containerd/containerd/v2/internal/cri/config" + "github.com/containerd/containerd/v2/internal/cri/constants" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services"