diff --git a/integration/main_test.go b/integration/main_test.go index c68ddec7e..6c6112718 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -44,7 +44,7 @@ import ( criconfig "github.com/containerd/containerd/pkg/cri/config" "github.com/containerd/containerd/pkg/cri/constants" "github.com/containerd/containerd/pkg/cri/server" - "github.com/containerd/containerd/pkg/util" + "github.com/containerd/containerd/pkg/cri/util" ) const ( diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go index 1e5bf4120..2307302d2 100644 --- a/pkg/cri/cri.go +++ b/pkg/cri/cri.go @@ -39,9 +39,9 @@ import ( "github.com/sirupsen/logrus" "k8s.io/klog/v2" - criplatforms "github.com/containerd/containerd/pkg/containerd/platforms" criconfig "github.com/containerd/containerd/pkg/cri/config" "github.com/containerd/containerd/pkg/cri/constants" + criplatforms "github.com/containerd/containerd/pkg/cri/platforms" "github.com/containerd/containerd/pkg/cri/server" ) diff --git a/pkg/cri/io/container_io.go b/pkg/cri/io/container_io.go index edb929e93..b34865db4 100644 --- a/pkg/cri/io/container_io.go +++ b/pkg/cri/io/container_io.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd/cio" "github.com/sirupsen/logrus" + "github.com/containerd/containerd/pkg/cri/util" cioutil "github.com/containerd/containerd/pkg/ioutil" - "github.com/containerd/containerd/pkg/util" ) // streamKey generates a key for the stream. diff --git a/pkg/containerd/opts/container.go b/pkg/cri/opts/container.go similarity index 100% rename from pkg/containerd/opts/container.go rename to pkg/cri/opts/container.go diff --git a/pkg/containerd/opts/spec.go b/pkg/cri/opts/spec.go similarity index 100% rename from pkg/containerd/opts/spec.go rename to pkg/cri/opts/spec.go diff --git a/pkg/containerd/opts/spec_linux.go b/pkg/cri/opts/spec_linux.go similarity index 99% rename from pkg/containerd/opts/spec_linux.go rename to pkg/cri/opts/spec_linux.go index a52c68a3c..c6e6cab89 100644 --- a/pkg/containerd/opts/spec_linux.go +++ b/pkg/cri/opts/spec_linux.go @@ -40,8 +40,8 @@ import ( "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + "github.com/containerd/containerd/pkg/cri/util" osinterface "github.com/containerd/containerd/pkg/os" - "github.com/containerd/containerd/pkg/util" ) // WithAdditionalGIDs adds any additional groups listed for a particular user in the diff --git a/pkg/containerd/opts/spec_linux_test.go b/pkg/cri/opts/spec_linux_test.go similarity index 100% rename from pkg/containerd/opts/spec_linux_test.go rename to pkg/cri/opts/spec_linux_test.go diff --git a/pkg/containerd/opts/spec_test.go b/pkg/cri/opts/spec_test.go similarity index 100% rename from pkg/containerd/opts/spec_test.go rename to pkg/cri/opts/spec_test.go diff --git a/pkg/containerd/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go similarity index 100% rename from pkg/containerd/opts/spec_windows.go rename to pkg/cri/opts/spec_windows.go diff --git a/pkg/containerd/opts/task.go b/pkg/cri/opts/task.go similarity index 100% rename from pkg/containerd/opts/task.go rename to pkg/cri/opts/task.go diff --git a/pkg/containerd/platforms/default_unix.go b/pkg/cri/platforms/default_unix.go similarity index 100% rename from pkg/containerd/platforms/default_unix.go rename to pkg/cri/platforms/default_unix.go diff --git a/pkg/containerd/platforms/default_windows.go b/pkg/cri/platforms/default_windows.go similarity index 100% rename from pkg/containerd/platforms/default_windows.go rename to pkg/cri/platforms/default_windows.go diff --git a/pkg/containerd/platforms/default_windows_test.go b/pkg/cri/platforms/default_windows_test.go similarity index 100% rename from pkg/containerd/platforms/default_windows_test.go rename to pkg/cri/platforms/default_windows_test.go diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go index f72f89982..2b4871016 100644 --- a/pkg/cri/server/container_create.go +++ b/pkg/cri/server/container_create.go @@ -33,11 +33,11 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - customopts "github.com/containerd/containerd/pkg/containerd/opts" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" cio "github.com/containerd/containerd/pkg/cri/io" + customopts "github.com/containerd/containerd/pkg/cri/opts" containerstore "github.com/containerd/containerd/pkg/cri/store/container" - "github.com/containerd/containerd/pkg/util" + "github.com/containerd/containerd/pkg/cri/util" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) func init() { diff --git a/pkg/cri/server/container_create_linux.go b/pkg/cri/server/container_create_linux.go index 6137c87de..3e6579093 100644 --- a/pkg/cri/server/container_create_linux.go +++ b/pkg/cri/server/container_create_linux.go @@ -34,9 +34,9 @@ import ( "github.com/pkg/errors" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - customopts "github.com/containerd/containerd/pkg/containerd/opts" "github.com/containerd/containerd/pkg/cri/annotations" "github.com/containerd/containerd/pkg/cri/config" + customopts "github.com/containerd/containerd/pkg/cri/opts" ) const ( diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index 74f9869ea..6cad5f5c1 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -40,12 +40,12 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/containerd/opts" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" "github.com/containerd/containerd/pkg/cri/annotations" "github.com/containerd/containerd/pkg/cri/config" + "github.com/containerd/containerd/pkg/cri/opts" + "github.com/containerd/containerd/pkg/cri/util" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" ostesting "github.com/containerd/containerd/pkg/os/testing" - "github.com/containerd/containerd/pkg/util" ) func getCreateContainerTestData() (*runtime.ContainerConfig, *runtime.PodSandboxConfig, diff --git a/pkg/cri/server/container_create_test.go b/pkg/cri/server/container_create_test.go index 9fdeabd27..ce1bfb5af 100644 --- a/pkg/cri/server/container_create_test.go +++ b/pkg/cri/server/container_create_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/containerd/opts" "github.com/containerd/containerd/pkg/cri/config" "github.com/containerd/containerd/pkg/cri/constants" + "github.com/containerd/containerd/pkg/cri/opts" ) func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string, diff --git a/pkg/cri/server/container_create_windows.go b/pkg/cri/server/container_create_windows.go index ea98bea42..f897e6292 100644 --- a/pkg/cri/server/container_create_windows.go +++ b/pkg/cri/server/container_create_windows.go @@ -24,9 +24,9 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - customopts "github.com/containerd/containerd/pkg/containerd/opts" "github.com/containerd/containerd/pkg/cri/annotations" "github.com/containerd/containerd/pkg/cri/config" + customopts "github.com/containerd/containerd/pkg/cri/opts" ) // No container mounts for windows. diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index 1290088c7..84eba44bd 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -32,10 +32,10 @@ import ( "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" cio "github.com/containerd/containerd/pkg/cri/io" + "github.com/containerd/containerd/pkg/cri/util" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" cioutil "github.com/containerd/containerd/pkg/ioutil" - "github.com/containerd/containerd/pkg/util" ) // ExecSync executes a command in the container, and returns the stdout output. diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index 9ad403ae5..285b98a06 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -31,10 +31,10 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" cio "github.com/containerd/containerd/pkg/cri/io" containerstore "github.com/containerd/containerd/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" cioutil "github.com/containerd/containerd/pkg/ioutil" ) diff --git a/pkg/cri/server/container_stop.go b/pkg/cri/server/container_stop.go index 4ca297d1c..657d2e10d 100644 --- a/pkg/cri/server/container_stop.go +++ b/pkg/cri/server/container_stop.go @@ -28,9 +28,9 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" "github.com/containerd/containerd/pkg/cri/store" containerstore "github.com/containerd/containerd/pkg/cri/store/container" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) // StopContainer stops a running container with a grace period (i.e., timeout). diff --git a/pkg/cri/server/container_update_resources_linux.go b/pkg/cri/server/container_update_resources_linux.go index 3f791fd7f..787b7a665 100644 --- a/pkg/cri/server/container_update_resources_linux.go +++ b/pkg/cri/server/container_update_resources_linux.go @@ -29,10 +29,10 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/containerd/opts" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" + "github.com/containerd/containerd/pkg/cri/opts" containerstore "github.com/containerd/containerd/pkg/cri/store/container" - "github.com/containerd/containerd/pkg/util" + "github.com/containerd/containerd/pkg/cri/util" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) // UpdateContainerResources updates ContainerConfig of the container. diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 771693808..c8ed431f8 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -32,11 +32,11 @@ import ( "golang.org/x/net/context" "k8s.io/apimachinery/pkg/util/clock" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" "github.com/containerd/containerd/pkg/cri/constants" "github.com/containerd/containerd/pkg/cri/store" containerstore "github.com/containerd/containerd/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) const ( diff --git a/pkg/cri/server/instrumented_service.go b/pkg/cri/server/instrumented_service.go index 9d3288c48..ba7e323ff 100644 --- a/pkg/cri/server/instrumented_service.go +++ b/pkg/cri/server/instrumented_service.go @@ -24,7 +24,7 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) // instrumentedService wraps service with containerd namespace and logs. diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index 1b05c8ac7..987a5d940 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -34,10 +34,10 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" cio "github.com/containerd/containerd/pkg/cri/io" containerstore "github.com/containerd/containerd/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/pkg/netns" ) diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index bd3c071ab..29d3f3506 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -36,14 +36,14 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - customopts "github.com/containerd/containerd/pkg/containerd/opts" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" + customopts "github.com/containerd/containerd/pkg/cri/opts" "github.com/containerd/containerd/pkg/cri/server/bandwidth" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/pkg/cri/util" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/pkg/netns" - "github.com/containerd/containerd/pkg/util" selinux "github.com/opencontainers/selinux/go-selinux" ) diff --git a/pkg/cri/server/sandbox_run_linux.go b/pkg/cri/server/sandbox_run_linux.go index dcc085737..a7c80a15f 100644 --- a/pkg/cri/server/sandbox_run_linux.go +++ b/pkg/cri/server/sandbox_run_linux.go @@ -31,8 +31,8 @@ import ( "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - customopts "github.com/containerd/containerd/pkg/containerd/opts" "github.com/containerd/containerd/pkg/cri/annotations" + customopts "github.com/containerd/containerd/pkg/cri/opts" osinterface "github.com/containerd/containerd/pkg/os" ) diff --git a/pkg/cri/server/sandbox_run_linux_test.go b/pkg/cri/server/sandbox_run_linux_test.go index 61b19705e..91c7d4eb7 100644 --- a/pkg/cri/server/sandbox_run_linux_test.go +++ b/pkg/cri/server/sandbox_run_linux_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/containerd/opts" "github.com/containerd/containerd/pkg/cri/annotations" + "github.com/containerd/containerd/pkg/cri/opts" ostesting "github.com/containerd/containerd/pkg/os/testing" ) diff --git a/pkg/cri/server/sandbox_run_windows.go b/pkg/cri/server/sandbox_run_windows.go index 0d2de91a5..64377b83a 100644 --- a/pkg/cri/server/sandbox_run_windows.go +++ b/pkg/cri/server/sandbox_run_windows.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - customopts "github.com/containerd/containerd/pkg/containerd/opts" "github.com/containerd/containerd/pkg/cri/annotations" + customopts "github.com/containerd/containerd/pkg/cri/opts" ) func (c *criService) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig, diff --git a/pkg/cri/server/sandbox_run_windows_test.go b/pkg/cri/server/sandbox_run_windows_test.go index 880d63e2f..c904506e0 100644 --- a/pkg/cri/server/sandbox_run_windows_test.go +++ b/pkg/cri/server/sandbox_run_windows_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/containerd/opts" "github.com/containerd/containerd/pkg/cri/annotations" + "github.com/containerd/containerd/pkg/cri/opts" ) func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) { diff --git a/pkg/cri/server/sandbox_stop.go b/pkg/cri/server/sandbox_stop.go index 1e40a53f6..cafceff13 100644 --- a/pkg/cri/server/sandbox_stop.go +++ b/pkg/cri/server/sandbox_stop.go @@ -27,8 +27,8 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) // StopPodSandbox stops the sandbox. If there are any running containers in the diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index f324b5496..a8c30972d 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -38,12 +38,12 @@ import ( "github.com/containerd/containerd/pkg/cri/store/label" "github.com/containerd/containerd/pkg/atomic" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" criconfig "github.com/containerd/containerd/pkg/cri/config" containerstore "github.com/containerd/containerd/pkg/cri/store/container" imagestore "github.com/containerd/containerd/pkg/cri/store/image" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" osinterface "github.com/containerd/containerd/pkg/os" "github.com/containerd/containerd/pkg/registrar" ) diff --git a/pkg/cri/server/snapshots.go b/pkg/cri/server/snapshots.go index ba4f84644..10dd41b03 100644 --- a/pkg/cri/server/snapshots.go +++ b/pkg/cri/server/snapshots.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) // snapshotsSyncer syncs snapshot stats periodically. imagefs info and container stats diff --git a/pkg/cri/server/streaming.go b/pkg/cri/server/streaming.go index bbc7e54db..d195d8d99 100644 --- a/pkg/cri/server/streaming.go +++ b/pkg/cri/server/streaming.go @@ -32,8 +32,8 @@ import ( k8scert "k8s.io/client-go/util/cert" "k8s.io/utils/exec" - ctrdutil "github.com/containerd/containerd/pkg/containerd/util" "github.com/containerd/containerd/pkg/cri/streaming" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) type streamListenerMode int diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go index 7030732e8..7eaadbb33 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -31,7 +31,7 @@ import ( "github.com/pkg/errors" storeutil "github.com/containerd/containerd/pkg/cri/store" - "github.com/containerd/containerd/pkg/util" + "github.com/containerd/containerd/pkg/cri/util" ) // Image contains all resources associated with the image. All fields diff --git a/pkg/util/deep_copy.go b/pkg/cri/util/deep_copy.go similarity index 100% rename from pkg/util/deep_copy.go rename to pkg/cri/util/deep_copy.go diff --git a/pkg/util/deep_copy_test.go b/pkg/cri/util/deep_copy_test.go similarity index 100% rename from pkg/util/deep_copy_test.go rename to pkg/cri/util/deep_copy_test.go diff --git a/pkg/util/id.go b/pkg/cri/util/id.go similarity index 100% rename from pkg/util/id.go rename to pkg/cri/util/id.go diff --git a/pkg/util/image.go b/pkg/cri/util/image.go similarity index 100% rename from pkg/util/image.go rename to pkg/cri/util/image.go diff --git a/pkg/util/image_test.go b/pkg/cri/util/image_test.go similarity index 100% rename from pkg/util/image_test.go rename to pkg/cri/util/image_test.go diff --git a/pkg/util/strings.go b/pkg/cri/util/strings.go similarity index 100% rename from pkg/util/strings.go rename to pkg/cri/util/strings.go diff --git a/pkg/util/strings_test.go b/pkg/cri/util/strings_test.go similarity index 100% rename from pkg/util/strings_test.go rename to pkg/cri/util/strings_test.go diff --git a/pkg/containerd/util/util.go b/pkg/cri/util/util.go similarity index 100% rename from pkg/containerd/util/util.go rename to pkg/cri/util/util.go