From 261e01c2acc1eb03ac15bda80c9230a0d0dcc722 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 1 Nov 2023 10:37:00 -0700 Subject: [PATCH] Move client to subpackage Signed-off-by: Derek McGowan --- client.go => client/client.go | 2 +- client_opts.go => client/client_opts.go | 2 +- container.go => client/container.go | 2 +- .../container_checkpoint_opts.go | 2 +- container_opts.go => client/container_opts.go | 2 +- container_opts_unix.go => client/container_opts_unix.go | 2 +- container_restore_opts.go => client/container_restore_opts.go | 2 +- containerstore.go => client/containerstore.go | 2 +- diff.go => client/diff.go | 2 +- events.go => client/events.go | 2 +- export.go => client/export.go | 2 +- grpc.go => client/grpc.go | 2 +- image.go => client/image.go | 2 +- image_store.go => client/image_store.go | 2 +- import.go => client/import.go | 2 +- install.go => client/install.go | 2 +- install_opts.go => client/install_opts.go | 2 +- lease.go => client/lease.go | 2 +- namespaces.go => client/namespaces.go | 2 +- oss_fuzz.go => client/oss_fuzz.go | 2 +- process.go => client/process.go | 2 +- pull.go => client/pull.go | 2 +- sandbox.go => client/sandbox.go | 2 +- services.go => client/services.go | 2 +- signals.go => client/signals.go | 2 +- .../snapshotter_default_linux.go | 2 +- .../snapshotter_default_unix.go | 2 +- .../snapshotter_default_windows.go | 2 +- snapshotter_opts_unix.go => client/snapshotter_opts_unix.go | 2 +- .../snapshotter_opts_windows.go | 2 +- task.go => client/task.go | 2 +- task_opts.go => client/task_opts.go | 2 +- task_opts_unix.go => client/task_opts_unix.go | 2 +- transfer.go => client/transfer.go | 2 +- cmd/containerd-stress/density.go | 2 +- cmd/containerd-stress/exec_worker.go | 2 +- cmd/containerd-stress/main.go | 2 +- cmd/containerd-stress/worker.go | 2 +- cmd/ctr/commands/client.go | 2 +- cmd/ctr/commands/cni.go | 2 +- cmd/ctr/commands/containers/checkpoint.go | 2 +- cmd/ctr/commands/containers/containers.go | 2 +- cmd/ctr/commands/containers/restore.go | 2 +- cmd/ctr/commands/content/fetch.go | 2 +- cmd/ctr/commands/images/import.go | 2 +- cmd/ctr/commands/images/mount.go | 2 +- cmd/ctr/commands/images/pull.go | 2 +- cmd/ctr/commands/images/push.go | 2 +- cmd/ctr/commands/images/usage.go | 2 +- cmd/ctr/commands/install/install.go | 2 +- cmd/ctr/commands/run/run.go | 2 +- cmd/ctr/commands/run/run_unix.go | 2 +- cmd/ctr/commands/run/run_windows.go | 2 +- cmd/ctr/commands/sandboxes/sandboxes.go | 2 +- cmd/ctr/commands/signals.go | 2 +- cmd/ctr/commands/tasks/checkpoint.go | 2 +- cmd/ctr/commands/tasks/delete.go | 2 +- cmd/ctr/commands/tasks/exec.go | 2 +- cmd/ctr/commands/tasks/kill.go | 2 +- cmd/ctr/commands/tasks/start.go | 2 +- cmd/ctr/commands/tasks/tasks_unix.go | 2 +- cmd/ctr/commands/tasks/tasks_windows.go | 2 +- contrib/fuzz/containerd_import_fuzzer.go | 2 +- contrib/fuzz/cri_sbserver_fuzzer.go | 2 +- contrib/fuzz/cri_server_fuzzer.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- integration/client/benchmark_test.go | 2 +- integration/client/client.go | 2 +- integration/client/client_test.go | 2 +- integration/client/client_unix_test.go | 2 +- integration/client/container_checkpoint_test.go | 2 +- integration/client/container_fuzzer.go | 2 +- integration/client/container_idmapped_linux_test.go | 2 +- integration/client/container_linux_test.go | 2 +- integration/client/container_test.go | 2 +- integration/client/content_test.go | 2 +- integration/client/convert_test.go | 2 +- integration/client/daemon.go | 2 +- integration/client/daemon_config_linux_test.go | 2 +- integration/client/export_test.go | 2 +- integration/client/image_test.go | 2 +- integration/client/import_test.go | 2 +- integration/client/lease_test.go | 2 +- integration/client/restart_monitor_test.go | 2 +- integration/client/signals_test.go | 2 +- integration/client/snapshot_test.go | 2 +- integration/client/transfer_test.go | 2 +- integration/container_update_resources_test.go | 2 +- integration/containerd_image_test.go | 2 +- integration/image_pull_timeout_test.go | 2 +- integration/main_test.go | 2 +- integration/restart_test.go | 2 +- pkg/cri/config/config_unix.go | 2 +- pkg/cri/config/config_windows.go | 2 +- pkg/cri/cri.go | 2 +- pkg/cri/nri/nri_api_linux.go | 2 +- pkg/cri/nri/nri_api_other.go | 2 +- pkg/cri/opts/container.go | 2 +- pkg/cri/server/container_attach.go | 2 +- pkg/cri/server/container_create.go | 2 +- pkg/cri/server/container_execsync.go | 2 +- pkg/cri/server/container_execsync_test.go | 2 +- pkg/cri/server/container_remove.go | 2 +- pkg/cri/server/container_start.go | 2 +- pkg/cri/server/container_update_resources.go | 2 +- pkg/cri/server/events.go | 2 +- pkg/cri/server/helpers.go | 2 +- pkg/cri/server/helpers_linux.go | 2 +- pkg/cri/server/images/image_pull.go | 2 +- pkg/cri/server/images/service.go | 2 +- pkg/cri/server/podsandbox/controller.go | 2 +- pkg/cri/server/podsandbox/helpers.go | 2 +- pkg/cri/server/podsandbox/helpers_linux.go | 2 +- pkg/cri/server/podsandbox/opts.go | 2 +- pkg/cri/server/podsandbox/recover.go | 2 +- pkg/cri/server/podsandbox/sandbox_delete.go | 2 +- pkg/cri/server/podsandbox/sandbox_run.go | 2 +- pkg/cri/server/podsandbox/sandbox_status.go | 2 +- pkg/cri/server/podsandbox/store.go | 2 +- pkg/cri/server/restart.go | 2 +- pkg/cri/server/sandbox_run.go | 2 +- pkg/cri/server/service.go | 2 +- pkg/cri/store/container/container.go | 2 +- pkg/cri/store/sandbox/sandbox.go | 2 +- pkg/transfer/local/pull.go | 2 +- pkg/transfer/local/pull_test.go | 2 +- plugins/transfer/plugin.go | 2 +- runtime/restart/monitor/change.go | 2 +- runtime/restart/monitor/monitor.go | 2 +- runtime/restart/restart.go | 2 +- runtime/restart/restart_test.go | 2 +- snapshots/overlay/overlay_test.go | 2 +- 132 files changed, 132 insertions(+), 132 deletions(-) rename client.go => client/client.go (99%) rename client_opts.go => client/client_opts.go (99%) rename container.go => client/container.go (99%) rename container_checkpoint_opts.go => client/container_checkpoint_opts.go (99%) rename container_opts.go => client/container_opts.go (99%) rename container_opts_unix.go => client/container_opts_unix.go (99%) rename container_restore_opts.go => client/container_restore_opts.go (99%) rename containerstore.go => client/containerstore.go (99%) rename diff.go => client/diff.go (98%) rename events.go => client/events.go (99%) rename export.go => client/export.go (98%) rename grpc.go => client/grpc.go (98%) rename image.go => client/image.go (99%) rename image_store.go => client/image_store.go (99%) rename import.go => client/import.go (99%) rename install.go => client/install.go (99%) rename install_opts.go => client/install_opts.go (98%) rename lease.go => client/lease.go (98%) rename namespaces.go => client/namespaces.go (99%) rename oss_fuzz.go => client/oss_fuzz.go (97%) rename process.go => client/process.go (99%) rename pull.go => client/pull.go (99%) rename sandbox.go => client/sandbox.go (99%) rename services.go => client/services.go (99%) rename signals.go => client/signals.go (99%) rename snapshotter_default_linux.go => client/snapshotter_default_linux.go (97%) rename snapshotter_default_unix.go => client/snapshotter_default_unix.go (97%) rename snapshotter_default_windows.go => client/snapshotter_default_windows.go (97%) rename snapshotter_opts_unix.go => client/snapshotter_opts_unix.go (99%) rename snapshotter_opts_windows.go => client/snapshotter_opts_windows.go (97%) rename task.go => client/task.go (99%) rename task_opts.go => client/task_opts.go (99%) rename task_opts_unix.go => client/task_opts_unix.go (99%) rename transfer.go => client/transfer.go (99%) diff --git a/client.go b/client/client.go similarity index 99% rename from client.go rename to client/client.go index 7f44ca11e..0c2eb1b19 100644 --- a/client.go +++ b/client/client.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "bytes" diff --git a/client_opts.go b/client/client_opts.go similarity index 99% rename from client_opts.go rename to client/client_opts.go index 6a2f998f0..9520510fe 100644 --- a/client_opts.go +++ b/client/client_opts.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "time" diff --git a/container.go b/client/container.go similarity index 99% rename from container.go rename to client/container.go index 563f8acbb..624569990 100644 --- a/container.go +++ b/client/container.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/container_checkpoint_opts.go b/client/container_checkpoint_opts.go similarity index 99% rename from container_checkpoint_opts.go rename to client/container_checkpoint_opts.go index 50494e14d..50ba226b0 100644 --- a/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "bytes" diff --git a/container_opts.go b/client/container_opts.go similarity index 99% rename from container_opts.go rename to client/container_opts.go index 0af31b4b5..a4e16e4ff 100644 --- a/container_opts.go +++ b/client/container_opts.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/container_opts_unix.go b/client/container_opts_unix.go similarity index 99% rename from container_opts_unix.go rename to client/container_opts_unix.go index b26c1bc82..49d77c2c0 100644 --- a/container_opts_unix.go +++ b/client/container_opts_unix.go @@ -16,7 +16,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/container_restore_opts.go b/client/container_restore_opts.go similarity index 99% rename from container_restore_opts.go rename to client/container_restore_opts.go index 9c205b4cd..da61c9986 100644 --- a/container_restore_opts.go +++ b/client/container_restore_opts.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/containerstore.go b/client/containerstore.go similarity index 99% rename from containerstore.go rename to client/containerstore.go index fad660fab..948a72450 100644 --- a/containerstore.go +++ b/client/containerstore.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/diff.go b/client/diff.go similarity index 98% rename from diff.go rename to client/diff.go index 0af7048f8..4718400c7 100644 --- a/diff.go +++ b/client/diff.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" diff --git a/events.go b/client/events.go similarity index 99% rename from events.go rename to client/events.go index d03cb392e..1c9049e72 100644 --- a/events.go +++ b/client/events.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/export.go b/client/export.go similarity index 98% rename from export.go rename to client/export.go index 806cb5815..b68594698 100644 --- a/export.go +++ b/client/export.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/grpc.go b/client/grpc.go similarity index 98% rename from grpc.go rename to client/grpc.go index bb6e3a3df..ab4179ede 100644 --- a/grpc.go +++ b/client/grpc.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/image.go b/client/image.go similarity index 99% rename from image.go rename to client/image.go index 75d7d19be..75522f5d5 100644 --- a/image.go +++ b/client/image.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/image_store.go b/client/image_store.go similarity index 99% rename from image_store.go rename to client/image_store.go index c82059e63..53e71ce57 100644 --- a/image_store.go +++ b/client/image_store.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/import.go b/client/import.go similarity index 99% rename from import.go rename to client/import.go index e1b7b6ff0..42aca54e7 100644 --- a/import.go +++ b/client/import.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/install.go b/client/install.go similarity index 99% rename from install.go rename to client/install.go index 59b422b3a..1e50ebd1d 100644 --- a/install.go +++ b/client/install.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "archive/tar" diff --git a/install_opts.go b/client/install_opts.go similarity index 98% rename from install_opts.go rename to client/install_opts.go index b0c9213cb..c42d910e8 100644 --- a/install_opts.go +++ b/client/install_opts.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client // InstallOpts configures binary installs type InstallOpts func(*InstallConfig) diff --git a/lease.go b/client/lease.go similarity index 98% rename from lease.go rename to client/lease.go index 7e407ed60..9b4ae473b 100644 --- a/lease.go +++ b/client/lease.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/namespaces.go b/client/namespaces.go similarity index 99% rename from namespaces.go rename to client/namespaces.go index 8e0ef2358..a392450b0 100644 --- a/namespaces.go +++ b/client/namespaces.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/oss_fuzz.go b/client/oss_fuzz.go similarity index 97% rename from oss_fuzz.go rename to client/oss_fuzz.go index 8d1def4f0..429592667 100644 --- a/oss_fuzz.go +++ b/client/oss_fuzz.go @@ -16,7 +16,7 @@ limitations under the License. */ -package containerd +package client import ( "github.com/AdamKorcz/go-118-fuzz-build/testing" diff --git a/process.go b/client/process.go similarity index 99% rename from process.go rename to client/process.go index b83c4917e..b194b1998 100644 --- a/process.go +++ b/client/process.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/pull.go b/client/pull.go similarity index 99% rename from pull.go rename to client/pull.go index 63a0f7446..f8b42947a 100644 --- a/pull.go +++ b/client/pull.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/sandbox.go b/client/sandbox.go similarity index 99% rename from sandbox.go rename to client/sandbox.go index 5476c4dda..7702d5f53 100644 --- a/sandbox.go +++ b/client/sandbox.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/services.go b/client/services.go similarity index 99% rename from services.go rename to client/services.go index f790ae8e9..87cd46afd 100644 --- a/services.go +++ b/client/services.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "fmt" diff --git a/signals.go b/client/signals.go similarity index 99% rename from signals.go rename to client/signals.go index 1ac58f5a7..c9d26a448 100644 --- a/signals.go +++ b/client/signals.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/snapshotter_default_linux.go b/client/snapshotter_default_linux.go similarity index 97% rename from snapshotter_default_linux.go rename to client/snapshotter_default_linux.go index d925d4ef9..5252dc70d 100644 --- a/snapshotter_default_linux.go +++ b/client/snapshotter_default_linux.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client const ( // DefaultSnapshotter will set the default snapshotter for the platform. diff --git a/snapshotter_default_unix.go b/client/snapshotter_default_unix.go similarity index 97% rename from snapshotter_default_unix.go rename to client/snapshotter_default_unix.go index 8e191ca6a..c50f09f7d 100644 --- a/snapshotter_default_unix.go +++ b/client/snapshotter_default_unix.go @@ -16,7 +16,7 @@ limitations under the License. */ -package containerd +package client const ( // DefaultSnapshotter will set the default snapshotter for the platform. diff --git a/snapshotter_default_windows.go b/client/snapshotter_default_windows.go similarity index 97% rename from snapshotter_default_windows.go rename to client/snapshotter_default_windows.go index 320211a4a..260b0fe96 100644 --- a/snapshotter_default_windows.go +++ b/client/snapshotter_default_windows.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client const ( // DefaultSnapshotter will set the default snapshotter for the platform. diff --git a/snapshotter_opts_unix.go b/client/snapshotter_opts_unix.go similarity index 99% rename from snapshotter_opts_unix.go rename to client/snapshotter_opts_unix.go index ca304c197..1b677daaa 100644 --- a/snapshotter_opts_unix.go +++ b/client/snapshotter_opts_unix.go @@ -16,7 +16,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/snapshotter_opts_windows.go b/client/snapshotter_opts_windows.go similarity index 97% rename from snapshotter_opts_windows.go rename to client/snapshotter_opts_windows.go index 87f0c29de..2c723856e 100644 --- a/snapshotter_opts_windows.go +++ b/client/snapshotter_opts_windows.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/task.go b/client/task.go similarity index 99% rename from task.go rename to client/task.go index 1ef6bdb7d..ae733e6d8 100644 --- a/task.go +++ b/client/task.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/task_opts.go b/client/task_opts.go similarity index 99% rename from task_opts.go rename to client/task_opts.go index 598edc9ad..85e555a62 100644 --- a/task_opts.go +++ b/client/task_opts.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/task_opts_unix.go b/client/task_opts_unix.go similarity index 99% rename from task_opts_unix.go rename to client/task_opts_unix.go index 4b9ee77de..081a65be8 100644 --- a/task_opts_unix.go +++ b/client/task_opts_unix.go @@ -16,7 +16,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/transfer.go b/client/transfer.go similarity index 99% rename from transfer.go rename to client/transfer.go index a88557bbd..1c0120677 100644 --- a/transfer.go +++ b/client/transfer.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package client import ( "context" diff --git a/cmd/containerd-stress/density.go b/cmd/containerd-stress/density.go index 940c4069c..4f88ba5eb 100644 --- a/cmd/containerd-stress/density.go +++ b/cmd/containerd-stress/density.go @@ -29,8 +29,8 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" diff --git a/cmd/containerd-stress/exec_worker.go b/cmd/containerd-stress/exec_worker.go index f8990b1d1..bb5f1af30 100644 --- a/cmd/containerd-stress/exec_worker.go +++ b/cmd/containerd-stress/exec_worker.go @@ -23,8 +23,8 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/cmd/containerd-stress/main.go b/cmd/containerd-stress/main.go index 85d207a1c..bf0aa829d 100644 --- a/cmd/containerd-stress/main.go +++ b/cmd/containerd-stress/main.go @@ -28,7 +28,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/integration/remote" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" diff --git a/cmd/containerd-stress/worker.go b/cmd/containerd-stress/worker.go index 448b160de..f5271427a 100644 --- a/cmd/containerd-stress/worker.go +++ b/cmd/containerd-stress/worker.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/client.go b/cmd/ctr/commands/client.go index 6ada7e225..f52f2de2a 100644 --- a/cmd/ctr/commands/client.go +++ b/cmd/ctr/commands/client.go @@ -19,7 +19,7 @@ package commands import ( gocontext "context" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/log" diff --git a/cmd/ctr/commands/cni.go b/cmd/ctr/commands/cni.go index ecd4dd1ec..053ae268e 100644 --- a/cmd/ctr/commands/cni.go +++ b/cmd/ctr/commands/cni.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/typeurl/v2" ) diff --git a/cmd/ctr/commands/containers/checkpoint.go b/cmd/ctr/commands/containers/checkpoint.go index b3f595c9f..baea315c3 100644 --- a/cmd/ctr/commands/containers/checkpoint.go +++ b/cmd/ctr/commands/containers/checkpoint.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/errdefs" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 6be01be5c..68fed0b28 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -23,8 +23,8 @@ import ( "strings" "text/tabwriter" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/run" "github.com/containerd/containerd/v2/containers" diff --git a/cmd/ctr/commands/containers/restore.go b/cmd/ctr/commands/containers/restore.go index 721a47849..d742b1eea 100644 --- a/cmd/ctr/commands/containers/restore.go +++ b/cmd/ctr/commands/containers/restore.go @@ -20,8 +20,8 @@ import ( "errors" "github.com/containerd/console" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/errdefs" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index 8e0952b26..6c4908052 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -26,7 +26,7 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/errdefs" diff --git a/cmd/ctr/commands/images/import.go b/cmd/ctr/commands/images/import.go index 4f96ef7b6..724964b54 100644 --- a/cmd/ctr/commands/images/import.go +++ b/cmd/ctr/commands/images/import.go @@ -25,7 +25,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/pkg/transfer" diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index 35a2bc0b3..fdd728481 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/leases" diff --git a/cmd/ctr/commands/images/pull.go b/cmd/ctr/commands/images/pull.go index 814b6434a..1c9764741 100644 --- a/cmd/ctr/commands/images/pull.go +++ b/cmd/ctr/commands/images/pull.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/content" "github.com/containerd/containerd/v2/images" diff --git a/cmd/ctr/commands/images/push.go b/cmd/ctr/commands/images/push.go index 8dcd76b7b..e00eb3e75 100644 --- a/cmd/ctr/commands/images/push.go +++ b/cmd/ctr/commands/images/push.go @@ -26,7 +26,7 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/content" "github.com/containerd/containerd/v2/images" diff --git a/cmd/ctr/commands/images/usage.go b/cmd/ctr/commands/images/usage.go index 3c4911a4e..0bd7e8ff6 100644 --- a/cmd/ctr/commands/images/usage.go +++ b/cmd/ctr/commands/images/usage.go @@ -21,7 +21,7 @@ import ( "os" "text/tabwriter" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/pkg/progress" diff --git a/cmd/ctr/commands/install/install.go b/cmd/ctr/commands/install/install.go index 1609a7b5f..5e17cb4d9 100644 --- a/cmd/ctr/commands/install/install.go +++ b/cmd/ctr/commands/install/install.go @@ -17,7 +17,7 @@ package install import ( - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index 3f2eaa62e..d8644a11d 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -28,8 +28,8 @@ import ( specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/containers" diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index ed5895687..0d08004a1 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -30,7 +30,7 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/container-orchestrated-devices/container-device-interface/pkg/parser" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/contrib/apparmor" diff --git a/cmd/ctr/commands/run/run_windows.go b/cmd/ctr/commands/run/run_windows.go index d1e4849b6..13f60cca8 100644 --- a/cmd/ctr/commands/run/run_windows.go +++ b/cmd/ctr/commands/run/run_windows.go @@ -23,7 +23,7 @@ import ( "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" "github.com/containerd/console" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/netns" diff --git a/cmd/ctr/commands/sandboxes/sandboxes.go b/cmd/ctr/commands/sandboxes/sandboxes.go index 9cb90dda8..4386fab90 100644 --- a/cmd/ctr/commands/sandboxes/sandboxes.go +++ b/cmd/ctr/commands/sandboxes/sandboxes.go @@ -22,7 +22,7 @@ import ( "os" "text/tabwriter" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/oci" diff --git a/cmd/ctr/commands/signals.go b/cmd/ctr/commands/signals.go index c53e5763d..7050cf398 100644 --- a/cmd/ctr/commands/signals.go +++ b/cmd/ctr/commands/signals.go @@ -22,7 +22,7 @@ import ( "os/signal" "syscall" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/tasks/checkpoint.go b/cmd/ctr/commands/tasks/checkpoint.go index 142ca209b..0bbd4b79b 100644 --- a/cmd/ctr/commands/tasks/checkpoint.go +++ b/cmd/ctr/commands/tasks/checkpoint.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/tasks/delete.go b/cmd/ctr/commands/tasks/delete.go index ba16ebfc8..6878c0037 100644 --- a/cmd/ctr/commands/tasks/delete.go +++ b/cmd/ctr/commands/tasks/delete.go @@ -19,8 +19,8 @@ package tasks import ( gocontext "context" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/log" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/tasks/exec.go b/cmd/ctr/commands/tasks/exec.go index d67020e89..80afa93cf 100644 --- a/cmd/ctr/commands/tasks/exec.go +++ b/cmd/ctr/commands/tasks/exec.go @@ -23,8 +23,8 @@ import ( "os" "github.com/containerd/console" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" diff --git a/cmd/ctr/commands/tasks/kill.go b/cmd/ctr/commands/tasks/kill.go index a8015d815..bb666d4aa 100644 --- a/cmd/ctr/commands/tasks/kill.go +++ b/cmd/ctr/commands/tasks/kill.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" gocni "github.com/containerd/go-cni" "github.com/containerd/log" diff --git a/cmd/ctr/commands/tasks/start.go b/cmd/ctr/commands/tasks/start.go index 81365a8fa..2ce744d11 100644 --- a/cmd/ctr/commands/tasks/start.go +++ b/cmd/ctr/commands/tasks/start.go @@ -20,8 +20,8 @@ import ( "errors" "github.com/containerd/console" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go index 4b9da2c4f..338073346 100644 --- a/cmd/ctr/commands/tasks/tasks_unix.go +++ b/cmd/ctr/commands/tasks/tasks_unix.go @@ -26,8 +26,8 @@ import ( "os/signal" "github.com/containerd/console" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/log" "github.com/urfave/cli" "golang.org/x/sys/unix" diff --git a/cmd/ctr/commands/tasks/tasks_windows.go b/cmd/ctr/commands/tasks/tasks_windows.go index 432a3fbc9..7b6a15914 100644 --- a/cmd/ctr/commands/tasks/tasks_windows.go +++ b/cmd/ctr/commands/tasks/tasks_windows.go @@ -23,8 +23,8 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/contrib/fuzz/containerd_import_fuzzer.go b/contrib/fuzz/containerd_import_fuzzer.go index 978611117..c39d6601a 100644 --- a/contrib/fuzz/containerd_import_fuzzer.go +++ b/contrib/fuzz/containerd_import_fuzzer.go @@ -21,7 +21,7 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/namespaces" ) diff --git a/contrib/fuzz/cri_sbserver_fuzzer.go b/contrib/fuzz/cri_sbserver_fuzzer.go index 8b907bb7d..b6b39201c 100644 --- a/contrib/fuzz/cri_sbserver_fuzzer.go +++ b/contrib/fuzz/cri_sbserver_fuzzer.go @@ -21,7 +21,7 @@ package fuzz import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/server" ) diff --git a/contrib/fuzz/cri_server_fuzzer.go b/contrib/fuzz/cri_server_fuzzer.go index 039f4ea21..f43563e86 100644 --- a/contrib/fuzz/cri_server_fuzzer.go +++ b/contrib/fuzz/cri_server_fuzzer.go @@ -21,7 +21,7 @@ package fuzz import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/server" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index f95766d72..95b2bb7fd 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -22,7 +22,7 @@ import ( "sync" "testing" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugin" diff --git a/integration/client/benchmark_test.go b/integration/client/benchmark_test.go index ed3257bac..4ec23a8bb 100644 --- a/integration/client/benchmark_test.go +++ b/integration/client/benchmark_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/oci" ) diff --git a/integration/client/client.go b/integration/client/client.go index d0e5804f1..f3760deda 100644 --- a/integration/client/client.go +++ b/integration/client/client.go @@ -23,7 +23,7 @@ import ( "os" "testing" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/log/logtest" diff --git a/integration/client/client_test.go b/integration/client/client_test.go index 9623718a3..e552970e7 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -32,7 +32,7 @@ import ( "go.opentelemetry.io/otel" exec "golang.org/x/sys/execabs" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/integration/client/client_unix_test.go b/integration/client/client_unix_test.go index f645976fe..ef7a9afac 100644 --- a/integration/client/client_unix_test.go +++ b/integration/client/client_unix_test.go @@ -21,7 +21,7 @@ package client import ( "testing" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/platforms" ) diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go index 48d177e80..e18a9966a 100644 --- a/integration/client/container_checkpoint_test.go +++ b/integration/client/container_checkpoint_test.go @@ -29,8 +29,8 @@ import ( "syscall" "testing" - . "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" ) diff --git a/integration/client/container_fuzzer.go b/integration/client/container_fuzzer.go index 7691a5bf7..006cb9f6d 100644 --- a/integration/client/container_fuzzer.go +++ b/integration/client/container_fuzzer.go @@ -30,7 +30,7 @@ import ( "time" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" exec "golang.org/x/sys/execabs" ) diff --git a/integration/client/container_idmapped_linux_test.go b/integration/client/container_idmapped_linux_test.go index 5f0ef4fdb..7f7206ef5 100644 --- a/integration/client/container_idmapped_linux_test.go +++ b/integration/client/container_idmapped_linux_test.go @@ -22,7 +22,7 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index c2873a86b..eda555bd7 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - . "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 19075a46f..6fbdc61fb 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -30,9 +30,9 @@ import ( "testing" "time" - . "github.com/containerd/containerd/v2" apievents "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/cio" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/integration/client/content_test.go b/integration/client/content_test.go index 4a10e6109..b8c533bc6 100644 --- a/integration/client/content_test.go +++ b/integration/client/content_test.go @@ -22,7 +22,7 @@ import ( "sync/atomic" "testing" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/content/testsuite" "github.com/containerd/containerd/v2/errdefs" diff --git a/integration/client/convert_test.go b/integration/client/convert_test.go index 07d524b77..681e2eaee 100644 --- a/integration/client/convert_test.go +++ b/integration/client/convert_test.go @@ -19,7 +19,7 @@ package client import ( "testing" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/converter" "github.com/containerd/containerd/v2/images/converter/uncompress" diff --git a/integration/client/daemon.go b/integration/client/daemon.go index 1bd80bef0..41e54c8e6 100644 --- a/integration/client/daemon.go +++ b/integration/client/daemon.go @@ -26,7 +26,7 @@ import ( "syscall" "time" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" exec "golang.org/x/sys/execabs" ) diff --git a/integration/client/daemon_config_linux_test.go b/integration/client/daemon_config_linux_test.go index bd8c2d022..941df5e3d 100644 --- a/integration/client/daemon_config_linux_test.go +++ b/integration/client/daemon_config_linux_test.go @@ -27,7 +27,7 @@ import ( "time" "github.com/containerd/cgroups/v3" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/runc/options" diff --git a/integration/client/export_test.go b/integration/client/export_test.go index 67c5ab840..8a43c8e26 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" diff --git a/integration/client/image_test.go b/integration/client/image_test.go index edfa5ac28..ccdfa06a9 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" imagelist "github.com/containerd/containerd/v2/integration/images" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index 9b0255687..dbabeb44a 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -32,9 +32,9 @@ import ( "testing" "time" - . "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/tartest" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/leases" diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 59eabc763..0593daa2a 100644 --- a/integration/client/lease_test.go +++ b/integration/client/lease_test.go @@ -20,7 +20,7 @@ import ( "runtime" "testing" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" imagelist "github.com/containerd/containerd/v2/integration/images" diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index 8a6f02821..ad3bf0ac4 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - . "github.com/containerd/containerd/v2" eventtypes "github.com/containerd/containerd/v2/api/events" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/runtime/restart" diff --git a/integration/client/signals_test.go b/integration/client/signals_test.go index 4d52945b2..6b5435314 100644 --- a/integration/client/signals_test.go +++ b/integration/client/signals_test.go @@ -21,7 +21,7 @@ import ( "syscall" "testing" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" ) func TestParseSignal(t *testing.T) { diff --git a/integration/client/snapshot_test.go b/integration/client/snapshot_test.go index 65e9dc586..343f9de6e 100644 --- a/integration/client/snapshot_test.go +++ b/integration/client/snapshot_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - . "github.com/containerd/containerd/v2" + . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/testsuite" ) diff --git a/integration/client/transfer_test.go b/integration/client/transfer_test.go index 075d94695..8d8a58363 100644 --- a/integration/client/transfer_test.go +++ b/integration/client/transfer_test.go @@ -23,7 +23,7 @@ import ( "io" "testing" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/pkg/transfer/archive" ) diff --git a/integration/container_update_resources_test.go b/integration/container_update_resources_test.go index 659e44867..5bdcf16e6 100644 --- a/integration/container_update_resources_test.go +++ b/integration/container_update_resources_test.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/integration/images" criopts "github.com/containerd/containerd/v2/pkg/cri/opts" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go index 8e754423a..a78f6a164 100644 --- a/integration/containerd_image_test.go +++ b/integration/containerd_image_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/namespaces" diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index 0bdfd510b..9f9966db2 100644 --- a/integration/image_pull_timeout_test.go +++ b/integration/image_pull_timeout_test.go @@ -33,7 +33,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" diff --git a/integration/main_test.go b/integration/main_test.go index cacd24a71..33519eee3 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -33,7 +33,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" cri "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis" _ "github.com/containerd/containerd/v2/integration/images" // Keep this around to parse `imageListFile` command line var diff --git a/integration/restart_test.go b/integration/restart_test.go index 0bc268262..e7a8a424a 100644 --- a/integration/restart_test.go +++ b/integration/restart_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/cri/config/config_unix.go b/pkg/cri/config/config_unix.go index 02b4a3241..7829766da 100644 --- a/pkg/cri/config/config_unix.go +++ b/pkg/cri/config/config_unix.go @@ -21,7 +21,7 @@ package config import ( "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/pelletier/go-toml/v2" "k8s.io/kubelet/pkg/cri/streaming" ) diff --git a/pkg/cri/config/config_windows.go b/pkg/cri/config/config_windows.go index f19a45e36..53ee83f9f 100644 --- a/pkg/cri/config/config_windows.go +++ b/pkg/cri/config/config_windows.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "k8s.io/kubelet/pkg/cri/streaming" ) diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go index 775d97366..faf21af5b 100644 --- a/pkg/cri/cri.go +++ b/pkg/cri/cri.go @@ -21,7 +21,7 @@ import ( "fmt" "path/filepath" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/pkg/cri/nri" "github.com/containerd/containerd/v2/pkg/cri/server" nriservice "github.com/containerd/containerd/v2/pkg/nri" diff --git a/pkg/cri/nri/nri_api_linux.go b/pkg/cri/nri/nri_api_linux.go index 4e458b0b1..1d3c07001 100644 --- a/pkg/cri/nri/nri_api_linux.go +++ b/pkg/cri/nri/nri_api_linux.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/blockio" diff --git a/pkg/cri/nri/nri_api_other.go b/pkg/cri/nri/nri_api_other.go index 63fb0907d..1b2aea4a0 100644 --- a/pkg/cri/nri/nri_api_other.go +++ b/pkg/cri/nri/nri_api_other.go @@ -21,7 +21,7 @@ package nri import ( "context" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 258fa0cd4..945a1e164 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/continuity/fs" imagespec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" diff --git a/pkg/cri/server/container_attach.go b/pkg/cri/server/container_attach.go index 14bc7100d..696653eba 100644 --- a/pkg/cri/server/container_attach.go +++ b/pkg/cri/server/container_attach.go @@ -21,7 +21,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go index d0a333c0a..ae62b58b7 100644 --- a/pkg/cri/server/container_create.go +++ b/pkg/cri/server/container_create.go @@ -33,7 +33,7 @@ import ( "github.com/opencontainers/selinux/go-selinux/label" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/blockio" diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index cd9e31fc7..2649359a8 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -24,8 +24,8 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2" containerdio "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" diff --git a/pkg/cri/server/container_execsync_test.go b/pkg/cri/server/container_execsync_test.go index 59af765b9..a5d06f1ec 100644 --- a/pkg/cri/server/container_execsync_test.go +++ b/pkg/cri/server/container_execsync_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" cioutil "github.com/containerd/containerd/v2/pkg/ioutil" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/server/container_remove.go b/pkg/cri/server/container_remove.go index 284c8de0c..fa4324736 100644 --- a/pkg/cri/server/container_remove.go +++ b/pkg/cri/server/container_remove.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/log" diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index 8b3009bba..d37e7933a 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -23,8 +23,8 @@ import ( "io" "time" - "github.com/containerd/containerd/v2" containerdio "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go index 270a96caa..fabd89047 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/pkg/cri/server/container_update_resources.go @@ -27,7 +27,7 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 973ac64b3..34b8784ae 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2" eventtypes "github.com/containerd/containerd/v2/api/events" apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" containerdio "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/pkg/cri/constants" diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index b0e2a1ccd..45c127929 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -33,7 +33,7 @@ import ( "github.com/pelletier/go-toml/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/errdefs" clabels "github.com/containerd/containerd/v2/labels" diff --git a/pkg/cri/server/helpers_linux.go b/pkg/cri/server/helpers_linux.go index 88ea75406..0deae3930 100644 --- a/pkg/cri/server/helpers_linux.go +++ b/pkg/cri/server/helpers_linux.go @@ -32,7 +32,7 @@ import ( "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/apparmor" "github.com/containerd/containerd/v2/pkg/seccomp" diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index 1cd84ca3a..07d6ea808 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -37,7 +37,7 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" containerdimages "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/cri/annotations" diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index fe8e46f24..bbf7b6f1b 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" 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" diff --git a/pkg/cri/server/podsandbox/controller.go b/pkg/cri/server/podsandbox/controller.go index 88a61177c..5c376bec1 100644 --- a/pkg/cri/server/podsandbox/controller.go +++ b/pkg/cri/server/podsandbox/controller.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2" eventtypes "github.com/containerd/containerd/v2/api/events" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" diff --git a/pkg/cri/server/podsandbox/helpers.go b/pkg/cri/server/podsandbox/helpers.go index aa0a3629a..5c37ada71 100644 --- a/pkg/cri/server/podsandbox/helpers.go +++ b/pkg/cri/server/podsandbox/helpers.go @@ -23,7 +23,7 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" diff --git a/pkg/cri/server/podsandbox/helpers_linux.go b/pkg/cri/server/podsandbox/helpers_linux.go index 4e59f7421..05d03bf32 100644 --- a/pkg/cri/server/podsandbox/helpers_linux.go +++ b/pkg/cri/server/podsandbox/helpers_linux.go @@ -28,7 +28,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/seccomp" "github.com/containerd/containerd/v2/pkg/seutil" diff --git a/pkg/cri/server/podsandbox/opts.go b/pkg/cri/server/podsandbox/opts.go index dc7ce156b..c9e72cdb5 100644 --- a/pkg/cri/server/podsandbox/opts.go +++ b/pkg/cri/server/podsandbox/opts.go @@ -19,7 +19,7 @@ package podsandbox import ( "context" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/log" "github.com/containerd/nri" v1 "github.com/containerd/nri/types/v1" diff --git a/pkg/cri/server/podsandbox/recover.go b/pkg/cri/server/podsandbox/recover.go index 8628cdcd7..04bbfc148 100644 --- a/pkg/cri/server/podsandbox/recover.go +++ b/pkg/cri/server/podsandbox/recover.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" diff --git a/pkg/cri/server/podsandbox/sandbox_delete.go b/pkg/cri/server/podsandbox/sandbox_delete.go index 808aa3354..4e06ac21e 100644 --- a/pkg/cri/server/podsandbox/sandbox_delete.go +++ b/pkg/cri/server/podsandbox/sandbox_delete.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2" apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/sandbox_run.go b/pkg/cri/server/podsandbox/sandbox_run.go index 89524778b..93b722f06 100644 --- a/pkg/cri/server/podsandbox/sandbox_run.go +++ b/pkg/cri/server/podsandbox/sandbox_run.go @@ -29,8 +29,8 @@ import ( "github.com/opencontainers/selinux/go-selinux" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2" containerdio "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/annotations" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" diff --git a/pkg/cri/server/podsandbox/sandbox_status.go b/pkg/cri/server/podsandbox/sandbox_status.go index 1f2197b24..bfe302f03 100644 --- a/pkg/cri/server/podsandbox/sandbox_status.go +++ b/pkg/cri/server/podsandbox/sandbox_status.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/errdefs" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" diff --git a/pkg/cri/server/podsandbox/store.go b/pkg/cri/server/podsandbox/store.go index bbc293feb..3094f8fe4 100644 --- a/pkg/cri/server/podsandbox/store.go +++ b/pkg/cri/server/podsandbox/store.go @@ -19,7 +19,7 @@ package podsandbox import ( "sync" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" ) type Status struct { diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index 4392d10ed..2f4202441 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2" containerdio "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" containerdimages "github.com/containerd/containerd/v2/images" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index 71fa8f699..b2aed95a7 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "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" diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index 7a649949f..058c28878 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -27,7 +27,7 @@ import ( "sync" "sync/atomic" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/instrument" "github.com/containerd/containerd/v2/pkg/cri/nri" diff --git a/pkg/cri/store/container/container.go b/pkg/cri/store/container/container.go index 76a14e825..5c8a68281 100644 --- a/pkg/cri/store/container/container.go +++ b/pkg/cri/store/container/container.go @@ -19,7 +19,7 @@ package container import ( "sync" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" cio "github.com/containerd/containerd/v2/pkg/cri/io" "github.com/containerd/containerd/v2/pkg/cri/store" diff --git a/pkg/cri/store/sandbox/sandbox.go b/pkg/cri/store/sandbox/sandbox.go index 0a42592d6..68f3e00c8 100644 --- a/pkg/cri/store/sandbox/sandbox.go +++ b/pkg/cri/store/sandbox/sandbox.go @@ -19,7 +19,7 @@ package sandbox import ( "sync" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/store" "github.com/containerd/containerd/v2/pkg/cri/store/label" diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index 9dd9531a2..b80cb73d3 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/pkg/transfer/local/pull_test.go b/pkg/transfer/local/pull_test.go index 4e9e9cefa..5410ae26c 100644 --- a/pkg/transfer/local/pull_test.go +++ b/pkg/transfer/local/pull_test.go @@ -19,7 +19,7 @@ package local import ( "testing" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/platforms" diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index ce061492e..73d215f81 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -19,7 +19,7 @@ package transfer import ( "fmt" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/leases" diff --git a/runtime/restart/monitor/change.go b/runtime/restart/monitor/change.go index 875d38f52..e853fd7e0 100644 --- a/runtime/restart/monitor/change.go +++ b/runtime/restart/monitor/change.go @@ -23,8 +23,8 @@ import ( "strconv" "syscall" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/runtime/restart" ) diff --git a/runtime/restart/monitor/monitor.go b/runtime/restart/monitor/monitor.go index 283c7c761..1b36f28ba 100644 --- a/runtime/restart/monitor/monitor.go +++ b/runtime/restart/monitor/monitor.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugin" "github.com/containerd/containerd/v2/plugin/registry" diff --git a/runtime/restart/restart.go b/runtime/restart/restart.go index e90faeb01..9d3641c33 100644 --- a/runtime/restart/restart.go +++ b/runtime/restart/restart.go @@ -36,8 +36,8 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/v2" "github.com/containerd/containerd/v2/cio" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/containers" "github.com/containerd/log" ) diff --git a/runtime/restart/restart_test.go b/runtime/restart/restart_test.go index 046c382e9..1b70b9159 100644 --- a/runtime/restart/restart_test.go +++ b/runtime/restart/restart_test.go @@ -19,7 +19,7 @@ package restart import ( "testing" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/stretchr/testify/assert" ) diff --git a/snapshots/overlay/overlay_test.go b/snapshots/overlay/overlay_test.go index a336c8f15..094a9384e 100644 --- a/snapshots/overlay/overlay_test.go +++ b/snapshots/overlay/overlay_test.go @@ -26,7 +26,7 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/v2" + containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/snapshots"