From e82d201b3ffb87c15d2b7be2eb2e0c7bfa99d114 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 19 Sep 2024 22:12:42 -0700 Subject: [PATCH] Revert "replace uses of github.com/containerd/containerd/errdefs" This reverts commit 308341a4464bd723630d3df19a5df20aa252af9f. Signed-off-by: Derek McGowan --- client.go | 21 +++++++++--------- cmd/containerd/command/main.go | 9 ++++---- cmd/containerd/command/publish.go | 2 +- cmd/containerd/command/service_windows.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/content.go | 9 ++++---- cmd/ctr/commands/content/fetch.go | 15 +++++++------ cmd/ctr/commands/images/images.go | 9 ++++---- cmd/ctr/commands/images/mount.go | 11 +++++----- cmd/ctr/commands/images/tag.go | 2 +- cmd/ctr/commands/images/unmount.go | 5 +++-- cmd/ctr/commands/namespaces/namespaces.go | 5 +++-- cmd/ctr/commands/signals.go | 2 +- container.go | 2 +- container_opts.go | 2 +- container_opts_unix.go | 2 +- containerstore.go | 2 +- content/helpers.go | 5 +++-- content/helpers_test.go | 2 +- content/local/locks.go | 2 +- content/local/readerat.go | 2 +- content/local/store.go | 9 ++++---- content/local/store_test.go | 2 +- content/local/writer.go | 5 +++-- content/proxy/content_store.go | 2 +- content/proxy/content_writer.go | 2 +- content/testsuite/testsuite.go | 7 +++--- contrib/diffservice/service.go | 2 +- contrib/snapshotservice/service.go | 2 +- diff/apply/apply_linux.go | 2 +- diff/lcow/lcow.go | 13 ++++++----- diff/proxy/differ.go | 2 +- diff/walking/differ.go | 9 ++++---- diff/windows/windows.go | 11 +++++----- events.go | 2 +- events/exchange/exchange.go | 9 ++++---- events/exchange/exchange_test.go | 2 +- filters/parser.go | 2 +- identifiers/validate.go | 2 +- identifiers/validate_test.go | 2 +- image.go | 17 +++++++------- image_store.go | 2 +- images/archive/exporter.go | 9 ++++---- images/archive/importer.go | 2 +- images/converter/uncompress/uncompress.go | 2 +- images/handlers.go | 5 +++-- images/image.go | 5 +++-- images/mediatypes.go | 2 +- import.go | 9 ++++---- integration/client/client_test.go | 7 +++--- integration/client/container_linux_test.go | 3 ++- integration/client/container_test.go | 2 +- integration/client/content_test.go | 2 +- integration/client/export_test.go | 13 ++++++----- integration/client/go.mod | 2 +- integration/client/image_test.go | 7 +++--- integration/client/lease_test.go | 2 +- integration/containerd_image_test.go | 2 +- labels/validate.go | 2 +- labels/validate_test.go | 2 +- leases/proxy/manager.go | 2 +- metadata/containers.go | 2 +- metadata/containers_test.go | 13 ++++++----- metadata/content.go | 13 ++++++----- metadata/content_test.go | 2 +- metadata/db_test.go | 15 +++++++------ metadata/images.go | 2 +- metadata/images_test.go | 2 +- metadata/leases.go | 2 +- metadata/leases_test.go | 2 +- metadata/namespaces.go | 2 +- metadata/plugin/plugin.go | 5 +++-- metadata/sandbox.go | 2 +- metadata/sandbox_test.go | 2 +- metadata/snapshot.go | 7 +++--- metadata/snapshot_test.go | 2 +- metrics/cgroups/v1/cgroups.go | 9 ++++---- namespaces.go | 2 +- namespaces/context.go | 2 +- oci/spec_opts_test.go | 2 +- pkg/cri/instrument/instrumented_service.go | 7 +++--- pkg/cri/nri/nri_api_linux.go | 22 ++++++++++--------- pkg/cri/opts/container.go | 5 +++-- pkg/cri/opts/spec_nonwindows.go | 2 +- pkg/cri/sbserver/container_execsync.go | 9 ++++---- pkg/cri/sbserver/container_remove.go | 7 +++--- pkg/cri/sbserver/container_start.go | 7 +++--- pkg/cri/sbserver/container_stats_list.go | 11 +++++----- pkg/cri/sbserver/container_status.go | 2 +- pkg/cri/sbserver/container_stop.go | 10 ++++----- .../sbserver/container_update_resources.go | 5 ++--- pkg/cri/sbserver/events.go | 2 +- pkg/cri/sbserver/helpers.go | 4 ++-- pkg/cri/sbserver/helpers_test.go | 2 +- pkg/cri/sbserver/image_pull.go | 7 +++--- pkg/cri/sbserver/image_remove.go | 2 +- pkg/cri/sbserver/image_status.go | 8 +++---- pkg/cri/sbserver/podsandbox/controller.go | 5 +++-- pkg/cri/sbserver/podsandbox/recover.go | 6 ++--- pkg/cri/sbserver/podsandbox/sandbox_delete.go | 5 +++-- pkg/cri/sbserver/podsandbox/sandbox_run.go | 5 +++-- pkg/cri/sbserver/podsandbox/sandbox_status.go | 2 +- pkg/cri/sbserver/podsandbox/sandbox_stop.go | 2 +- pkg/cri/sbserver/restart.go | 15 +++++++------ pkg/cri/sbserver/sandbox_portforward_other.go | 2 +- pkg/cri/sbserver/sandbox_remove.go | 3 ++- pkg/cri/sbserver/sandbox_stats_linux.go | 5 +++-- pkg/cri/sbserver/sandbox_stats_list.go | 5 +++-- pkg/cri/sbserver/sandbox_stats_other.go | 2 +- pkg/cri/sbserver/sandbox_stats_windows.go | 13 ++++++----- pkg/cri/sbserver/sandbox_status.go | 5 +++-- pkg/cri/sbserver/sandbox_stop.go | 2 +- pkg/cri/sbserver/snapshots.go | 2 +- pkg/cri/server/bandwidth/fake_shaper.go | 2 +- pkg/cri/server/bandwidth/unsupported.go | 2 +- pkg/cri/server/container_execsync.go | 9 ++++---- pkg/cri/server/container_remove.go | 7 +++--- pkg/cri/server/container_start.go | 7 +++--- pkg/cri/server/container_stats_list_other.go | 2 +- pkg/cri/server/container_status.go | 2 +- pkg/cri/server/container_stop.go | 10 ++++----- pkg/cri/server/container_update_resources.go | 6 ++--- pkg/cri/server/events.go | 2 +- pkg/cri/server/helpers.go | 2 +- pkg/cri/server/helpers_test.go | 2 +- pkg/cri/server/image_pull.go | 7 +++--- pkg/cri/server/image_remove.go | 2 +- pkg/cri/server/image_status.go | 8 +++---- pkg/cri/server/restart.go | 8 +++---- pkg/cri/server/sandbox_portforward_other.go | 2 +- pkg/cri/server/sandbox_remove.go | 5 +++-- pkg/cri/server/sandbox_run.go | 5 +++-- pkg/cri/server/sandbox_stats_linux.go | 5 +++-- pkg/cri/server/sandbox_stats_list.go | 5 +++-- pkg/cri/server/sandbox_stats_other.go | 2 +- pkg/cri/server/sandbox_stats_windows.go | 13 ++++++----- pkg/cri/server/sandbox_status.go | 2 +- pkg/cri/server/sandbox_stop.go | 7 +++--- pkg/cri/server/snapshots.go | 2 +- pkg/cri/store/container/container.go | 2 +- pkg/cri/store/container/container_test.go | 2 +- pkg/cri/store/image/image.go | 12 +++++----- pkg/cri/store/image/image_test.go | 2 +- pkg/cri/store/sandbox/sandbox.go | 2 +- pkg/cri/store/sandbox/sandbox_test.go | 2 +- pkg/cri/store/snapshot/snapshot.go | 2 +- pkg/cri/store/snapshot/snapshot_test.go | 2 +- pkg/nri/domain.go | 5 +++-- pkg/process/deleted_state.go | 2 +- pkg/process/exec.go | 2 +- pkg/process/utils.go | 2 +- pkg/transfer/image/imagestore.go | 4 ++-- pkg/transfer/image/imagestore_test.go | 2 +- pkg/transfer/local/import.go | 4 ++-- pkg/transfer/local/pull.go | 7 +++--- pkg/transfer/local/push.go | 11 +++++----- pkg/transfer/local/transfer.go | 2 +- pkg/transfer/plugins/plugins.go | 2 +- pkg/unpack/unpacker.go | 21 +++++++++--------- plugin/context.go | 2 +- plugins/sandbox/controller.go | 10 ++++----- plugins/streaming/manager.go | 2 +- plugins/transfer/plugin.go | 7 +++--- process.go | 2 +- pull.go | 5 +++-- remotes/docker/authorizer.go | 5 +++-- remotes/docker/config/hosts.go | 5 +++-- remotes/docker/fetcher.go | 5 +++-- remotes/docker/httpreadseeker.go | 3 ++- remotes/docker/pusher.go | 11 +++++----- remotes/docker/pusher_test.go | 2 +- remotes/docker/resolver.go | 9 ++++---- remotes/docker/schema1/converter.go | 13 ++++++----- remotes/docker/status.go | 2 +- remotes/handlers.go | 9 ++++---- rootfs/apply.go | 9 ++++---- runtime/nsmap.go | 2 +- runtime/v1/linux/process.go | 2 +- runtime/v1/linux/runtime.go | 2 +- runtime/v1/linux/task.go | 7 +++--- runtime/v1/shim/service.go | 2 +- runtime/v2/example/example.go | 2 +- runtime/v2/manager.go | 9 ++++---- runtime/v2/process.go | 2 +- runtime/v2/runc/container.go | 2 +- runtime/v2/runc/task/service.go | 2 +- runtime/v2/runc/v1/service.go | 2 +- runtime/v2/shim.go | 4 ++-- runtime/v2/shim/shim_windows.go | 2 +- runtime/v2/shim/util.go | 2 +- runtime/v2/shim_load.go | 5 +++-- runtime/v2/shim_test.go | 2 +- sandbox/proxy/controller.go | 7 +++--- sandbox/proxy/store.go | 2 +- sandbox/store.go | 2 +- services/containers/local.go | 2 +- .../content/contentserver/contentserver.go | 11 +++++----- services/diff/local.go | 2 +- services/events/service.go | 2 +- services/events/ttrpc.go | 2 +- services/images/local.go | 5 +++-- services/introspection/introspection.go | 7 +++--- services/introspection/local.go | 3 +-- services/leases/service.go | 2 +- services/namespaces/local.go | 2 +- services/sandbox/controller_service.go | 5 +++-- services/sandbox/store_service.go | 5 +++-- services/server/config/config.go | 2 +- services/snapshots/service.go | 2 +- services/streaming/service.go | 9 ++++---- services/tasks/local.go | 4 ++-- services/transfer/service.go | 17 +++++++------- snapshots/devmapper/metadata.go | 2 +- snapshots/devmapper/snapshotter.go | 7 +++--- snapshots/lcow/lcow.go | 9 ++++---- snapshots/proxy/proxy.go | 2 +- snapshots/storage/bolt.go | 2 +- snapshots/storage/metastore_test.go | 2 +- snapshots/testsuite/testsuite.go | 11 +++++----- snapshots/windows/windows.go | 11 +++++----- task.go | 2 +- task_opts.go | 2 +- tracing/plugin/otlp.go | 11 +++++----- transfer.go | 2 +- 226 files changed, 596 insertions(+), 508 deletions(-) diff --git a/client.go b/client.go index 13dc4da8c..69614712e 100644 --- a/client.go +++ b/client.go @@ -27,6 +27,16 @@ import ( "sync" "time" + "github.com/containerd/platforms" + "github.com/containerd/typeurl/v2" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/opencontainers/runtime-spec/specs-go" + "golang.org/x/sync/semaphore" + "google.golang.org/grpc" + "google.golang.org/grpc/backoff" + "google.golang.org/grpc/credentials/insecure" + "google.golang.org/grpc/health/grpc_health_v1" + containersapi "github.com/containerd/containerd/api/services/containers/v1" contentapi "github.com/containerd/containerd/api/services/content/v1" diffapi "github.com/containerd/containerd/api/services/diff/v1" @@ -44,6 +54,7 @@ import ( "github.com/containerd/containerd/content" contentproxy "github.com/containerd/containerd/content/proxy" "github.com/containerd/containerd/defaults" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" @@ -59,16 +70,6 @@ import ( "github.com/containerd/containerd/services/introspection" "github.com/containerd/containerd/snapshots" snproxy "github.com/containerd/containerd/snapshots/proxy" - "github.com/containerd/errdefs" - "github.com/containerd/platforms" - "github.com/containerd/typeurl/v2" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/opencontainers/runtime-spec/specs-go" - "golang.org/x/sync/semaphore" - "google.golang.org/grpc" - "google.golang.org/grpc/backoff" - "google.golang.org/grpc/credentials/insecure" - "google.golang.org/grpc/health/grpc_health_v1" ) func init() { diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index 65d11e0d5..519e5849d 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -27,17 +27,18 @@ import ( "runtime" "time" + "github.com/containerd/log" + "github.com/urfave/cli" + "google.golang.org/grpc/grpclog" + "github.com/containerd/containerd/defaults" + "github.com/containerd/containerd/errdefs" _ "github.com/containerd/containerd/metrics" // import containerd build info "github.com/containerd/containerd/mount" "github.com/containerd/containerd/services/server" srvconfig "github.com/containerd/containerd/services/server/config" "github.com/containerd/containerd/sys" "github.com/containerd/containerd/version" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/urfave/cli" - "google.golang.org/grpc/grpclog" ) const usage = ` diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go index 70d4503fc..269a8cc82 100644 --- a/cmd/containerd/command/publish.go +++ b/cmd/containerd/command/publish.go @@ -25,11 +25,11 @@ import ( "time" eventsapi "github.com/containerd/containerd/api/services/events/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/dialer" "github.com/containerd/containerd/protobuf/proto" "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/urfave/cli" "google.golang.org/grpc" "google.golang.org/grpc/backoff" diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go index 768cab42d..08193a14a 100644 --- a/cmd/containerd/command/service_windows.go +++ b/cmd/containerd/command/service_windows.go @@ -24,8 +24,8 @@ import ( "path/filepath" "time" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/services/server" - "github.com/containerd/errdefs" "github.com/sirupsen/logrus" "github.com/urfave/cli" "golang.org/x/sys/windows" diff --git a/cmd/ctr/commands/containers/checkpoint.go b/cmd/ctr/commands/containers/checkpoint.go index 886baa545..3d616c137 100644 --- a/cmd/ctr/commands/containers/checkpoint.go +++ b/cmd/ctr/commands/containers/checkpoint.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 480be5bd6..5ad88840d 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands/run" "github.com/containerd/containerd/containers" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/containers/restore.go b/cmd/ctr/commands/containers/restore.go index 72e57fc42..d4bd5a4da 100644 --- a/cmd/ctr/commands/containers/restore.go +++ b/cmd/ctr/commands/containers/restore.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/cio" "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands/tasks" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go index 6a726736c..23f8f4427 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -27,15 +27,16 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/remotes" - "github.com/containerd/errdefs" "github.com/containerd/log" units "github.com/docker/go-units" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" + + "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/remotes" ) var ( diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index 82bd847e7..2c09400c0 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -26,18 +26,19 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/progress" - "github.com/containerd/containerd/remotes" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/platforms" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" + + "github.com/containerd/containerd" + "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/pkg/progress" + "github.com/containerd/containerd/remotes" ) var fetchCommand = cli.Command{ diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go index 94136f0bd..dc8925b77 100644 --- a/cmd/ctr/commands/images/images.go +++ b/cmd/ctr/commands/images/images.go @@ -24,13 +24,14 @@ import ( "strings" "text/tabwriter" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/progress" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/platforms" "github.com/urfave/cli" + + "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/pkg/progress" ) // Command is the cli command for managing images diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index 4a64cbed1..6d8edda6b 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -20,14 +20,15 @@ import ( "fmt" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/mount" - "github.com/containerd/errdefs" "github.com/containerd/platforms" "github.com/opencontainers/image-spec/identity" "github.com/urfave/cli" + + "github.com/containerd/containerd" + "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/leases" + "github.com/containerd/containerd/mount" ) var mountCommand = cli.Command{ diff --git a/cmd/ctr/commands/images/tag.go b/cmd/ctr/commands/images/tag.go index a938d54cf..40b42926c 100644 --- a/cmd/ctr/commands/images/tag.go +++ b/cmd/ctr/commands/images/tag.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli" "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/transfer/image" - "github.com/containerd/errdefs" ) var tagCommand = cli.Command{ diff --git a/cmd/ctr/commands/images/unmount.go b/cmd/ctr/commands/images/unmount.go index fa0687d0f..853b44cf2 100644 --- a/cmd/ctr/commands/images/unmount.go +++ b/cmd/ctr/commands/images/unmount.go @@ -19,11 +19,12 @@ package images import ( "fmt" + "github.com/urfave/cli" + "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/mount" - "github.com/containerd/errdefs" - "github.com/urfave/cli" ) var unmountCommand = cli.Command{ diff --git a/cmd/ctr/commands/namespaces/namespaces.go b/cmd/ctr/commands/namespaces/namespaces.go index 653ed9a03..d94b7cdef 100644 --- a/cmd/ctr/commands/namespaces/namespaces.go +++ b/cmd/ctr/commands/namespaces/namespaces.go @@ -24,10 +24,11 @@ import ( "strings" "text/tabwriter" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/urfave/cli" + + "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/errdefs" ) // Command is the cli command for managing namespaces diff --git a/cmd/ctr/commands/signals.go b/cmd/ctr/commands/signals.go index dc66e9aea..311608c26 100644 --- a/cmd/ctr/commands/signals.go +++ b/cmd/ctr/commands/signals.go @@ -23,7 +23,7 @@ import ( "syscall" "github.com/containerd/containerd" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/sirupsen/logrus" ) diff --git a/container.go b/container.go index cad103738..7863b742b 100644 --- a/container.go +++ b/container.go @@ -29,11 +29,11 @@ import ( tasktypes "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/errdefs" "github.com/containerd/fifo" "github.com/containerd/typeurl/v2" ver "github.com/opencontainers/image-spec/specs-go" diff --git a/container_opts.go b/container_opts.go index 0cbf6c20f..4a937032f 100644 --- a/container_opts.go +++ b/container_opts.go @@ -24,12 +24,12 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/opencontainers/image-spec/identity" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/container_opts_unix.go b/container_opts_unix.go index e0e8bad88..016c1a925 100644 --- a/container_opts_unix.go +++ b/container_opts_unix.go @@ -26,8 +26,8 @@ import ( "syscall" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" - "github.com/containerd/errdefs" "github.com/opencontainers/image-spec/identity" ) diff --git a/containerstore.go b/containerstore.go index c0cca1907..331a6f41d 100644 --- a/containerstore.go +++ b/containerstore.go @@ -23,9 +23,9 @@ import ( containersapi "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/content/helpers.go b/content/helpers.go index f4763847d..93bcdde10 100644 --- a/content/helpers.go +++ b/content/helpers.go @@ -24,11 +24,12 @@ import ( "sync" "time" - "github.com/containerd/containerd/pkg/randutil" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/pkg/randutil" ) var ErrReset = errors.New("writer has been reset") diff --git a/content/helpers_test.go b/content/helpers_test.go index b23d32d9d..cb003c337 100644 --- a/content/helpers_test.go +++ b/content/helpers_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" ) diff --git a/content/local/locks.go b/content/local/locks.go index 4caffcc02..1e59f39b3 100644 --- a/content/local/locks.go +++ b/content/local/locks.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" ) // Handles locking references diff --git a/content/local/readerat.go b/content/local/readerat.go index 7918844b1..899e85c0b 100644 --- a/content/local/readerat.go +++ b/content/local/readerat.go @@ -22,7 +22,7 @@ import ( "os" "github.com/containerd/containerd/content" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" ) // readerat implements io.ReaderAt in a completely stateless manner by opening diff --git a/content/local/store.go b/content/local/store.go index feecec79f..e1baee4c2 100644 --- a/content/local/store.go +++ b/content/local/store.go @@ -27,13 +27,14 @@ import ( "sync" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/pkg/randutil" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/sirupsen/logrus" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/filters" + "github.com/containerd/containerd/pkg/randutil" + "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/content/local/store_test.go b/content/local/store_test.go index 1358f24b0..48ad54a0b 100644 --- a/content/local/store_test.go +++ b/content/local/store_test.go @@ -34,9 +34,9 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/testsuite" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/randutil" "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/content/local/writer.go b/content/local/writer.go index f82b131e1..0cd8f2d04 100644 --- a/content/local/writer.go +++ b/content/local/writer.go @@ -26,10 +26,11 @@ import ( "runtime" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" ) // writer represents a write transaction against the blob store. diff --git a/content/proxy/content_store.go b/content/proxy/content_store.go index d666fa959..8e7fb42cf 100644 --- a/content/proxy/content_store.go +++ b/content/proxy/content_store.go @@ -22,9 +22,9 @@ import ( contentapi "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/protobuf" protobuftypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/content/proxy/content_writer.go b/content/proxy/content_writer.go index 8d72f8e9d..185115b0a 100644 --- a/content/proxy/content_writer.go +++ b/content/proxy/content_writer.go @@ -23,8 +23,8 @@ import ( contentapi "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/protobuf" - "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ) diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go index baddeebde..8a5cbbbc5 100644 --- a/content/testsuite/testsuite.go +++ b/content/testsuite/testsuite.go @@ -28,13 +28,14 @@ import ( "testing" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/errdefs" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/pkg/testutil" ) const ( diff --git a/contrib/diffservice/service.go b/contrib/diffservice/service.go index 878852023..2d5329c62 100644 --- a/contrib/diffservice/service.go +++ b/contrib/diffservice/service.go @@ -22,8 +22,8 @@ import ( diffapi "github.com/containerd/containerd/api/services/diff/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go index 41d4c9ddd..a649d73df 100644 --- a/contrib/snapshotservice/service.go +++ b/contrib/snapshotservice/service.go @@ -21,11 +21,11 @@ import ( snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" ) var empty = &ptypes.Empty{} diff --git a/diff/apply/apply_linux.go b/diff/apply/apply_linux.go index 99f3278de..48b4f70fe 100644 --- a/diff/apply/apply_linux.go +++ b/diff/apply/apply_linux.go @@ -27,8 +27,8 @@ import ( "golang.org/x/sys/unix" "github.com/containerd/containerd/archive" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" - "github.com/containerd/errdefs" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, sync bool) (retErr error) { diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go index c60d4037c..05088ef67 100644 --- a/diff/lcow/lcow.go +++ b/diff/lcow/lcow.go @@ -30,15 +30,16 @@ import ( "github.com/Microsoft/go-winio/pkg/security" "github.com/Microsoft/hcsshim/ext4/tar2ext4" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/plugin" - "github.com/containerd/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/metadata" + "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/plugin" ) const ( diff --git a/diff/proxy/differ.go b/diff/proxy/differ.go index 1b0056865..1492dc673 100644 --- a/diff/proxy/differ.go +++ b/diff/proxy/differ.go @@ -22,11 +22,11 @@ import ( diffapi "github.com/containerd/containerd/api/services/diff/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/epoch" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/diff/walking/differ.go b/diff/walking/differ.go index 35da1533b..0127fc452 100644 --- a/diff/walking/differ.go +++ b/diff/walking/differ.go @@ -25,17 +25,18 @@ import ( "io" "time" + "github.com/containerd/log" + digest "github.com/opencontainers/go-digest" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/containerd/containerd/archive" "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/epoch" - "github.com/containerd/errdefs" - "github.com/containerd/log" - digest "github.com/opencontainers/go-digest" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) type walkingDiff struct { diff --git a/diff/windows/windows.go b/diff/windows/windows.go index 8a327121c..56b360f24 100644 --- a/diff/windows/windows.go +++ b/diff/windows/windows.go @@ -28,20 +28,21 @@ import ( "time" "github.com/Microsoft/go-winio" + "github.com/containerd/log" + "github.com/containerd/platforms" + "github.com/opencontainers/go-digest" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/containerd/containerd/archive" "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/epoch" "github.com/containerd/containerd/plugin" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/containerd/platforms" - "github.com/opencontainers/go-digest" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) func init() { diff --git a/events.go b/events.go index a1dabb5de..eec9661fa 100644 --- a/events.go +++ b/events.go @@ -19,10 +19,10 @@ package containerd import ( "context" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" eventsapi "github.com/containerd/containerd/api/services/events/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/protobuf" ) diff --git a/events/exchange/exchange.go b/events/exchange/exchange.go index 38c41f395..b39044909 100644 --- a/events/exchange/exchange.go +++ b/events/exchange/exchange.go @@ -22,14 +22,15 @@ import ( "strings" "time" + "github.com/containerd/log" + "github.com/containerd/typeurl/v2" + goevents "github.com/docker/go-events" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/containerd/typeurl/v2" - goevents "github.com/docker/go-events" ) // Exchange broadcasts events diff --git a/events/exchange/exchange_test.go b/events/exchange/exchange_test.go index 0a68b7a91..422586cf3 100644 --- a/events/exchange/exchange_test.go +++ b/events/exchange/exchange_test.go @@ -23,10 +23,10 @@ import ( "time" eventstypes "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/protobuf" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" ) diff --git a/filters/parser.go b/filters/parser.go index f07fd33bd..32767909b 100644 --- a/filters/parser.go +++ b/filters/parser.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" ) /* diff --git a/identifiers/validate.go b/identifiers/validate.go index 0acbf3fc4..cbd3a52ba 100644 --- a/identifiers/validate.go +++ b/identifiers/validate.go @@ -28,7 +28,7 @@ import ( "fmt" "regexp" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" ) const ( diff --git a/identifiers/validate_test.go b/identifiers/validate_test.go index 615e6ab7d..77f926c0c 100644 --- a/identifiers/validate_test.go +++ b/identifiers/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" ) func TestValidIdentifiers(t *testing.T) { diff --git a/image.go b/image.go index 914ab35a7..2497a3c14 100644 --- a/image.go +++ b/image.go @@ -24,19 +24,20 @@ import ( "strings" "sync/atomic" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/pkg/kmutex" - "github.com/containerd/containerd/rootfs" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" "github.com/containerd/platforms" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/labels" + "github.com/containerd/containerd/pkg/kmutex" + "github.com/containerd/containerd/rootfs" + "github.com/containerd/containerd/snapshots" ) // Image describes an image used by containers diff --git a/image_store.go b/image_store.go index 120d8d54d..524a7a672 100644 --- a/image_store.go +++ b/image_store.go @@ -21,11 +21,11 @@ import ( imagesapi "github.com/containerd/containerd/api/services/images/v1" "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/pkg/epoch" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/images/archive/exporter.go b/images/archive/exporter.go index 016c147f3..3d53aca8e 100644 --- a/images/archive/exporter.go +++ b/images/archive/exporter.go @@ -26,15 +26,16 @@ import ( "sort" "strings" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/platforms" digest "github.com/opencontainers/go-digest" ocispecs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/labels" ) type exportOptions struct { diff --git a/images/archive/importer.go b/images/archive/importer.go index fe6d45199..99712da74 100644 --- a/images/archive/importer.go +++ b/images/archive/importer.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/platforms" digest "github.com/opencontainers/go-digest" diff --git a/images/converter/uncompress/uncompress.go b/images/converter/uncompress/uncompress.go index 7c1669ae9..ceb998fb8 100644 --- a/images/converter/uncompress/uncompress.go +++ b/images/converter/uncompress/uncompress.go @@ -23,10 +23,10 @@ import ( "github.com/containerd/containerd/archive/compression" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/converter" "github.com/containerd/containerd/labels" - "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/handlers.go b/images/handlers.go index 7a34cc544..a685092e2 100644 --- a/images/handlers.go +++ b/images/handlers.go @@ -22,12 +22,13 @@ import ( "fmt" "sort" - "github.com/containerd/containerd/content" - "github.com/containerd/errdefs" "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" ) var ( diff --git a/images/image.go b/images/image.go index a13710e74..b934e3496 100644 --- a/images/image.go +++ b/images/image.go @@ -23,12 +23,13 @@ import ( "sort" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/platforms" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" ) // Image provides the model for how containerd views container images. diff --git a/images/mediatypes.go b/images/mediatypes.go index cd51aa5eb..d3b28d42d 100644 --- a/images/mediatypes.go +++ b/images/mediatypes.go @@ -22,7 +22,7 @@ import ( "sort" "strings" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/import.go b/import.go index 1472f489e..79c87fdd4 100644 --- a/import.go +++ b/import.go @@ -21,13 +21,14 @@ import ( "encoding/json" "io" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/archive" - "github.com/containerd/errdefs" "github.com/containerd/platforms" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/images/archive" ) type importOpts struct { diff --git a/integration/client/client_test.go b/integration/client/client_test.go index 3d0e63c18..2c00fb040 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -32,16 +32,17 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" + "github.com/containerd/log" + "github.com/containerd/platforms" + . "github.com/containerd/containerd" "github.com/containerd/containerd/defaults" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" imagelist "github.com/containerd/containerd/integration/images" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/containerd/platforms" ) var ( diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index db69456de..98a63588c 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -34,9 +34,11 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" + . "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/integration/failpoint" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/fifosync" @@ -44,7 +46,6 @@ import ( "github.com/containerd/containerd/runtime/linux/runctypes" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/sys" - "github.com/containerd/errdefs" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 4b5035acd..3135cabcc 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -35,6 +35,7 @@ import ( apievents "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/oci" @@ -43,7 +44,6 @@ import ( _ "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/continuity/fs" - "github.com/containerd/errdefs" "github.com/containerd/go-runc" "github.com/containerd/log/logtest" "github.com/containerd/platforms" diff --git a/integration/client/content_test.go b/integration/client/content_test.go index 4c06afb67..ffcb1b810 100644 --- a/integration/client/content_test.go +++ b/integration/client/content_test.go @@ -25,8 +25,8 @@ import ( . "github.com/containerd/containerd" "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/testsuite" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" ) func newContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) { diff --git a/integration/client/export_test.go b/integration/client/export_test.go index 85f2020ba..d926387c9 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -25,15 +25,16 @@ import ( "strings" "testing" - . "github.com/containerd/containerd" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/archive" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" "github.com/containerd/platforms" "github.com/google/uuid" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + . "github.com/containerd/containerd" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/images/archive" + "github.com/containerd/containerd/namespaces" ) func TestExportAllCases(t *testing.T) { diff --git a/integration/client/go.mod b/integration/client/go.mod index 691214ef6..3e6fb6884 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -10,7 +10,6 @@ require ( github.com/containerd/containerd v1.7.17 // see replace; the actual version of containerd is replaced with the code at the root of this repository github.com/containerd/containerd/api v1.7.19 github.com/containerd/continuity v0.4.2 - github.com/containerd/errdefs v0.1.0 github.com/containerd/go-runc v1.0.0 github.com/containerd/log v0.1.0 github.com/containerd/platforms v0.2.1 @@ -33,6 +32,7 @@ require ( github.com/cilium/ebpf v0.9.1 // indirect github.com/containerd/cgroups v1.1.0 // indirect github.com/containerd/console v1.0.3 // indirect + github.com/containerd/errdefs v0.1.0 // indirect github.com/containerd/fifo v1.1.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/integration/client/image_test.go b/integration/client/image_test.go index 2411325fc..d32a4bd13 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -23,13 +23,14 @@ import ( "strings" "testing" + "github.com/containerd/platforms" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + . "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" imagelist "github.com/containerd/containerd/integration/images" "github.com/containerd/containerd/labels" - "github.com/containerd/errdefs" - "github.com/containerd/platforms" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) func TestImageIsUnpacked(t *testing.T) { diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 28e5e17aa..455e12814 100644 --- a/integration/client/lease_test.go +++ b/integration/client/lease_test.go @@ -21,10 +21,10 @@ import ( "testing" . "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" imagelist "github.com/containerd/containerd/integration/images" "github.com/containerd/containerd/leases" - "github.com/containerd/errdefs" "github.com/opencontainers/image-spec/identity" ) diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go index ee382eace..171ea4938 100644 --- a/integration/containerd_image_test.go +++ b/integration/containerd_image_test.go @@ -26,10 +26,10 @@ import ( "time" "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/integration/images" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/cri/labels" - "github.com/containerd/errdefs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/labels/validate.go b/labels/validate.go index 6f23cdd7c..f83b5dde2 100644 --- a/labels/validate.go +++ b/labels/validate.go @@ -19,7 +19,7 @@ package labels import ( "fmt" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" ) const ( diff --git a/labels/validate_test.go b/labels/validate_test.go index 16be11df3..628f2fd7a 100644 --- a/labels/validate_test.go +++ b/labels/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/stretchr/testify/assert" ) diff --git a/leases/proxy/manager.go b/leases/proxy/manager.go index 342db9426..ae42d8eb1 100644 --- a/leases/proxy/manager.go +++ b/leases/proxy/manager.go @@ -20,9 +20,9 @@ import ( "context" leasesapi "github.com/containerd/containerd/api/services/leases/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/protobuf" - "github.com/containerd/errdefs" ) type proxyManager struct { diff --git a/metadata/containers.go b/metadata/containers.go index 8929ebf97..d97d9c6cd 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -24,6 +24,7 @@ import ( "time" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/labels" @@ -31,7 +32,6 @@ import ( "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/protobuf/proto" "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/containers_test.go b/metadata/containers_test.go index 5afa2d26f..78c70ed88 100644 --- a/metadata/containers_test.go +++ b/metadata/containers_test.go @@ -25,12 +25,6 @@ import ( "testing" "time" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/containerd/log/logtest" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" @@ -38,6 +32,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" bolt "go.etcd.io/bbolt" + + "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/filters" + "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/protobuf/types" ) func init() { diff --git a/metadata/content.go b/metadata/content.go index e3ccf3f85..059c306cc 100644 --- a/metadata/content.go +++ b/metadata/content.go @@ -25,16 +25,17 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/metadata/boltutil" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/filters" + "github.com/containerd/containerd/labels" + "github.com/containerd/containerd/metadata/boltutil" + "github.com/containerd/containerd/namespaces" ) type contentStore struct { diff --git a/metadata/content_test.go b/metadata/content_test.go index a65ee8241..8803150bc 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/local" "github.com/containerd/containerd/content/testsuite" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/metadata/db_test.go b/metadata/db_test.go index 9149df0b2..1256d4353 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -29,9 +29,17 @@ import ( "testing" "time" + "github.com/containerd/log/logtest" + "github.com/opencontainers/go-digest" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + bolt "go.etcd.io/bbolt" + "github.com/containerd/containerd/containers" "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/local" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" @@ -39,13 +47,6 @@ import ( "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/native" - "github.com/containerd/errdefs" - "github.com/containerd/log/logtest" - "github.com/opencontainers/go-digest" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - bolt "go.etcd.io/bbolt" ) type testOptions struct { diff --git a/metadata/images.go b/metadata/images.go index beba82d07..ff5b624cc 100644 --- a/metadata/images.go +++ b/metadata/images.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "time" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/epoch" - "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/metadata/images_test.go b/metadata/images_test.go index 5511fd9b5..8d3ae878e 100644 --- a/metadata/images_test.go +++ b/metadata/images_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/images" - "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/metadata/leases.go b/metadata/leases.go index 7c451e746..03fa75af3 100644 --- a/metadata/leases.go +++ b/metadata/leases.go @@ -24,11 +24,11 @@ import ( "sync/atomic" "time" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/leases_test.go b/metadata/leases_test.go index 4cbb1ee6f..56aa0d9f0 100644 --- a/metadata/leases_test.go +++ b/metadata/leases_test.go @@ -22,8 +22,8 @@ import ( "fmt" "testing" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" - "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/namespaces.go b/metadata/namespaces.go index 8b6174e35..84eb83f27 100644 --- a/metadata/namespaces.go +++ b/metadata/namespaces.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/identifiers" l "github.com/containerd/containerd/labels" "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/plugin/plugin.go b/metadata/plugin/plugin.go index 4d7aaedd5..ccfec5fa6 100644 --- a/metadata/plugin/plugin.go +++ b/metadata/plugin/plugin.go @@ -22,13 +22,14 @@ import ( "path/filepath" "time" + "github.com/containerd/log" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/pkg/timeout" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" - "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/sandbox.go b/metadata/sandbox.go index 78126b4db..5766647d3 100644 --- a/metadata/sandbox.go +++ b/metadata/sandbox.go @@ -23,12 +23,12 @@ import ( "strings" "time" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/namespaces" api "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/metadata/sandbox_test.go b/metadata/sandbox_test.go index 1b57c2f0f..711fb0c13 100644 --- a/metadata/sandbox_test.go +++ b/metadata/sandbox_test.go @@ -19,9 +19,9 @@ package metadata import ( "testing" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/protobuf/types" api "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" ) diff --git a/metadata/snapshot.go b/metadata/snapshot.go index 8388e19c4..a44a65cee 100644 --- a/metadata/snapshot.go +++ b/metadata/snapshot.go @@ -24,16 +24,17 @@ import ( "sync/atomic" "time" + "github.com/containerd/log" + bolt "go.etcd.io/bbolt" + eventstypes "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" - "github.com/containerd/log" - bolt "go.etcd.io/bbolt" ) const ( diff --git a/metadata/snapshot_test.go b/metadata/snapshot_test.go index 5716b6426..0be774800 100644 --- a/metadata/snapshot_test.go +++ b/metadata/snapshot_test.go @@ -27,6 +27,7 @@ import ( "testing" "time" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/mount" @@ -35,7 +36,6 @@ import ( "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/native" "github.com/containerd/containerd/snapshots/testsuite" - "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go index 425b9bc06..0382ba99f 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -22,15 +22,16 @@ import ( "context" cgroups "github.com/containerd/cgroups/v3/cgroup1" + "github.com/containerd/log" + "github.com/docker/go-metrics" + "github.com/sirupsen/logrus" + eventstypes "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v1/linux" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/docker/go-metrics" - "github.com/sirupsen/logrus" ) // NewTaskMonitor returns a new cgroups monitor diff --git a/namespaces.go b/namespaces.go index f4cc949d8..83ee828dd 100644 --- a/namespaces.go +++ b/namespaces.go @@ -21,9 +21,9 @@ import ( "strings" api "github.com/containerd/containerd/api/services/namespaces/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" ) // NewNamespaceStoreFromClient returns a new namespace store diff --git a/namespaces/context.go b/namespaces/context.go index 94ef9408d..e5e23fe43 100644 --- a/namespaces/context.go +++ b/namespaces/context.go @@ -21,8 +21,8 @@ import ( "fmt" "os" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/identifiers" - "github.com/containerd/errdefs" ) const ( diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go index 939fcfd0e..3839887a4 100644 --- a/oci/spec_opts_test.go +++ b/oci/spec_opts_test.go @@ -38,8 +38,8 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" ) type blob []byte diff --git a/pkg/cri/instrument/instrumented_service.go b/pkg/cri/instrument/instrumented_service.go index 9a44757fa..826837c3e 100644 --- a/pkg/cri/instrument/instrumented_service.go +++ b/pkg/cri/instrument/instrumented_service.go @@ -21,12 +21,13 @@ import ( "errors" "sync" + "github.com/containerd/log" + runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/services/warning" runtime_alpha "github.com/containerd/containerd/third_party/k8s.io/cri-api/pkg/apis/runtime/v1alpha2" "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" - "github.com/containerd/log" - runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/pkg/deprecation" diff --git a/pkg/cri/nri/nri_api_linux.go b/pkg/cri/nri/nri_api_linux.go index 49b40a2be..fdcadf3b0 100644 --- a/pkg/cri/nri/nri_api_linux.go +++ b/pkg/cri/nri/nri_api_linux.go @@ -21,15 +21,6 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/pkg/blockio" - "github.com/containerd/containerd/pkg/cri/annotations" - "github.com/containerd/containerd/pkg/cri/constants" - cstore "github.com/containerd/containerd/pkg/cri/store/container" - sstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" @@ -37,9 +28,20 @@ import ( "github.com/opencontainers/runtime-tools/generate" cri "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/nri" + "github.com/containerd/containerd" + "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/pkg/blockio" + "github.com/containerd/containerd/pkg/cri/annotations" + "github.com/containerd/containerd/pkg/cri/constants" + cstore "github.com/containerd/containerd/pkg/cri/store/container" + sstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/nri/pkg/api" nrigen "github.com/containerd/nri/pkg/runtime-tools/generate" + + "github.com/containerd/containerd/pkg/nri" ) type API struct { diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 21c97b7bd..adc48b5e1 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -25,12 +25,13 @@ import ( "github.com/containerd/continuity/fs" + "github.com/containerd/log" + "github.com/containerd/containerd" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) // WithNewSnapshot wraps `containerd.WithNewSnapshot` so that if creating the diff --git a/pkg/cri/opts/spec_nonwindows.go b/pkg/cri/opts/spec_nonwindows.go index 00916612a..4759711d3 100644 --- a/pkg/cri/opts/spec_nonwindows.go +++ b/pkg/cri/opts/spec_nonwindows.go @@ -22,8 +22,8 @@ import ( "context" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" - "github.com/containerd/errdefs" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_execsync.go b/pkg/cri/sbserver/container_execsync.go index a6ebddada..f83d992e5 100644 --- a/pkg/cri/sbserver/container_execsync.go +++ b/pkg/cri/sbserver/container_execsync.go @@ -24,14 +24,15 @@ import ( "syscall" "time" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/oci" - "github.com/containerd/errdefs" "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd" + containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/oci" + cio "github.com/containerd/containerd/pkg/cri/io" "github.com/containerd/containerd/pkg/cri/util" cioutil "github.com/containerd/containerd/pkg/ioutil" diff --git a/pkg/cri/sbserver/container_remove.go b/pkg/cri/sbserver/container_remove.go index fc52a4aa5..1ffcd08af 100644 --- a/pkg/cri/sbserver/container_remove.go +++ b/pkg/cri/sbserver/container_remove.go @@ -22,12 +22,13 @@ import ( "fmt" "time" - "github.com/containerd/containerd" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" + containerstore "github.com/containerd/containerd/pkg/cri/store/container" ) // RemoveContainer removes the container. diff --git a/pkg/cri/sbserver/container_start.go b/pkg/cri/sbserver/container_start.go index 16a43f616..153141b17 100644 --- a/pkg/cri/sbserver/container_start.go +++ b/pkg/cri/sbserver/container_start.go @@ -23,13 +23,14 @@ import ( "io" "time" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd" + containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" + 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" diff --git a/pkg/cri/sbserver/container_stats_list.go b/pkg/cri/sbserver/container_stats_list.go index 63382d1c9..b9342f660 100644 --- a/pkg/cri/sbserver/container_stats_list.go +++ b/pkg/cri/sbserver/container_stats_list.go @@ -26,15 +26,16 @@ import ( wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats" cg1 "github.com/containerd/cgroups/v3/cgroup1/stats" cg2 "github.com/containerd/cgroups/v3/cgroup2/stats" - "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/pkg/cri/store/stats" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd/api/services/tasks/v1" + "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/pkg/cri/store/stats" + "github.com/containerd/containerd/protobuf" + containerstore "github.com/containerd/containerd/pkg/cri/store/container" ) diff --git a/pkg/cri/sbserver/container_status.go b/pkg/cri/sbserver/container_status.go index aba04d04d..ac4f8489b 100644 --- a/pkg/cri/sbserver/container_status.go +++ b/pkg/cri/sbserver/container_status.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" + "github.com/containerd/containerd/errdefs" containerstore "github.com/containerd/containerd/pkg/cri/store/container" - "github.com/containerd/errdefs" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_stop.go b/pkg/cri/sbserver/container_stop.go index c59a9f53c..8d91408ec 100644 --- a/pkg/cri/sbserver/container_stop.go +++ b/pkg/cri/sbserver/container_stop.go @@ -23,15 +23,15 @@ import ( "syscall" "time" + "github.com/containerd/log" + "github.com/moby/sys/signal" + runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + eventtypes "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/errdefs" containerstore "github.com/containerd/containerd/pkg/cri/store/container" ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/protobuf" - "github.com/containerd/errdefs" - "github.com/containerd/log" - - "github.com/moby/sys/signal" - runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) // StopContainer stops a running container with a grace period (i.e., timeout). diff --git a/pkg/cri/sbserver/container_update_resources.go b/pkg/cri/sbserver/container_update_resources.go index ab3b67f9e..3bedeebe4 100644 --- a/pkg/cri/sbserver/container_update_resources.go +++ b/pkg/cri/sbserver/container_update_resources.go @@ -23,15 +23,14 @@ import ( gocontext "context" "fmt" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/errdefs" - "github.com/containerd/log" - + "github.com/containerd/containerd/errdefs" containerstore "github.com/containerd/containerd/pkg/cri/store/container" ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) diff --git a/pkg/cri/sbserver/events.go b/pkg/cri/sbserver/events.go index 9c34dd3a8..996af5ee7 100644 --- a/pkg/cri/sbserver/events.go +++ b/pkg/cri/sbserver/events.go @@ -27,13 +27,13 @@ import ( eventtypes "github.com/containerd/containerd/api/events" apitasks "github.com/containerd/containerd/api/services/tasks/v1" containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/pkg/cri/constants" 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/protobuf" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/helpers.go b/pkg/cri/sbserver/helpers.go index eef800f17..402247072 100644 --- a/pkg/cri/sbserver/helpers.go +++ b/pkg/cri/sbserver/helpers.go @@ -28,11 +28,13 @@ import ( "time" "github.com/containerd/typeurl/v2" + docker "github.com/distribution/reference" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "github.com/containerd/containerd" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" clabels "github.com/containerd/containerd/labels" criconfig "github.com/containerd/containerd/pkg/cri/config" containerstore "github.com/containerd/containerd/pkg/cri/store/container" @@ -41,8 +43,6 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime/linux/runctypes" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/errdefs" - docker "github.com/distribution/reference" runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" imagedigest "github.com/opencontainers/go-digest" diff --git a/pkg/cri/sbserver/helpers_test.go b/pkg/cri/sbserver/helpers_test.go index ca7d8e838..008d80bde 100644 --- a/pkg/cri/sbserver/helpers_test.go +++ b/pkg/cri/sbserver/helpers_test.go @@ -27,6 +27,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" criconfig "github.com/containerd/containerd/pkg/cri/config" containerstore "github.com/containerd/containerd/pkg/cri/store/container" @@ -35,7 +36,6 @@ import ( "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/runtime/linux/runctypes" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" docker "github.com/distribution/reference" diff --git a/pkg/cri/sbserver/image_pull.go b/pkg/cri/sbserver/image_pull.go index 2d40e5606..e8dead03f 100644 --- a/pkg/cri/sbserver/image_pull.go +++ b/pkg/cri/sbserver/image_pull.go @@ -39,7 +39,11 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/log" + distribution "github.com/distribution/reference" + "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" @@ -48,9 +52,6 @@ import ( "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/config" "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" - "github.com/containerd/log" - distribution "github.com/distribution/reference" ) // For image management: diff --git a/pkg/cri/sbserver/image_remove.go b/pkg/cri/sbserver/image_remove.go index 4ae93f999..b43655c49 100644 --- a/pkg/cri/sbserver/image_remove.go +++ b/pkg/cri/sbserver/image_remove.go @@ -20,9 +20,9 @@ import ( "context" "fmt" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/image_status.go b/pkg/cri/sbserver/image_status.go index 8ca2546e5..86ed23a15 100644 --- a/pkg/cri/sbserver/image_status.go +++ b/pkg/cri/sbserver/image_status.go @@ -21,13 +21,13 @@ import ( "encoding/json" "fmt" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" - "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" "github.com/containerd/log" - imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd/errdefs" + imagestore "github.com/containerd/containerd/pkg/cri/store/image" + "github.com/containerd/containerd/tracing" ) // ImageStatus returns the status of the image, returns nil if the image isn't present. diff --git a/pkg/cri/sbserver/podsandbox/controller.go b/pkg/cri/sbserver/podsandbox/controller.go index 7dcebf361..3320375a2 100644 --- a/pkg/cri/sbserver/podsandbox/controller.go +++ b/pkg/cri/sbserver/podsandbox/controller.go @@ -25,8 +25,11 @@ import ( "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/platforms" + "github.com/containerd/containerd" eventtypes "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" criconfig "github.com/containerd/containerd/pkg/cri/config" imagestore "github.com/containerd/containerd/pkg/cri/store/image" @@ -35,8 +38,6 @@ import ( osinterface "github.com/containerd/containerd/pkg/os" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" - "github.com/containerd/platforms" ) // CRIService interface contains things required by controller, but not yet refactored from criService. diff --git a/pkg/cri/sbserver/podsandbox/recover.go b/pkg/cri/sbserver/podsandbox/recover.go index 21c69d7cc..291d982d9 100644 --- a/pkg/cri/sbserver/podsandbox/recover.go +++ b/pkg/cri/sbserver/podsandbox/recover.go @@ -22,15 +22,15 @@ import ( goruntime "runtime" "time" - "github.com/containerd/containerd/pkg/netns" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/errdefs" - "github.com/containerd/log" + "github.com/containerd/containerd/pkg/netns" ) // loadContainerTimeout is the default timeout for loading a container/sandbox. diff --git a/pkg/cri/sbserver/podsandbox/sandbox_delete.go b/pkg/cri/sbserver/podsandbox/sandbox_delete.go index ba2387301..a490fb21a 100644 --- a/pkg/cri/sbserver/podsandbox/sandbox_delete.go +++ b/pkg/cri/sbserver/podsandbox/sandbox_delete.go @@ -20,10 +20,11 @@ import ( "context" "fmt" + "github.com/containerd/log" + "github.com/containerd/containerd" apitasks "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/errdefs" - "github.com/containerd/log" + "github.com/containerd/containerd/errdefs" ) func (c *Controller) Shutdown(ctx context.Context, sandboxID string) error { diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run.go b/pkg/cri/sbserver/podsandbox/sandbox_run.go index 3d010814e..352b638bd 100644 --- a/pkg/cri/sbserver/podsandbox/sandbox_run.go +++ b/pkg/cri/sbserver/podsandbox/sandbox_run.go @@ -29,8 +29,11 @@ import ( "github.com/opencontainers/selinux/go-selinux" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/log" + "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" customopts "github.com/containerd/containerd/pkg/cri/opts" @@ -38,8 +41,6 @@ import ( ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/sandbox" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) func init() { diff --git a/pkg/cri/sbserver/podsandbox/sandbox_status.go b/pkg/cri/sbserver/podsandbox/sandbox_status.go index e0e018bef..dceb657a1 100644 --- a/pkg/cri/sbserver/podsandbox/sandbox_status.go +++ b/pkg/cri/sbserver/podsandbox/sandbox_status.go @@ -23,9 +23,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" "github.com/containerd/go-cni" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/sbserver/podsandbox/sandbox_stop.go b/pkg/cri/sbserver/podsandbox/sandbox_stop.go index 8fa146d68..51d4eb228 100644 --- a/pkg/cri/sbserver/podsandbox/sandbox_stop.go +++ b/pkg/cri/sbserver/podsandbox/sandbox_stop.go @@ -25,11 +25,11 @@ import ( "github.com/sirupsen/logrus" eventtypes "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/errdefs" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" ) func (c *Controller) Stop(ctx context.Context, sandboxID string, _ ...sandbox.StopOpt) error { diff --git a/pkg/cri/sbserver/restart.go b/pkg/cri/sbserver/restart.go index 502a2cece..f984e5677 100644 --- a/pkg/cri/sbserver/restart.go +++ b/pkg/cri/sbserver/restart.go @@ -24,19 +24,20 @@ import ( "sync" "time" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - containerdimages "github.com/containerd/containerd/images" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/sbserver/podsandbox" - "github.com/containerd/containerd/pkg/netns" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/platforms" "github.com/containerd/typeurl/v2" "golang.org/x/sync/errgroup" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd" + containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" + containerdimages "github.com/containerd/containerd/images" + criconfig "github.com/containerd/containerd/pkg/cri/config" + "github.com/containerd/containerd/pkg/cri/sbserver/podsandbox" + "github.com/containerd/containerd/pkg/netns" + 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" diff --git a/pkg/cri/sbserver/sandbox_portforward_other.go b/pkg/cri/sbserver/sandbox_portforward_other.go index 211c35866..cadbae0c8 100644 --- a/pkg/cri/sbserver/sandbox_portforward_other.go +++ b/pkg/cri/sbserver/sandbox_portforward_other.go @@ -23,7 +23,7 @@ import ( "fmt" "io" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" ) // portForward uses netns to enter the sandbox namespace, and forwards a stream inside the diff --git a/pkg/cri/sbserver/sandbox_remove.go b/pkg/cri/sbserver/sandbox_remove.go index b79ec6649..9de19552a 100644 --- a/pkg/cri/sbserver/sandbox_remove.go +++ b/pkg/cri/sbserver/sandbox_remove.go @@ -21,9 +21,10 @@ import ( "fmt" "time" - "github.com/containerd/errdefs" "github.com/containerd/log" + "github.com/containerd/containerd/errdefs" + "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/sandbox_stats_linux.go b/pkg/cri/sbserver/sandbox_stats_linux.go index 3b0bde5d8..282c563d0 100644 --- a/pkg/cri/sbserver/sandbox_stats_linux.go +++ b/pkg/cri/sbserver/sandbox_stats_linux.go @@ -24,12 +24,13 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd/errdefs" + sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ) func (c *criService) podSandboxStats( diff --git a/pkg/cri/sbserver/sandbox_stats_list.go b/pkg/cri/sbserver/sandbox_stats_list.go index e54853701..862506fd7 100644 --- a/pkg/cri/sbserver/sandbox_stats_list.go +++ b/pkg/cri/sbserver/sandbox_stats_list.go @@ -20,11 +20,12 @@ import ( "context" "fmt" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/hashicorp/go-multierror" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd/errdefs" + sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ) // ListPodSandboxStats returns stats of all ready sandboxes. diff --git a/pkg/cri/sbserver/sandbox_stats_other.go b/pkg/cri/sbserver/sandbox_stats_other.go index 3b45b8e15..8a249a485 100644 --- a/pkg/cri/sbserver/sandbox_stats_other.go +++ b/pkg/cri/sbserver/sandbox_stats_other.go @@ -22,8 +22,8 @@ import ( "context" "fmt" + "github.com/containerd/containerd/errdefs" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/sandbox_stats_windows.go b/pkg/cri/sbserver/sandbox_stats_windows.go index 951301aac..4ed0332fb 100644 --- a/pkg/cri/sbserver/sandbox_stats_windows.go +++ b/pkg/cri/sbserver/sandbox_stats_windows.go @@ -24,15 +24,16 @@ import ( "github.com/Microsoft/hcsshim" wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats" "github.com/Microsoft/hcsshim/hcn" - "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/api/types" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/containerd/pkg/cri/store/stats" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd/api/services/tasks/v1" + "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" + containerstore "github.com/containerd/containerd/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/pkg/cri/store/stats" ) func (c *criService) podSandboxStats( diff --git a/pkg/cri/sbserver/sandbox_status.go b/pkg/cri/sbserver/sandbox_status.go index 10250096c..0b84b43e7 100644 --- a/pkg/cri/sbserver/sandbox_status.go +++ b/pkg/cri/sbserver/sandbox_status.go @@ -21,9 +21,10 @@ import ( "fmt" "time" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd/errdefs" + sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ) // PodSandboxStatus returns the status of the PodSandbox. diff --git a/pkg/cri/sbserver/sandbox_stop.go b/pkg/cri/sbserver/sandbox_stop.go index 930eb3165..7cf826138 100644 --- a/pkg/cri/sbserver/sandbox_stop.go +++ b/pkg/cri/sbserver/sandbox_stop.go @@ -22,10 +22,10 @@ import ( "fmt" "time" - "github.com/containerd/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd/errdefs" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ) diff --git a/pkg/cri/sbserver/snapshots.go b/pkg/cri/sbserver/snapshots.go index 1f0dbfcaf..e8cb943da 100644 --- a/pkg/cri/sbserver/snapshots.go +++ b/pkg/cri/sbserver/snapshots.go @@ -21,8 +21,8 @@ import ( "fmt" "time" + "github.com/containerd/containerd/errdefs" snapshot "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" "github.com/sirupsen/logrus" snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" diff --git a/pkg/cri/server/bandwidth/fake_shaper.go b/pkg/cri/server/bandwidth/fake_shaper.go index 58e4e1ab4..99bfd338a 100644 --- a/pkg/cri/server/bandwidth/fake_shaper.go +++ b/pkg/cri/server/bandwidth/fake_shaper.go @@ -33,7 +33,7 @@ limitations under the License. package bandwidth import ( - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/cri/server/bandwidth/unsupported.go b/pkg/cri/server/bandwidth/unsupported.go index 29e9765f6..26bda16ef 100644 --- a/pkg/cri/server/bandwidth/unsupported.go +++ b/pkg/cri/server/bandwidth/unsupported.go @@ -35,7 +35,7 @@ limitations under the License. package bandwidth import ( - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index 768816571..4f0b32848 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -24,14 +24,15 @@ import ( "syscall" "time" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/oci" - "github.com/containerd/errdefs" "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd" + containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/oci" + cio "github.com/containerd/containerd/pkg/cri/io" "github.com/containerd/containerd/pkg/cri/util" cioutil "github.com/containerd/containerd/pkg/ioutil" diff --git a/pkg/cri/server/container_remove.go b/pkg/cri/server/container_remove.go index bd83bd07e..5fa8328de 100644 --- a/pkg/cri/server/container_remove.go +++ b/pkg/cri/server/container_remove.go @@ -22,12 +22,13 @@ import ( "fmt" "time" - "github.com/containerd/containerd" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" + containerstore "github.com/containerd/containerd/pkg/cri/store/container" ) // RemoveContainer removes the container. diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index ff821589d..1c04dc455 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -23,13 +23,14 @@ import ( "io" "time" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd" + containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" + 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" diff --git a/pkg/cri/server/container_stats_list_other.go b/pkg/cri/server/container_stats_list_other.go index a9d672900..7f1fe2e3c 100644 --- a/pkg/cri/server/container_stats_list_other.go +++ b/pkg/cri/server/container_stats_list_other.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/containerd/containerd/api/types" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerstore "github.com/containerd/containerd/pkg/cri/store/container" diff --git a/pkg/cri/server/container_status.go b/pkg/cri/server/container_status.go index 517f82a86..ed3ba2929 100644 --- a/pkg/cri/server/container_status.go +++ b/pkg/cri/server/container_status.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" + "github.com/containerd/containerd/errdefs" containerstore "github.com/containerd/containerd/pkg/cri/store/container" - "github.com/containerd/errdefs" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_stop.go b/pkg/cri/server/container_stop.go index 72a1b6377..e4091d808 100644 --- a/pkg/cri/server/container_stop.go +++ b/pkg/cri/server/container_stop.go @@ -23,15 +23,15 @@ import ( "syscall" "time" + "github.com/containerd/log" + "github.com/moby/sys/signal" + runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + eventtypes "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/errdefs" containerstore "github.com/containerd/containerd/pkg/cri/store/container" ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/protobuf" - "github.com/containerd/errdefs" - "github.com/containerd/log" - - "github.com/moby/sys/signal" - runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) // StopContainer stops a running container with a grace period (i.e., timeout). diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go index e4f1e0098..e875d7236 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/pkg/cri/server/container_update_resources.go @@ -23,14 +23,14 @@ import ( gocontext "context" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd" + "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" containerstore "github.com/containerd/containerd/pkg/cri/store/container" ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 5699a1e19..f7f7d7234 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -27,13 +27,13 @@ import ( eventtypes "github.com/containerd/containerd/api/events" apitasks "github.com/containerd/containerd/api/services/tasks/v1" containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/pkg/cri/constants" 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/protobuf" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 7bdb4aff0..8e8c33a91 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -28,6 +28,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" clabels "github.com/containerd/containerd/labels" criconfig "github.com/containerd/containerd/pkg/cri/config" containerstore "github.com/containerd/containerd/pkg/cri/store/container" @@ -37,7 +38,6 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime/linux/runctypes" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" docker "github.com/distribution/reference" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go index a411e67b1..64931cb5f 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -25,6 +25,7 @@ import ( "time" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" criconfig "github.com/containerd/containerd/pkg/cri/config" containerstore "github.com/containerd/containerd/pkg/cri/store/container" @@ -33,7 +34,6 @@ import ( "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/runtime/linux/runctypes" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" docker "github.com/distribution/reference" diff --git a/pkg/cri/server/image_pull.go b/pkg/cri/server/image_pull.go index 679f03abb..6b321515b 100644 --- a/pkg/cri/server/image_pull.go +++ b/pkg/cri/server/image_pull.go @@ -39,8 +39,12 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/log" + distribution "github.com/distribution/reference" + "github.com/containerd/containerd" "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" @@ -49,9 +53,6 @@ import ( "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/config" "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" - "github.com/containerd/log" - distribution "github.com/distribution/reference" ) // For image management: diff --git a/pkg/cri/server/image_remove.go b/pkg/cri/server/image_remove.go index 011d86c5c..e10062a31 100644 --- a/pkg/cri/server/image_remove.go +++ b/pkg/cri/server/image_remove.go @@ -20,9 +20,9 @@ import ( "context" "fmt" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/image_status.go b/pkg/cri/server/image_status.go index c55bc52ad..31520233f 100644 --- a/pkg/cri/server/image_status.go +++ b/pkg/cri/server/image_status.go @@ -21,13 +21,13 @@ import ( "encoding/json" "fmt" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" - "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" "github.com/containerd/log" - imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd/errdefs" + imagestore "github.com/containerd/containerd/pkg/cri/store/image" + "github.com/containerd/containerd/tracing" ) // ImageStatus returns the status of the image, returns nil if the image isn't present. diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index 9af38fa7f..76471471b 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -24,16 +24,16 @@ import ( "sync" "time" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/platforms" "github.com/containerd/typeurl/v2" "golang.org/x/sync/errgroup" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd" + containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" + containerdimages "github.com/containerd/containerd/images" 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" diff --git a/pkg/cri/server/sandbox_portforward_other.go b/pkg/cri/server/sandbox_portforward_other.go index 2c7fbc1b5..9ba3fe162 100644 --- a/pkg/cri/server/sandbox_portforward_other.go +++ b/pkg/cri/server/sandbox_portforward_other.go @@ -23,7 +23,7 @@ import ( "fmt" "io" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" ) // portForward uses netns to enter the sandbox namespace, and forwards a stream inside the diff --git a/pkg/cri/server/sandbox_remove.go b/pkg/cri/server/sandbox_remove.go index 430181bfd..d796c560c 100644 --- a/pkg/cri/server/sandbox_remove.go +++ b/pkg/cri/server/sandbox_remove.go @@ -21,10 +21,11 @@ import ( "fmt" "time" - "github.com/containerd/containerd" - "github.com/containerd/errdefs" "github.com/containerd/log" + "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" + "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index 9c52f51a9..c68cb6fd7 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -34,8 +34,11 @@ import ( "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/log" + "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" customopts "github.com/containerd/containerd/pkg/cri/opts" @@ -44,8 +47,6 @@ import ( "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/pkg/netns" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) func init() { diff --git a/pkg/cri/server/sandbox_stats_linux.go b/pkg/cri/server/sandbox_stats_linux.go index 1cc6f01ba..173b251cf 100644 --- a/pkg/cri/server/sandbox_stats_linux.go +++ b/pkg/cri/server/sandbox_stats_linux.go @@ -24,12 +24,13 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd/errdefs" + sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ) func (c *criService) podSandboxStats( diff --git a/pkg/cri/server/sandbox_stats_list.go b/pkg/cri/server/sandbox_stats_list.go index 4e070bddc..4d53e5771 100644 --- a/pkg/cri/server/sandbox_stats_list.go +++ b/pkg/cri/server/sandbox_stats_list.go @@ -21,12 +21,13 @@ import ( "errors" "fmt" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/ttrpc" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd/errdefs" + sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/hashicorp/go-multierror" ) diff --git a/pkg/cri/server/sandbox_stats_other.go b/pkg/cri/server/sandbox_stats_other.go index 883e922e3..3ecdaa4bf 100644 --- a/pkg/cri/server/sandbox_stats_other.go +++ b/pkg/cri/server/sandbox_stats_other.go @@ -22,8 +22,8 @@ import ( "context" "fmt" + "github.com/containerd/containerd/errdefs" sandboxstore "github.com/containerd/containerd/pkg/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/pkg/cri/server/sandbox_stats_windows.go index 571834ecc..3803d9d29 100644 --- a/pkg/cri/server/sandbox_stats_windows.go +++ b/pkg/cri/server/sandbox_stats_windows.go @@ -24,15 +24,16 @@ import ( "github.com/Microsoft/hcsshim" wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats" "github.com/Microsoft/hcsshim/hcn" - "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/api/types" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/containerd/pkg/cri/store/stats" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + + "github.com/containerd/containerd/api/services/tasks/v1" + "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" + containerstore "github.com/containerd/containerd/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/pkg/cri/store/stats" ) func (c *criService) podSandboxStats( diff --git a/pkg/cri/server/sandbox_status.go b/pkg/cri/server/sandbox_status.go index eed7eb4c5..06091cca2 100644 --- a/pkg/cri/server/sandbox_status.go +++ b/pkg/cri/server/sandbox_status.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" cni "github.com/containerd/go-cni" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_stop.go b/pkg/cri/server/sandbox_stop.go index 893ce90c5..1d73aa8a0 100644 --- a/pkg/cri/server/sandbox_stop.go +++ b/pkg/cri/server/sandbox_stop.go @@ -23,12 +23,13 @@ import ( "syscall" "time" - eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + eventtypes "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/protobuf" + sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" ) diff --git a/pkg/cri/server/snapshots.go b/pkg/cri/server/snapshots.go index 7c2159bf5..ed672752f 100644 --- a/pkg/cri/server/snapshots.go +++ b/pkg/cri/server/snapshots.go @@ -21,8 +21,8 @@ import ( "fmt" "time" + "github.com/containerd/containerd/errdefs" snapshot "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" "github.com/sirupsen/logrus" snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" diff --git a/pkg/cri/store/container/container.go b/pkg/cri/store/container/container.go index 727357842..524b58291 100644 --- a/pkg/cri/store/container/container.go +++ b/pkg/cri/store/container/container.go @@ -20,12 +20,12 @@ import ( "sync" "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" cio "github.com/containerd/containerd/pkg/cri/io" "github.com/containerd/containerd/pkg/cri/store" "github.com/containerd/containerd/pkg/cri/store/label" "github.com/containerd/containerd/pkg/cri/store/stats" "github.com/containerd/containerd/pkg/truncindex" - "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/store/container/container_test.go b/pkg/cri/store/container/container_test.go index d90728e6f..6f7bd69b6 100644 --- a/pkg/cri/store/container/container_test.go +++ b/pkg/cri/store/container/container_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" + "github.com/containerd/containerd/errdefs" cio "github.com/containerd/containerd/pkg/cri/io" "github.com/containerd/containerd/pkg/cri/store/label" "github.com/containerd/containerd/pkg/cri/store/stats" - "github.com/containerd/errdefs" "github.com/opencontainers/selinux/go-selinux" assertlib "github.com/stretchr/testify/assert" diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go index 89761c62a..118a47847 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -21,17 +21,17 @@ import ( "fmt" "sync" - "github.com/containerd/containerd" - "github.com/containerd/containerd/pkg/cri/labels" - "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/errdefs" docker "github.com/distribution/reference" - "k8s.io/apimachinery/pkg/util/sets" - imagedigest "github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest/digestset" imageidentity "github.com/opencontainers/image-spec/identity" imagespec "github.com/opencontainers/image-spec/specs-go/v1" + "k8s.io/apimachinery/pkg/util/sets" + + "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/pkg/cri/labels" + "github.com/containerd/containerd/pkg/cri/util" ) // Image contains all resources associated with the image. All fields diff --git a/pkg/cri/store/image/image_test.go b/pkg/cri/store/image/image_test.go index 5376cb617..988f854fa 100644 --- a/pkg/cri/store/image/image_test.go +++ b/pkg/cri/store/image/image_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "k8s.io/apimachinery/pkg/util/sets" "github.com/opencontainers/go-digest/digestset" diff --git a/pkg/cri/store/sandbox/sandbox.go b/pkg/cri/store/sandbox/sandbox.go index 867f1f87f..26dd8f6db 100644 --- a/pkg/cri/store/sandbox/sandbox.go +++ b/pkg/cri/store/sandbox/sandbox.go @@ -20,12 +20,12 @@ import ( "sync" "github.com/containerd/containerd" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/cri/store" "github.com/containerd/containerd/pkg/cri/store/label" "github.com/containerd/containerd/pkg/cri/store/stats" "github.com/containerd/containerd/pkg/netns" "github.com/containerd/containerd/pkg/truncindex" - "github.com/containerd/errdefs" ) // Sandbox contains all resources associated with the sandbox. All methods to diff --git a/pkg/cri/store/sandbox/sandbox_test.go b/pkg/cri/store/sandbox/sandbox_test.go index 5b2887b92..68ff056ea 100644 --- a/pkg/cri/store/sandbox/sandbox_test.go +++ b/pkg/cri/store/sandbox/sandbox_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/cri/store/label" "github.com/containerd/containerd/pkg/cri/store/stats" - "github.com/containerd/errdefs" assertlib "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/store/snapshot/snapshot.go b/pkg/cri/store/snapshot/snapshot.go index 598e329fa..47b1f7e2b 100644 --- a/pkg/cri/store/snapshot/snapshot.go +++ b/pkg/cri/store/snapshot/snapshot.go @@ -19,8 +19,8 @@ package snapshot import ( "sync" + "github.com/containerd/containerd/errdefs" snapshot "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" ) // Snapshot contains the information about the snapshot. diff --git a/pkg/cri/store/snapshot/snapshot_test.go b/pkg/cri/store/snapshot/snapshot_test.go index 936547b18..5c62976c9 100644 --- a/pkg/cri/store/snapshot/snapshot_test.go +++ b/pkg/cri/store/snapshot/snapshot_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" + "github.com/containerd/containerd/errdefs" snapshot "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" assertlib "github.com/stretchr/testify/assert" ) diff --git a/pkg/nri/domain.go b/pkg/nri/domain.go index ad4606c8a..be4436e87 100644 --- a/pkg/nri/domain.go +++ b/pkg/nri/domain.go @@ -21,11 +21,12 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" "github.com/containerd/log" nri "github.com/containerd/nri/pkg/adaptation" "github.com/sirupsen/logrus" + + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/namespaces" ) // Domain implements the functions the generic NRI interface needs to diff --git a/pkg/process/deleted_state.go b/pkg/process/deleted_state.go index 32d2b6989..30852104b 100644 --- a/pkg/process/deleted_state.go +++ b/pkg/process/deleted_state.go @@ -24,8 +24,8 @@ import ( "fmt" "github.com/containerd/console" + "github.com/containerd/containerd/errdefs" google_protobuf "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" ) type deletedState struct { diff --git a/pkg/process/exec.go b/pkg/process/exec.go index a46563e64..620ad093a 100644 --- a/pkg/process/exec.go +++ b/pkg/process/exec.go @@ -31,8 +31,8 @@ import ( "golang.org/x/sys/unix" "github.com/containerd/console" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/stdio" - "github.com/containerd/errdefs" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/process/utils.go b/pkg/process/utils.go index 90feebc7c..b074958cf 100644 --- a/pkg/process/utils.go +++ b/pkg/process/utils.go @@ -30,7 +30,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" runc "github.com/containerd/go-runc" "golang.org/x/sys/unix" ) diff --git a/pkg/transfer/image/imagestore.go b/pkg/transfer/image/imagestore.go index a7a6bbe61..7a3afa389 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -20,20 +20,20 @@ import ( "context" "fmt" + "github.com/containerd/platforms" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/api/types" transfertypes "github.com/containerd/containerd/api/types/transfer" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/archive" "github.com/containerd/containerd/pkg/streaming" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/transfer/plugins" "github.com/containerd/containerd/remotes" - "github.com/containerd/errdefs" - "github.com/containerd/platforms" ) func init() { diff --git a/pkg/transfer/image/imagestore_test.go b/pkg/transfer/image/imagestore_test.go index 25a560932..cefa0c1ef 100644 --- a/pkg/transfer/image/imagestore_test.go +++ b/pkg/transfer/image/imagestore_test.go @@ -23,8 +23,8 @@ import ( "sync" "testing" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/local/import.go b/pkg/transfer/local/import.go index c4129695e..516c1d349 100644 --- a/pkg/transfer/local/import.go +++ b/pkg/transfer/local/import.go @@ -21,14 +21,14 @@ import ( "encoding/json" "fmt" + "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/unpack" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) func (ts *localTransferService) importStream(ctx context.Context, i transfer.ImageImporter, is transfer.ImageStorer, tops *transfer.Config) error { diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index 28f7daa31..1200dc2d3 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -20,16 +20,17 @@ import ( "context" "fmt" + "github.com/containerd/log" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/containerd/containerd" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/unpack" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" - "github.com/containerd/errdefs" - "github.com/containerd/log" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) func (ts *localTransferService) pull(ctx context.Context, ir transfer.ImageFetcher, is transfer.ImageStorer, tops *transfer.Config) error { diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index 798a13581..6fcce425d 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -22,14 +22,15 @@ import ( "sync" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/remotes" - "github.com/containerd/errdefs" "github.com/containerd/platforms" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/pkg/transfer" + "github.com/containerd/containerd/remotes" ) func (ts *localTransferService) push(ctx context.Context, ig transfer.ImageGetter, p transfer.ImagePusher, tops *transfer.Config) error { diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index e9a4073d7..7ca800a62 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.go @@ -26,12 +26,12 @@ import ( "golang.org/x/sync/semaphore" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/pkg/kmutex" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/unpack" - "github.com/containerd/errdefs" ) type localTransferService struct { diff --git a/pkg/transfer/plugins/plugins.go b/pkg/transfer/plugins/plugins.go index 1769fea3c..d122ec368 100644 --- a/pkg/transfer/plugins/plugins.go +++ b/pkg/transfer/plugins/plugins.go @@ -21,7 +21,7 @@ import ( "reflect" "sync" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 76e24f763..b250a5135 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -28,16 +28,6 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/cleanup" - "github.com/containerd/containerd/pkg/kmutex" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/platforms" "github.com/opencontainers/go-digest" @@ -45,6 +35,17 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/labels" + "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/pkg/cleanup" + "github.com/containerd/containerd/pkg/kmutex" + "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/tracing" ) const ( diff --git a/plugin/context.go b/plugin/context.go index d084564ea..370508d28 100644 --- a/plugin/context.go +++ b/plugin/context.go @@ -23,8 +23,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" - "github.com/containerd/errdefs" ) // InitContext is used for plugin initialization diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index adb1ef242..6138f5ee4 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -21,18 +21,18 @@ import ( "fmt" "time" + "github.com/containerd/log" + imagespec "github.com/opencontainers/image-spec/specs-go/v1" + "google.golang.org/protobuf/types/known/anypb" + runtimeAPI "github.com/containerd/containerd/api/runtime/sandbox/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime" v2 "github.com/containerd/containerd/runtime/v2" "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" - "github.com/containerd/log" - - imagespec "github.com/opencontainers/image-spec/specs-go/v1" - "google.golang.org/protobuf/types/known/anypb" ) func init() { diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index e80d29a4f..85a4debac 100644 --- a/plugins/streaming/manager.go +++ b/plugins/streaming/manager.go @@ -20,13 +20,13 @@ import ( "context" "sync" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/streaming" "github.com/containerd/containerd/plugin" - "github.com/containerd/errdefs" "github.com/hashicorp/go-multierror" ) diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index 51e39e18c..8e43561b2 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -19,16 +19,17 @@ package transfer import ( "fmt" + "github.com/containerd/log" + "github.com/containerd/platforms" + "github.com/containerd/containerd" "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/pkg/transfer/local" "github.com/containerd/containerd/pkg/unpack" "github.com/containerd/containerd/plugin" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/containerd/platforms" // Load packages with type registrations _ "github.com/containerd/containerd/pkg/transfer/archive" diff --git a/process.go b/process.go index d17bfb693..73d8f8662 100644 --- a/process.go +++ b/process.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/protobuf" - "github.com/containerd/errdefs" ) // Process represents a system process diff --git a/pull.go b/pull.go index 75feb764a..c5d3e969a 100644 --- a/pull.go +++ b/pull.go @@ -24,14 +24,15 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" + "github.com/containerd/platforms" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/pkg/unpack" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" - "github.com/containerd/platforms" ) const ( diff --git a/remotes/docker/authorizer.go b/remotes/docker/authorizer.go index 2fd1118bc..2bf388e8c 100644 --- a/remotes/docker/authorizer.go +++ b/remotes/docker/authorizer.go @@ -25,10 +25,11 @@ import ( "strings" "sync" + "github.com/containerd/log" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/remotes/docker/auth" remoteerrors "github.com/containerd/containerd/remotes/errors" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) type dockerAuthorizer struct { diff --git a/remotes/docker/config/hosts.go b/remotes/docker/config/hosts.go index 79a55c96a..83cfbd324 100644 --- a/remotes/docker/config/hosts.go +++ b/remotes/docker/config/hosts.go @@ -32,10 +32,11 @@ import ( "strings" "time" - "github.com/containerd/containerd/remotes/docker" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/pelletier/go-toml" + + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/remotes/docker" ) // UpdateClientFunc is a function that lets you to amend http Client behavior used by registry clients. diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go index 3589db3ef..c4c401ad1 100644 --- a/remotes/docker/fetcher.go +++ b/remotes/docker/fetcher.go @@ -26,11 +26,12 @@ import ( "net/url" "strings" - "github.com/containerd/containerd/images" - "github.com/containerd/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" ) type dockerFetcher struct { diff --git a/remotes/docker/httpreadseeker.go b/remotes/docker/httpreadseeker.go index 6739e7904..deb888cbc 100644 --- a/remotes/docker/httpreadseeker.go +++ b/remotes/docker/httpreadseeker.go @@ -21,8 +21,9 @@ import ( "fmt" "io" - "github.com/containerd/errdefs" "github.com/containerd/log" + + "github.com/containerd/containerd/errdefs" ) const maxRetry = 3 diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go index a27cda0b5..f97ab144e 100644 --- a/remotes/docker/pusher.go +++ b/remotes/docker/pusher.go @@ -28,14 +28,15 @@ import ( "sync" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/remotes" - remoteserrors "github.com/containerd/containerd/remotes/errors" - "github.com/containerd/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/remotes" + remoteserrors "github.com/containerd/containerd/remotes/errors" ) type dockerPusher struct { diff --git a/remotes/docker/pusher_test.go b/remotes/docker/pusher_test.go index 44a4ea4f1..7ced8ede9 100644 --- a/remotes/docker/pusher_test.go +++ b/remotes/docker/pusher_test.go @@ -32,9 +32,9 @@ import ( "testing" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/reference" "github.com/containerd/containerd/remotes" - "github.com/containerd/errdefs" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispecv "github.com/opencontainers/image-spec/specs-go" diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go index b2b124214..4ca2b921e 100644 --- a/remotes/docker/resolver.go +++ b/remotes/docker/resolver.go @@ -28,6 +28,11 @@ import ( "path" "strings" + "github.com/containerd/log" + "github.com/opencontainers/go-digest" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/reference" "github.com/containerd/containerd/remotes" @@ -35,10 +40,6 @@ import ( remoteerrors "github.com/containerd/containerd/remotes/errors" "github.com/containerd/containerd/tracing" "github.com/containerd/containerd/version" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/opencontainers/go-digest" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) var ( diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go index 75bd9875a..b38c73855 100644 --- a/remotes/docker/schema1/converter.go +++ b/remotes/docker/schema1/converter.go @@ -32,17 +32,18 @@ import ( "sync" "time" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/remotes" - "github.com/containerd/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" + + "github.com/containerd/containerd/archive/compression" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/labels" + "github.com/containerd/containerd/remotes" ) const ( diff --git a/remotes/docker/status.go b/remotes/docker/status.go index c7764758f..1a9227725 100644 --- a/remotes/docker/status.go +++ b/remotes/docker/status.go @@ -21,7 +21,7 @@ import ( "sync" "github.com/containerd/containerd/content" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/moby/locker" ) diff --git a/remotes/handlers.go b/remotes/handlers.go index 736a044c7..365ff5fc0 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -25,14 +25,15 @@ import ( "strings" "sync" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" + + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/labels" ) type refKeyPrefix struct{} diff --git a/rootfs/apply.go b/rootfs/apply.go index 61f4d7dfb..b22011e87 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -23,14 +23,15 @@ import ( "fmt" "time" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/snapshots" ) // Layer represents the descriptors for a layer diff. These descriptions diff --git a/runtime/nsmap.go b/runtime/nsmap.go index 0754575c5..ed172adcc 100644 --- a/runtime/nsmap.go +++ b/runtime/nsmap.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" - "github.com/containerd/errdefs" ) type object interface { diff --git a/runtime/v1/linux/process.go b/runtime/v1/linux/process.go index da12747f2..d23e1e1ca 100644 --- a/runtime/v1/linux/process.go +++ b/runtime/v1/linux/process.go @@ -24,10 +24,10 @@ import ( eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/runtime" shim "github.com/containerd/containerd/runtime/v1/shim/v1" - "github.com/containerd/errdefs" "github.com/containerd/ttrpc" ) diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go index ab3f02487..378226f73 100644 --- a/runtime/v1/linux/runtime.go +++ b/runtime/v1/linux/runtime.go @@ -30,6 +30,7 @@ import ( eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/metadata" @@ -44,7 +45,6 @@ import ( "github.com/containerd/containerd/runtime/linux/runctypes" v1 "github.com/containerd/containerd/runtime/v1" "github.com/containerd/containerd/runtime/v1/shim/v1" - "github.com/containerd/errdefs" "github.com/containerd/go-runc" "github.com/containerd/log" "github.com/containerd/platforms" diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go index 4c5779f1d..56f90763d 100644 --- a/runtime/v1/linux/task.go +++ b/runtime/v1/linux/task.go @@ -26,7 +26,11 @@ import ( "sync" cgroups "github.com/containerd/cgroups/v3/cgroup1" + "github.com/containerd/log" + "github.com/containerd/ttrpc" + eventstypes "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/protobuf" @@ -34,9 +38,6 @@ import ( "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v1/shim/client" "github.com/containerd/containerd/runtime/v1/shim/v1" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/containerd/ttrpc" ) // Task on a linux based system diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go index 4d5c55952..14b895783 100644 --- a/runtime/v1/shim/service.go +++ b/runtime/v1/shim/service.go @@ -29,6 +29,7 @@ import ( "github.com/containerd/console" eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" @@ -40,7 +41,6 @@ import ( "github.com/containerd/containerd/runtime/linux/runctypes" shimapi "github.com/containerd/containerd/runtime/v1/shim/v1" "github.com/containerd/containerd/sys/reaper" - "github.com/containerd/errdefs" runc "github.com/containerd/go-runc" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go index 33d1d4579..2d6d66092 100644 --- a/runtime/v2/example/example.go +++ b/runtime/v2/example/example.go @@ -23,9 +23,9 @@ import ( "os" taskAPI "github.com/containerd/containerd/api/runtime/task/v2" + "github.com/containerd/containerd/errdefs" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/runtime/v2/shim" - "github.com/containerd/errdefs" ) var ( diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 80c7d6831..97ea5f6e4 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -25,7 +25,12 @@ import ( "strings" "sync" + "github.com/containerd/log" + "github.com/containerd/platforms" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/namespaces" @@ -36,10 +41,6 @@ import ( "github.com/containerd/containerd/runtime" shimbinary "github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/containerd/platforms" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) // Config for the v2 runtime diff --git a/runtime/v2/process.go b/runtime/v2/process.go index 3d37e6a46..e2c9a5c0d 100644 --- a/runtime/v2/process.go +++ b/runtime/v2/process.go @@ -22,9 +22,9 @@ import ( "github.com/containerd/containerd/api/runtime/task/v2" tasktypes "github.com/containerd/containerd/api/types/task" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/runtime" - "github.com/containerd/errdefs" "github.com/containerd/ttrpc" ) diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go index 47fcb76f2..dcc84f9c1 100644 --- a/runtime/v2/runc/container.go +++ b/runtime/v2/runc/container.go @@ -31,12 +31,12 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" "github.com/containerd/console" "github.com/containerd/containerd/api/runtime/task/v2" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/process" "github.com/containerd/containerd/pkg/stdio" "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/sirupsen/logrus" ) diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go index 4436cf7d9..4f772054f 100644 --- a/runtime/v2/runc/task/service.go +++ b/runtime/v2/runc/task/service.go @@ -32,6 +32,7 @@ import ( eventstypes "github.com/containerd/containerd/api/events" taskAPI "github.com/containerd/containerd/api/runtime/task/v2" "github.com/containerd/containerd/api/types/task" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/oom" oomv1 "github.com/containerd/containerd/pkg/oom/v1" @@ -45,7 +46,6 @@ import ( "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/sys/reaper" - "github.com/containerd/errdefs" runcC "github.com/containerd/go-runc" "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go index 3efbd1112..26c68fe26 100644 --- a/runtime/v2/runc/v1/service.go +++ b/runtime/v2/runc/v1/service.go @@ -34,6 +34,7 @@ import ( eventstypes "github.com/containerd/containerd/api/events" taskAPI "github.com/containerd/containerd/api/runtime/task/v2" "github.com/containerd/containerd/api/types/task" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/oom" @@ -48,7 +49,6 @@ import ( "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/sys/reaper" - "github.com/containerd/errdefs" runcC "github.com/containerd/go-runc" "github.com/containerd/typeurl/v2" "github.com/sirupsen/logrus" diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index ddeeeeb35..bf8a894f5 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -28,6 +28,7 @@ import ( "strings" "time" + "github.com/containerd/log" "github.com/containerd/ttrpc" "github.com/hashicorp/go-multierror" "google.golang.org/grpc" @@ -37,6 +38,7 @@ import ( eventstypes "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/runtime/task/v2" "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/pkg/dialer" @@ -45,8 +47,6 @@ import ( ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/runtime" client "github.com/containerd/containerd/runtime/v2/shim" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) const ( diff --git a/runtime/v2/shim/shim_windows.go b/runtime/v2/shim/shim_windows.go index 8181b4c81..a290a06fb 100644 --- a/runtime/v2/shim/shim_windows.go +++ b/runtime/v2/shim/shim_windows.go @@ -22,7 +22,7 @@ import ( "net" "os" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/containerd/ttrpc" "github.com/sirupsen/logrus" ) diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go index addff53cf..de6e873b3 100644 --- a/runtime/v2/shim/util.go +++ b/runtime/v2/shim/util.go @@ -32,11 +32,11 @@ import ( "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/atomicfile" "github.com/containerd/containerd/protobuf/proto" "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" ) type CommandConfig struct { diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go index f69d68f2c..ff76cbba9 100644 --- a/runtime/v2/shim_load.go +++ b/runtime/v2/shim_load.go @@ -22,11 +22,12 @@ import ( "os" "path/filepath" + "github.com/containerd/log" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/cleanup" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) func (m *ShimManager) loadExistingTasks(ctx context.Context) error { diff --git a/runtime/v2/shim_test.go b/runtime/v2/shim_test.go index d3f76388b..13ca68634 100644 --- a/runtime/v2/shim_test.go +++ b/runtime/v2/shim_test.go @@ -21,8 +21,8 @@ import ( "errors" "testing" + "github.com/containerd/containerd/errdefs" client "github.com/containerd/containerd/runtime/v2/shim" - "github.com/containerd/errdefs" ) func TestParseStartResponse(t *testing.T) { diff --git a/sandbox/proxy/controller.go b/sandbox/proxy/controller.go index fe8e95c29..a18f3e6ac 100644 --- a/sandbox/proxy/controller.go +++ b/sandbox/proxy/controller.go @@ -19,11 +19,12 @@ package proxy import ( "context" - api "github.com/containerd/containerd/api/services/sandbox/v1" - "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" imagespec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/protobuf/types/known/anypb" + + api "github.com/containerd/containerd/api/services/sandbox/v1" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/sandbox" ) // remoteSandboxController is a low level GRPC client for containerd's sandbox controller service diff --git a/sandbox/proxy/store.go b/sandbox/proxy/store.go index 9544df810..64e4a2b32 100644 --- a/sandbox/proxy/store.go +++ b/sandbox/proxy/store.go @@ -20,8 +20,8 @@ import ( "context" api "github.com/containerd/containerd/api/services/sandbox/v1" + "github.com/containerd/containerd/errdefs" sb "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" ) // remoteSandboxStore is a low-level containerd client to manage sandbox environments metadata diff --git a/sandbox/store.go b/sandbox/store.go index 5d0d42bdb..cda646dde 100644 --- a/sandbox/store.go +++ b/sandbox/store.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/services/containers/local.go b/services/containers/local.go index 13b981124..2c85422d7 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -23,12 +23,12 @@ import ( eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/plugin" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/services" - "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go index 4c185aa1e..c8f7dded1 100644 --- a/services/content/contentserver/contentserver.go +++ b/services/content/contentserver/contentserver.go @@ -22,17 +22,18 @@ import ( "io" "sync" - api "github.com/containerd/containerd/api/services/content/v1" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + api "github.com/containerd/containerd/api/services/content/v1" + "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/protobuf" + ptypes "github.com/containerd/containerd/protobuf/types" ) type service struct { diff --git a/services/diff/local.go b/services/diff/local.go index 6dc5e1115..8295b88ee 100644 --- a/services/diff/local.go +++ b/services/diff/local.go @@ -23,10 +23,10 @@ import ( diffapi "github.com/containerd/containerd/api/services/diff/v1" "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/services" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/services/events/service.go b/services/events/service.go index 1e9791068..309ad42e0 100644 --- a/services/events/service.go +++ b/services/events/service.go @@ -22,12 +22,12 @@ import ( api "github.com/containerd/containerd/api/services/events/v1" apittrpc "github.com/containerd/containerd/api/services/ttrpc/events/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/containerd/ttrpc" "google.golang.org/grpc" ) diff --git a/services/events/ttrpc.go b/services/events/ttrpc.go index f9bf8e4cc..1b3ceb943 100644 --- a/services/events/ttrpc.go +++ b/services/events/ttrpc.go @@ -20,11 +20,11 @@ import ( "context" api "github.com/containerd/containerd/api/services/ttrpc/events/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" ) type ttrpcService struct { diff --git a/services/images/local.go b/services/images/local.go index 7101fa622..d7ecbf9d6 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -23,8 +23,11 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "github.com/containerd/log" + eventstypes "github.com/containerd/containerd/api/events" imagesapi "github.com/containerd/containerd/api/services/images/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/gc" "github.com/containerd/containerd/images" @@ -35,8 +38,6 @@ import ( ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) func init() { diff --git a/services/introspection/introspection.go b/services/introspection/introspection.go index 18fb914d2..c0b54aa68 100644 --- a/services/introspection/introspection.go +++ b/services/introspection/introspection.go @@ -19,10 +19,11 @@ package introspection import ( context "context" - api "github.com/containerd/containerd/api/services/introspection/v1" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/containerd/log" + + api "github.com/containerd/containerd/api/services/introspection/v1" + "github.com/containerd/containerd/errdefs" + ptypes "github.com/containerd/containerd/protobuf/types" ) // Service defines the introspection service interface diff --git a/services/introspection/local.go b/services/introspection/local.go index 8c992047d..90414ed56 100644 --- a/services/introspection/local.go +++ b/services/introspection/local.go @@ -30,10 +30,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/status" - "github.com/containerd/errdefs" - api "github.com/containerd/containerd/api/services/introspection/v1" "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/protobuf" diff --git a/services/leases/service.go b/services/leases/service.go index 18e21cbd8..9cebf7330 100644 --- a/services/leases/service.go +++ b/services/leases/service.go @@ -20,11 +20,11 @@ import ( "context" api "github.com/containerd/containerd/api/services/leases/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "google.golang.org/grpc" ) diff --git a/services/namespaces/local.go b/services/namespaces/local.go index a027bb544..a4a2da05e 100644 --- a/services/namespaces/local.go +++ b/services/namespaces/local.go @@ -22,13 +22,13 @@ import ( eventstypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/namespaces/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/plugin" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/services" - "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/services/sandbox/controller_service.go b/services/sandbox/controller_service.go index 09ae8f527..d75b4cf92 100644 --- a/services/sandbox/controller_service.go +++ b/services/sandbox/controller_service.go @@ -22,14 +22,15 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/anypb" + "github.com/containerd/log" + eventtypes "github.com/containerd/containerd/api/events" api "github.com/containerd/containerd/api/services/sandbox/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) func init() { diff --git a/services/sandbox/store_service.go b/services/sandbox/store_service.go index 7f1631e1d..f17f23d54 100644 --- a/services/sandbox/store_service.go +++ b/services/sandbox/store_service.go @@ -21,12 +21,13 @@ import ( "google.golang.org/grpc" + "github.com/containerd/log" + api "github.com/containerd/containerd/api/services/sandbox/v1" "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/sandbox" - "github.com/containerd/errdefs" - "github.com/containerd/log" ) func init() { diff --git a/services/server/config/config.go b/services/server/config/config.go index 063e71c3d..8876f9017 100644 --- a/services/server/config/config.go +++ b/services/server/config/config.go @@ -25,8 +25,8 @@ import ( "github.com/pelletier/go-toml" "github.com/sirupsen/logrus" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/plugin" - "github.com/containerd/errdefs" ) // NOTE: Any new map fields added also need to be handled in mergeConfig. diff --git a/services/snapshots/service.go b/services/snapshots/service.go index 928b5d870..1289f00ef 100644 --- a/services/snapshots/service.go +++ b/services/snapshots/service.go @@ -24,6 +24,7 @@ import ( snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/deprecation" "github.com/containerd/containerd/plugin" @@ -32,7 +33,6 @@ import ( "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" "github.com/containerd/log" ) diff --git a/services/streaming/service.go b/services/streaming/service.go index eb30fc755..309885b07 100644 --- a/services/streaming/service.go +++ b/services/streaming/service.go @@ -20,15 +20,16 @@ import ( "errors" "io" + "github.com/containerd/log" + "github.com/containerd/typeurl/v2" + "google.golang.org/grpc" + api "github.com/containerd/containerd/api/services/streaming/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/streaming" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/protobuf" ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/containerd/typeurl/v2" - "google.golang.org/grpc" ) func init() { diff --git a/services/tasks/local.go b/services/tasks/local.go index 667e93621..f086fb503 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -32,6 +32,7 @@ import ( "github.com/containerd/containerd/archive" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/images" @@ -50,9 +51,8 @@ import ( "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" - "github.com/containerd/errdefs" - "github.com/containerd/log" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/services/transfer/service.go b/services/transfer/service.go index e0e1ed790..735f96a93 100644 --- a/services/transfer/service.go +++ b/services/transfer/service.go @@ -19,20 +19,21 @@ package transfer import ( "context" - transferapi "github.com/containerd/containerd/api/services/transfer/v1" - transferTypes "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/pkg/streaming" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/transfer/plugins" - "github.com/containerd/containerd/plugin" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" + + transferapi "github.com/containerd/containerd/api/services/transfer/v1" + transferTypes "github.com/containerd/containerd/api/types/transfer" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/pkg/streaming" + "github.com/containerd/containerd/pkg/transfer" + "github.com/containerd/containerd/pkg/transfer/plugins" + "github.com/containerd/containerd/plugin" + ptypes "github.com/containerd/containerd/protobuf/types" ) func init() { diff --git a/snapshots/devmapper/metadata.go b/snapshots/devmapper/metadata.go index f6dc0e3fb..9f5a1cd0d 100644 --- a/snapshots/devmapper/metadata.go +++ b/snapshots/devmapper/metadata.go @@ -25,7 +25,7 @@ import ( "fmt" "strconv" - "github.com/containerd/errdefs" + "github.com/containerd/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go index 7ba5d2d93..d7627bf63 100644 --- a/snapshots/devmapper/snapshotter.go +++ b/snapshots/devmapper/snapshotter.go @@ -28,13 +28,14 @@ import ( "strings" "sync" + "github.com/containerd/log" + "github.com/hashicorp/go-multierror" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/snapshots/storage" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/hashicorp/go-multierror" ) type fsType string diff --git a/snapshots/lcow/lcow.go b/snapshots/lcow/lcow.go index bb0ab39bb..35ad6a6d7 100644 --- a/snapshots/lcow/lcow.go +++ b/snapshots/lcow/lcow.go @@ -34,14 +34,15 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim/pkg/go-runhcs" + "github.com/containerd/continuity/fs" + "github.com/containerd/log" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" - "github.com/containerd/continuity/fs" - "github.com/containerd/errdefs" - "github.com/containerd/log" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) func init() { diff --git a/snapshots/proxy/proxy.go b/snapshots/proxy/proxy.go index 8e3bd1f83..3ef3b2698 100644 --- a/snapshots/proxy/proxy.go +++ b/snapshots/proxy/proxy.go @@ -22,11 +22,11 @@ import ( snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/protobuf" protobuftypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" ) // NewSnapshotter returns a new Snapshotter which communicates over a GRPC diff --git a/snapshots/storage/bolt.go b/snapshots/storage/bolt.go index 3e8e8e45e..894ac2e02 100644 --- a/snapshots/storage/bolt.go +++ b/snapshots/storage/bolt.go @@ -24,10 +24,10 @@ import ( "strings" "time" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/storage/metastore_test.go b/snapshots/storage/metastore_test.go index e4a0bf097..16847068d 100644 --- a/snapshots/storage/metastore_test.go +++ b/snapshots/storage/metastore_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/snapshots" - "github.com/containerd/errdefs" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go index f9fd8bf32..29dd6b505 100644 --- a/snapshots/testsuite/testsuite.go +++ b/snapshots/testsuite/testsuite.go @@ -28,15 +28,16 @@ import ( "testing" "time" + "github.com/containerd/continuity/fs/fstest" + "github.com/containerd/log/logtest" + "github.com/stretchr/testify/assert" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/randutil" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/snapshots" - "github.com/containerd/continuity/fs/fstest" - "github.com/containerd/errdefs" - "github.com/containerd/log/logtest" - "github.com/stretchr/testify/assert" ) // SnapshotterFunc is used in SnapshotterSuite @@ -553,7 +554,7 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot t.Fatal("intermediate layer removal should fail.") } - // Removal from toplayer to base should not fail. + //Removal from toplayer to base should not fail. err = snapshotter.Remove(ctx, topLayer) if err != nil { t.Fatal(err) diff --git a/snapshots/windows/windows.go b/snapshots/windows/windows.go index 0df2180a9..5332c104d 100644 --- a/snapshots/windows/windows.go +++ b/snapshots/windows/windows.go @@ -34,15 +34,16 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/pkg/ociwclayer" + "github.com/containerd/continuity/fs" + "github.com/containerd/log" + "github.com/containerd/platforms" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" - "github.com/containerd/continuity/fs" - "github.com/containerd/errdefs" - "github.com/containerd/log" - "github.com/containerd/platforms" - ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) func init() { diff --git a/task.go b/task.go index 099afdcf8..9667a1cf5 100644 --- a/task.go +++ b/task.go @@ -33,6 +33,7 @@ import ( "github.com/containerd/containerd/cio" "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/oci" @@ -42,7 +43,6 @@ import ( "github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/runtime/linux/runctypes" "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" digest "github.com/opencontainers/go-digest" is "github.com/opencontainers/image-spec/specs-go" diff --git a/task_opts.go b/task_opts.go index 3774d6592..9c88debd3 100644 --- a/task_opts.go +++ b/task_opts.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/containerd/api/types" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/runtime/linux/runctypes" "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/errdefs" imagespec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go index bcb5a141a..4b2232010 100644 --- a/tracing/plugin/otlp.go +++ b/tracing/plugin/otlp.go @@ -24,11 +24,6 @@ import ( "strconv" "time" - "github.com/containerd/containerd/pkg/deprecation" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/services/warning" - "github.com/containerd/containerd/tracing" - "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/sirupsen/logrus" "go.opentelemetry.io/otel" @@ -37,6 +32,12 @@ import ( "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/sdk/trace" + + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/pkg/deprecation" + "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/services/warning" + "github.com/containerd/containerd/tracing" ) const exporterPlugin = "otlp" diff --git a/transfer.go b/transfer.go index 412957bb9..9979aa75b 100644 --- a/transfer.go +++ b/transfer.go @@ -23,11 +23,11 @@ import ( streamingapi "github.com/containerd/containerd/api/services/streaming/v1" transferapi "github.com/containerd/containerd/api/services/transfer/v1" + "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/streaming" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/transfer/proxy" "github.com/containerd/containerd/protobuf" - "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" )