diff --git a/client.go b/client.go index a62217b96..94193041e 100644 --- a/client.go +++ b/client.go @@ -44,7 +44,6 @@ 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" @@ -61,6 +60,7 @@ 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/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index 3b8e9739e..085caf260 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -28,7 +28,6 @@ import ( "time" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" _ "github.com/containerd/containerd/metrics" // import containerd build info "github.com/containerd/containerd/mount" @@ -36,6 +35,7 @@ import ( srvconfig "github.com/containerd/containerd/services/server/config" "github.com/containerd/containerd/sys" "github.com/containerd/containerd/version" + "github.com/containerd/errdefs" "github.com/urfave/cli" "google.golang.org/grpc/grpclog" ) diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go index 269a8cc82..70d4503fc 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 08193a14a..768cab42d 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 3d616c137..886baa545 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/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 046c72a60..db236fc7e 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands/run" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "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 d4bd5a4da..72e57fc42 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/containerd/errdefs" + "github.com/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 480e134f9..8fc806ecd 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" + "github.com/containerd/errdefs" units "github.com/docker/go-units" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index b45a5c76f..b786de44f 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -29,12 +29,12 @@ import ( "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/log" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go index f36008918..b072eca0d 100644 --- a/cmd/ctr/commands/images/images.go +++ b/cmd/ctr/commands/images/images.go @@ -25,11 +25,11 @@ import ( "text/tabwriter" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index 41b9e17bc..a45cff2e2 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -22,10 +22,10 @@ import ( "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" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" "github.com/opencontainers/image-spec/identity" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/tag.go b/cmd/ctr/commands/images/tag.go index 40b42926c..a938d54cf 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 2fd23e5a6..fa0687d0f 100644 --- a/cmd/ctr/commands/images/unmount.go +++ b/cmd/ctr/commands/images/unmount.go @@ -20,9 +20,9 @@ import ( "fmt" "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" ) diff --git a/cmd/ctr/commands/namespaces/namespaces.go b/cmd/ctr/commands/namespaces/namespaces.go index 745249c21..f675e4811 100644 --- a/cmd/ctr/commands/namespaces/namespaces.go +++ b/cmd/ctr/commands/namespaces/namespaces.go @@ -25,8 +25,8 @@ import ( "text/tabwriter" "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/signals.go b/cmd/ctr/commands/signals.go index 311608c26..dc66e9aea 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/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" ) diff --git a/container.go b/container.go index 7863b742b..cad103738 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 4a937032f..0cbf6c20f 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 016c1a925..e0e8bad88 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 331a6f41d..c0cca1907 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 d3a82cb6f..53a5e97e7 100644 --- a/content/helpers.go +++ b/content/helpers.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/randutil" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/content/helpers_test.go b/content/helpers_test.go index cb003c337..b23d32d9d 100644 --- a/content/helpers_test.go +++ b/content/helpers_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/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 1e59f39b3..4caffcc02 100644 --- a/content/local/locks.go +++ b/content/local/locks.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) // Handles locking references diff --git a/content/local/readerat.go b/content/local/readerat.go index 899e85c0b..7918844b1 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/containerd/errdefs" + "github.com/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 baae3565b..30c7e0d29 100644 --- a/content/local/store.go +++ b/content/local/store.go @@ -28,10 +28,10 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/randutil" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" "github.com/opencontainers/go-digest" diff --git a/content/local/store_test.go b/content/local/store_test.go index 48ad54a0b..1358f24b0 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 b187e524c..49ac4e5b0 100644 --- a/content/local/writer.go +++ b/content/local/writer.go @@ -27,8 +27,8 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ) diff --git a/content/proxy/content_store.go b/content/proxy/content_store.go index 8e7fb42cf..d666fa959 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 185115b0a..8d72f8e9d 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 afb949891..bc4d751e7 100644 --- a/content/testsuite/testsuite.go +++ b/content/testsuite/testsuite.go @@ -29,9 +29,9 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/contrib/diffservice/service.go b/contrib/diffservice/service.go index 2d5329c62..878852023 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 a649d73df..41d4c9ddd 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 441fcc3c6..ee30a1d1c 100644 --- a/diff/apply/apply_linux.go +++ b/diff/apply/apply_linux.go @@ -24,9 +24,9 @@ import ( "strings" "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/errdefs" "golang.org/x/sys/unix" ) diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go index 5ab639358..ea1440414 100644 --- a/diff/lcow/lcow.go +++ b/diff/lcow/lcow.go @@ -32,11 +32,11 @@ import ( "github.com/Microsoft/hcsshim/ext4/tar2ext4" "github.com/containerd/containerd/content" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/diff/proxy/differ.go b/diff/proxy/differ.go index 1492dc673..1b0056865 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 34a5797e7..7583f2e8e 100644 --- a/diff/walking/differ.go +++ b/diff/walking/differ.go @@ -29,11 +29,11 @@ import ( "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/log" "github.com/containerd/containerd/mount" "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" ) diff --git a/diff/windows/windows.go b/diff/windows/windows.go index 2cfdfd71a..3dc84e7f1 100644 --- a/diff/windows/windows.go +++ b/diff/windows/windows.go @@ -32,7 +32,6 @@ import ( "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/log" "github.com/containerd/containerd/metadata" @@ -40,6 +39,7 @@ import ( "github.com/containerd/containerd/pkg/epoch" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/events.go b/events.go index 32d2dfc31..f31796742 100644 --- a/events.go +++ b/events.go @@ -20,9 +20,9 @@ import ( "context" eventsapi "github.com/containerd/containerd/api/services/events/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/protobuf" + "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/events/exchange/exchange.go b/events/exchange/exchange.go index ffcba5012..06181acb8 100644 --- a/events/exchange/exchange.go +++ b/events/exchange/exchange.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" ) diff --git a/events/exchange/exchange_test.go b/events/exchange/exchange_test.go index 422586cf3..0a68b7a91 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 32767909b..f07fd33bd 100644 --- a/filters/parser.go +++ b/filters/parser.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) /* diff --git a/identifiers/validate.go b/identifiers/validate.go index cbd3a52ba..0acbf3fc4 100644 --- a/identifiers/validate.go +++ b/identifiers/validate.go @@ -28,7 +28,7 @@ import ( "fmt" "regexp" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) const ( diff --git a/identifiers/validate_test.go b/identifiers/validate_test.go index 77f926c0c..615e6ab7d 100644 --- a/identifiers/validate_test.go +++ b/identifiers/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) func TestValidIdentifiers(t *testing.T) { diff --git a/image.go b/image.go index 13cb5b241..a8f99c2b5 100644 --- a/image.go +++ b/image.go @@ -26,13 +26,13 @@ import ( "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/platforms" "github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/image_store.go b/image_store.go index 524a7a672..120d8d54d 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 8513e9a8b..5d4aba40a 100644 --- a/images/archive/exporter.go +++ b/images/archive/exporter.go @@ -27,10 +27,10 @@ import ( "strings" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispecs "github.com/opencontainers/image-spec/specs-go" diff --git a/images/archive/importer.go b/images/archive/importer.go index 3ca88091c..f4589ee70 100644 --- a/images/archive/importer.go +++ b/images/archive/importer.go @@ -29,11 +29,11 @@ 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/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/converter/uncompress/uncompress.go b/images/converter/uncompress/uncompress.go index ceb998fb8..7c1669ae9 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 077d88e78..162e87a86 100644 --- a/images/handlers.go +++ b/images/handlers.go @@ -23,8 +23,8 @@ import ( "sort" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/images/image.go b/images/image.go index 2d2e36a9a..c166d9c57 100644 --- a/images/image.go +++ b/images/image.go @@ -24,9 +24,9 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/mediatypes.go b/images/mediatypes.go index d3b28d42d..cd51aa5eb 100644 --- a/images/mediatypes.go +++ b/images/mediatypes.go @@ -22,7 +22,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/import.go b/import.go index c057d7bd4..a6b918ba3 100644 --- a/import.go +++ b/import.go @@ -22,10 +22,10 @@ import ( "io" "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/platforms" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/integration/client/client_test.go b/integration/client/client_test.go index 3892d9616..3e9de686b 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -34,7 +34,6 @@ import ( . "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" @@ -42,6 +41,7 @@ import ( "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" ) var ( diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 5be05b054..5bf9d865a 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -37,12 +37,12 @@ import ( . "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/plugin" "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/require" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 243b4e5e2..6a1476714 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -35,7 +35,6 @@ 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/log/logtest" "github.com/containerd/containerd/namespaces" @@ -46,6 +45,7 @@ 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/typeurl/v2" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/integration/client/content_test.go b/integration/client/content_test.go index ffcb1b810..4c06afb67 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 743320863..73cd5fa08 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -27,11 +27,11 @@ import ( . "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" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" "github.com/google/uuid" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/integration/client/go.mod b/integration/client/go.mod index 346572d57..8b6389c80 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -7,11 +7,13 @@ require ( github.com/Microsoft/hcsshim v0.11.5 github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1 github.com/containerd/cgroups/v3 v3.0.2 - github.com/containerd/containerd v1.7.0 // see replace; the actual version of containerd is replaced with the code at the root of this repository + 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/continuity v0.4.2 + github.com/containerd/errdefs v0.1.0 github.com/containerd/go-runc v1.0.0 github.com/containerd/ttrpc v1.2.4 github.com/containerd/typeurl/v2 v2.1.1 + github.com/google/uuid v1.3.1 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0 github.com/opencontainers/runtime-spec v1.1.0 @@ -21,8 +23,6 @@ require ( golang.org/x/sys v0.18.0 ) -require github.com/google/uuid v1.3.1 - require ( dario.cat/mergo v1.0.0 // indirect github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect @@ -30,7 +30,6 @@ 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/containerd/log v0.1.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect diff --git a/integration/client/image_test.go b/integration/client/image_test.go index d1a0e65af..8367a7e6d 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -24,11 +24,11 @@ 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/labels" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 455e12814..28e5e17aa 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 171ea4938..ee382eace 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 f83b5dde2..6f23cdd7c 100644 --- a/labels/validate.go +++ b/labels/validate.go @@ -19,7 +19,7 @@ package labels import ( "fmt" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) const ( diff --git a/labels/validate_test.go b/labels/validate_test.go index 628f2fd7a..16be11df3 100644 --- a/labels/validate_test.go +++ b/labels/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/stretchr/testify/assert" ) diff --git a/leases/proxy/manager.go b/leases/proxy/manager.go index ae42d8eb1..342db9426 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 d97d9c6cd..8929ebf97 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -24,7 +24,6 @@ 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" @@ -32,6 +31,7 @@ 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 c022a810a..7fad151e6 100644 --- a/metadata/containers_test.go +++ b/metadata/containers_test.go @@ -26,12 +26,12 @@ import ( "time" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/metadata/content.go b/metadata/content.go index 2df665fcf..866d2f77a 100644 --- a/metadata/content.go +++ b/metadata/content.go @@ -26,12 +26,12 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata/boltutil" "github.com/containerd/containerd/namespaces" + "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/content_test.go b/metadata/content_test.go index 8803150bc..a65ee8241 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 fd0b12aad..65f0366b1 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -32,7 +32,6 @@ import ( "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" @@ -41,6 +40,7 @@ import ( "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/native" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/metadata/images.go b/metadata/images.go index ff5b624cc..beba82d07 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 8d3ae878e..5511fd9b5 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 03fa75af3..7c451e746 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 56aa0d9f0..4cbb1ee6f 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 84eb83f27..8b6174e35 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 256f12d18..e2683ae79 100644 --- a/metadata/plugin/plugin.go +++ b/metadata/plugin/plugin.go @@ -23,12 +23,12 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "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" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/sandbox.go b/metadata/sandbox.go index 5766647d3..78126b4db 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 711fb0c13..1b57c2f0f 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 fa6ebfeeb..f9a6f696d 100644 --- a/metadata/snapshot.go +++ b/metadata/snapshot.go @@ -25,7 +25,6 @@ import ( "time" 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/log" @@ -33,6 +32,7 @@ import ( "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/snapshot_test.go b/metadata/snapshot_test.go index 0be774800..5716b6426 100644 --- a/metadata/snapshot_test.go +++ b/metadata/snapshot_test.go @@ -27,7 +27,6 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/filters" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/mount" @@ -36,6 +35,7 @@ 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 72ebe690f..bb7ce968b 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -23,12 +23,12 @@ import ( cgroups "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v1/linux" + "github.com/containerd/errdefs" "github.com/docker/go-metrics" "github.com/sirupsen/logrus" ) diff --git a/namespaces.go b/namespaces.go index 83ee828dd..f4cc949d8 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 e5e23fe43..94ef9408d 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 3839887a4..939fcfd0e 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 51a7fc865..7ce3256e5 100644 --- a/pkg/cri/instrument/instrumented_service.go +++ b/pkg/cri/instrument/instrumented_service.go @@ -21,11 +21,11 @@ import ( "errors" "sync" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "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" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ctrdutil "github.com/containerd/containerd/pkg/cri/util" diff --git a/pkg/cri/nri/nri_api_linux.go b/pkg/cri/nri/nri_api_linux.go index d17c72a8b..dacc79206 100644 --- a/pkg/cri/nri/nri_api_linux.go +++ b/pkg/cri/nri/nri_api_linux.go @@ -23,7 +23,6 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/blockio" "github.com/containerd/containerd/pkg/cri/annotations" @@ -31,6 +30,7 @@ import ( 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/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 0f0c0d9b3..726cedb0a 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" ) // 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 4759711d3..00916612a 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 3e4090f3e..492afcec5 100644 --- a/pkg/cri/sbserver/container_execsync.go +++ b/pkg/cri/sbserver/container_execsync.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/errdefs" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_remove.go b/pkg/cri/sbserver/container_remove.go index e40d1fae0..64ee096d0 100644 --- a/pkg/cri/sbserver/container_remove.go +++ b/pkg/cri/sbserver/container_remove.go @@ -23,9 +23,9 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/container_start.go b/pkg/cri/sbserver/container_start.go index bc893ea78..1eb931bb5 100644 --- a/pkg/cri/sbserver/container_start.go +++ b/pkg/cri/sbserver/container_start.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_stats_list.go b/pkg/cri/sbserver/container_stats_list.go index 0a806a3da..76142ec50 100644 --- a/pkg/cri/sbserver/container_stats_list.go +++ b/pkg/cri/sbserver/container_stats_list.go @@ -28,10 +28,10 @@ import ( 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/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/store/stats" "github.com/containerd/containerd/protobuf" + "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_status.go b/pkg/cri/sbserver/container_status.go index ac4f8489b..aba04d04d 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 ac36660ca..76b90642d 100644 --- a/pkg/cri/sbserver/container_stop.go +++ b/pkg/cri/sbserver/container_stop.go @@ -24,11 +24,11 @@ import ( "time" eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" 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/moby/sys/signal" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/container_update_resources.go b/pkg/cri/sbserver/container_update_resources.go index 1015f1c0c..855b17c20 100644 --- a/pkg/cri/sbserver/container_update_resources.go +++ b/pkg/cri/sbserver/container_update_resources.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/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 996af5ee7..9c34dd3a8 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 7753a5a7f..191a9c538 100644 --- a/pkg/cri/sbserver/helpers.go +++ b/pkg/cri/sbserver/helpers.go @@ -33,7 +33,6 @@ 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" @@ -43,6 +42,7 @@ import ( "github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/runtime/linux/runctypes" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/errdefs" 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 fdea61075..3e2775470 100644 --- a/pkg/cri/sbserver/helpers_test.go +++ b/pkg/cri/sbserver/helpers_test.go @@ -27,7 +27,6 @@ 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" @@ -37,6 +36,7 @@ import ( "github.com/containerd/containerd/reference/docker" "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" imagedigest "github.com/opencontainers/go-digest" diff --git a/pkg/cri/sbserver/image_pull.go b/pkg/cri/sbserver/image_pull.go index edbb4d1ce..6197d1647 100644 --- a/pkg/cri/sbserver/image_pull.go +++ b/pkg/cri/sbserver/image_pull.go @@ -40,7 +40,6 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/annotations" @@ -51,6 +50,7 @@ import ( "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/config" "github.com/containerd/containerd/tracing" + "github.com/containerd/errdefs" ) // For image management: diff --git a/pkg/cri/sbserver/image_remove.go b/pkg/cri/sbserver/image_remove.go index b43655c49..4ae93f999 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 b20347cdf..ec3c36fa9 100644 --- a/pkg/cri/sbserver/image_status.go +++ b/pkg/cri/sbserver/image_status.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" imagestore "github.com/containerd/containerd/pkg/cri/store/image" "github.com/containerd/containerd/tracing" + "github.com/containerd/errdefs" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/podsandbox/controller.go b/pkg/cri/sbserver/podsandbox/controller.go index 54d08269c..cfad77c29 100644 --- a/pkg/cri/sbserver/podsandbox/controller.go +++ b/pkg/cri/sbserver/podsandbox/controller.go @@ -26,7 +26,6 @@ import ( "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" @@ -36,6 +35,7 @@ import ( "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/sandbox" + "github.com/containerd/errdefs" ) // 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 eb12cf665..f965212a8 100644 --- a/pkg/cri/sbserver/podsandbox/recover.go +++ b/pkg/cri/sbserver/podsandbox/recover.go @@ -27,10 +27,10 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/errdefs" ) // 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 9b899f944..a20535f2a 100644 --- a/pkg/cri/sbserver/podsandbox/sandbox_delete.go +++ b/pkg/cri/sbserver/podsandbox/sandbox_delete.go @@ -22,8 +22,8 @@ import ( "github.com/containerd/containerd" apitasks "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/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 b7b00bdd0..1446b8141 100644 --- a/pkg/cri/sbserver/podsandbox/sandbox_run.go +++ b/pkg/cri/sbserver/podsandbox/sandbox_run.go @@ -31,7 +31,6 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" @@ -40,6 +39,7 @@ import ( ctrdutil "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/sandbox" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" ) func init() { diff --git a/pkg/cri/sbserver/podsandbox/sandbox_status.go b/pkg/cri/sbserver/podsandbox/sandbox_status.go index dceb657a1..e0e018bef 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 51d4eb228..8fa146d68 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 09635ddd6..06bb88119 100644 --- a/pkg/cri/sbserver/restart.go +++ b/pkg/cri/sbserver/restart.go @@ -26,13 +26,13 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" 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/containerd/platforms" + "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "golang.org/x/sync/errgroup" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/sandbox_portforward_other.go b/pkg/cri/sbserver/sandbox_portforward_other.go index cadbae0c8..211c35866 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/containerd/errdefs" + "github.com/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 cfd20b23e..f0b8aee8e 100644 --- a/pkg/cri/sbserver/sandbox_remove.go +++ b/pkg/cri/sbserver/sandbox_remove.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/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 e6ff93055..a8e71bf8f 100644 --- a/pkg/cri/sbserver/sandbox_stats_linux.go +++ b/pkg/cri/sbserver/sandbox_stats_linux.go @@ -24,9 +24,9 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/errdefs" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/sbserver/sandbox_stats_list.go b/pkg/cri/sbserver/sandbox_stats_list.go index e91e55df4..a05bfe603 100644 --- a/pkg/cri/sbserver/sandbox_stats_list.go +++ b/pkg/cri/sbserver/sandbox_stats_list.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/errdefs" "github.com/hashicorp/go-multierror" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/sandbox_stats_other.go b/pkg/cri/sbserver/sandbox_stats_other.go index 8a249a485..3b45b8e15 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 f6a1dda44..1eea8705d 100644 --- a/pkg/cri/sbserver/sandbox_stats_windows.go +++ b/pkg/cri/sbserver/sandbox_stats_windows.go @@ -26,11 +26,11 @@ import ( "github.com/Microsoft/hcsshim/hcn" "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" 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/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/sbserver/snapshots.go b/pkg/cri/sbserver/snapshots.go index e8cb943da..1f0dbfcaf 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 99bfd338a..58e4e1ab4 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/containerd/errdefs" + "github.com/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 26bda16ef..29e9765f6 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/containerd/errdefs" + "github.com/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 2b1b6559f..d739551bb 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/oci" + "github.com/containerd/errdefs" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_remove.go b/pkg/cri/server/container_remove.go index 8f95e05f1..bd778fdf0 100644 --- a/pkg/cri/server/container_remove.go +++ b/pkg/cri/server/container_remove.go @@ -23,9 +23,9 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" containerstore "github.com/containerd/containerd/pkg/cri/store/container" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index 7dd2efbb3..2f587c30b 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/sirupsen/logrus" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_stats_list_other.go b/pkg/cri/server/container_stats_list_other.go index 7f1fe2e3c..a9d672900 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/containerd/errdefs" + "github.com/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 ed3ba2929..517f82a86 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 555a29a80..72c695631 100644 --- a/pkg/cri/server/container_stop.go +++ b/pkg/cri/server/container_stop.go @@ -24,11 +24,11 @@ import ( "time" eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" 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/moby/sys/signal" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go index 57f061672..7e352d9d7 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/pkg/cri/server/container_update_resources.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index f7f7d7234..5699a1e19 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 7967eda05..0a72667bd 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -28,7 +28,6 @@ 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" @@ -39,6 +38,7 @@ import ( "github.com/containerd/containerd/reference/docker" "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" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go index 26119a129..b1c9fe056 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -25,7 +25,6 @@ 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" @@ -35,6 +34,7 @@ import ( "github.com/containerd/containerd/reference/docker" "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" imagedigest "github.com/opencontainers/go-digest" diff --git a/pkg/cri/server/image_pull.go b/pkg/cri/server/image_pull.go index eee2f876c..37cfe1bb6 100644 --- a/pkg/cri/server/image_pull.go +++ b/pkg/cri/server/image_pull.go @@ -41,7 +41,6 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/annotations" @@ -52,6 +51,7 @@ import ( "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/config" "github.com/containerd/containerd/tracing" + "github.com/containerd/errdefs" ) // For image management: diff --git a/pkg/cri/server/image_remove.go b/pkg/cri/server/image_remove.go index e10062a31..011d86c5c 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 ccd664253..221df3ac6 100644 --- a/pkg/cri/server/image_status.go +++ b/pkg/cri/server/image_status.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" imagestore "github.com/containerd/containerd/pkg/cri/store/image" "github.com/containerd/containerd/tracing" + "github.com/containerd/errdefs" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index f146fa16d..613932c94 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -26,10 +26,10 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "golang.org/x/sync/errgroup" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_portforward_other.go b/pkg/cri/server/sandbox_portforward_other.go index 9ba3fe162..2c7fbc1b5 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/containerd/errdefs" + "github.com/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 2789fc16b..c9bd92c05 100644 --- a/pkg/cri/server/sandbox_remove.go +++ b/pkg/cri/server/sandbox_remove.go @@ -22,8 +22,8 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/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 8f8dbed19..47812dbc2 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -36,7 +36,6 @@ import ( "github.com/containerd/containerd" containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" @@ -46,6 +45,7 @@ import ( "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/pkg/netns" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" ) func init() { diff --git a/pkg/cri/server/sandbox_stats_linux.go b/pkg/cri/server/sandbox_stats_linux.go index 6b0c50eaf..9cac7bf4b 100644 --- a/pkg/cri/server/sandbox_stats_linux.go +++ b/pkg/cri/server/sandbox_stats_linux.go @@ -24,9 +24,9 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/errdefs" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_stats_list.go b/pkg/cri/server/sandbox_stats_list.go index 17400f0ef..d046dbd1b 100644 --- a/pkg/cri/server/sandbox_stats_list.go +++ b/pkg/cri/server/sandbox_stats_list.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/hashicorp/go-multierror" diff --git a/pkg/cri/server/sandbox_stats_other.go b/pkg/cri/server/sandbox_stats_other.go index 3ecdaa4bf..883e922e3 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 eabaac860..b19b371db 100644 --- a/pkg/cri/server/sandbox_stats_windows.go +++ b/pkg/cri/server/sandbox_stats_windows.go @@ -26,11 +26,11 @@ import ( "github.com/Microsoft/hcsshim/hcn" "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" 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/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_status.go b/pkg/cri/server/sandbox_status.go index 06091cca2..eed7eb4c5 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/containerd/errdefs" + "github.com/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 c863911ae..987f8d221 100644 --- a/pkg/cri/server/sandbox_stop.go +++ b/pkg/cri/server/sandbox_stop.go @@ -24,9 +24,9 @@ import ( "time" eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/protobuf" + "github.com/containerd/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" diff --git a/pkg/cri/server/snapshots.go b/pkg/cri/server/snapshots.go index ed672752f..7c2159bf5 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 524b58291..727357842 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 6f7bd69b6..d90728e6f 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 0e610c793..ff3e72c42 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -22,10 +22,10 @@ import ( "sync" "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/cri/labels" "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/containerd/reference/docker" + "github.com/containerd/errdefs" "k8s.io/apimachinery/pkg/util/sets" imagedigest "github.com/opencontainers/go-digest" diff --git a/pkg/cri/store/image/image_test.go b/pkg/cri/store/image/image_test.go index 988f854fa..5376cb617 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/containerd/errdefs" + "github.com/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 26dd8f6db..867f1f87f 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 68ff056ea..5b2887b92 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 47b1f7e2b..598e329fa 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 5c62976c9..936547b18 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 186ce13d0..1961e6733 100644 --- a/pkg/nri/domain.go +++ b/pkg/nri/domain.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" + "github.com/containerd/errdefs" nri "github.com/containerd/nri/pkg/adaptation" "github.com/sirupsen/logrus" ) diff --git a/pkg/process/deleted_state.go b/pkg/process/deleted_state.go index 30852104b..32d2b6989 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 620ad093a..a46563e64 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 b074958cf..90feebc7c 100644 --- a/pkg/process/utils.go +++ b/pkg/process/utils.go @@ -30,7 +30,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/errdefs" + "github.com/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 46bc03b4d..1d4aea8d1 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -26,7 +26,6 @@ import ( "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" @@ -34,6 +33,7 @@ import ( "github.com/containerd/containerd/pkg/transfer/plugins" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" + "github.com/containerd/errdefs" ) func init() { diff --git a/pkg/transfer/image/imagestore_test.go b/pkg/transfer/image/imagestore_test.go index cefa0c1ef..25a560932 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 6ccc4f1f9..d74152d70 100644 --- a/pkg/transfer/local/import.go +++ b/pkg/transfer/local/import.go @@ -24,11 +24,11 @@ import ( 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/log" "github.com/containerd/containerd/pkg/transfer" "github.com/containerd/containerd/pkg/unpack" + "github.com/containerd/errdefs" ) 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 204d33434..6e6c809b3 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -22,13 +22,13 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "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" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index cd635203f..e4883a48b 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -23,11 +23,11 @@ import ( "time" "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/platforms" "github.com/containerd/containerd/remotes" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index 7ca800a62..e9a4073d7 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 d122ec368..1769fea3c 100644 --- a/pkg/transfer/plugins/plugins.go +++ b/pkg/transfer/plugins/plugins.go @@ -21,7 +21,7 @@ import ( "reflect" "sync" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index c5c52ab2d..2937c5761 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -30,7 +30,6 @@ import ( "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/log" @@ -40,6 +39,7 @@ import ( "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/tracing" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/platforms/cpuinfo_linux.go b/platforms/cpuinfo_linux.go index 722d86c35..e07aa99cc 100644 --- a/platforms/cpuinfo_linux.go +++ b/platforms/cpuinfo_linux.go @@ -24,7 +24,7 @@ import ( "runtime" "strings" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "golang.org/x/sys/unix" ) diff --git a/platforms/cpuinfo_linux_test.go b/platforms/cpuinfo_linux_test.go index c0b8b0f6f..b324e7398 100644 --- a/platforms/cpuinfo_linux_test.go +++ b/platforms/cpuinfo_linux_test.go @@ -21,7 +21,7 @@ import ( "runtime" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) func TestCPUVariant(t *testing.T) { diff --git a/platforms/cpuinfo_other.go b/platforms/cpuinfo_other.go index fa5f19c42..8cbcbb24a 100644 --- a/platforms/cpuinfo_other.go +++ b/platforms/cpuinfo_other.go @@ -22,7 +22,7 @@ import ( "fmt" "runtime" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) func getCPUVariant() (string, error) { diff --git a/platforms/platforms.go b/platforms/platforms.go index 56613b076..44bc24a5c 100644 --- a/platforms/platforms.go +++ b/platforms/platforms.go @@ -116,7 +116,7 @@ import ( specs "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" ) var ( diff --git a/plugin/context.go b/plugin/context.go index 370508d28..d084564ea 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 033eb2c8e..a9e4efb6b 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -22,7 +22,6 @@ import ( "time" 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/log" @@ -31,6 +30,7 @@ import ( "github.com/containerd/containerd/runtime" v2 "github.com/containerd/containerd/runtime/v2" "github.com/containerd/containerd/sandbox" + "github.com/containerd/errdefs" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index 85a4debac..e80d29a4f 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 9ba0abd24..629a7c5c7 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -21,7 +21,6 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" @@ -29,6 +28,7 @@ import ( "github.com/containerd/containerd/pkg/unpack" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" + "github.com/containerd/errdefs" // Load packages with type registrations _ "github.com/containerd/containerd/pkg/transfer/archive" diff --git a/process.go b/process.go index 73d8f8662..d17bfb693 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 d72702a5f..0e2911d5f 100644 --- a/pull.go +++ b/pull.go @@ -24,7 +24,6 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/pkg/unpack" "github.com/containerd/containerd/platforms" @@ -32,6 +31,7 @@ import ( "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" ) const ( diff --git a/remotes/docker/authorizer.go b/remotes/docker/authorizer.go index ebd69c16c..ef24dde94 100644 --- a/remotes/docker/authorizer.go +++ b/remotes/docker/authorizer.go @@ -25,10 +25,10 @@ import ( "strings" "sync" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes/docker/auth" remoteerrors "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/errdefs" ) type dockerAuthorizer struct { diff --git a/remotes/docker/config/hosts.go b/remotes/docker/config/hosts.go index 606872dee..7cc76b853 100644 --- a/remotes/docker/config/hosts.go +++ b/remotes/docker/config/hosts.go @@ -32,9 +32,9 @@ import ( "strings" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/errdefs" "github.com/pelletier/go-toml" ) diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go index ecf245933..c68b9a515 100644 --- a/remotes/docker/fetcher.go +++ b/remotes/docker/fetcher.go @@ -26,9 +26,9 @@ import ( "net/url" "strings" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/httpreadseeker.go b/remotes/docker/httpreadseeker.go index 824359339..50d2e2172 100644 --- a/remotes/docker/httpreadseeker.go +++ b/remotes/docker/httpreadseeker.go @@ -21,8 +21,8 @@ import ( "fmt" "io" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" + "github.com/containerd/errdefs" ) const maxRetry = 3 diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go index 218a5dd30..193a233d9 100644 --- a/remotes/docker/pusher.go +++ b/remotes/docker/pusher.go @@ -29,11 +29,11 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" remoteserrors "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/pusher_test.go b/remotes/docker/pusher_test.go index 7ced8ede9..44a4ea4f1 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 ce1f64625..4af51aa46 100644 --- a/remotes/docker/resolver.go +++ b/remotes/docker/resolver.go @@ -28,7 +28,6 @@ import ( "path" "strings" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/log" "github.com/containerd/containerd/reference" @@ -37,6 +36,7 @@ import ( remoteerrors "github.com/containerd/containerd/remotes/errors" "github.com/containerd/containerd/tracing" "github.com/containerd/containerd/version" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go index 8c9e520cd..1c7bd4e46 100644 --- a/remotes/docker/schema1/converter.go +++ b/remotes/docker/schema1/converter.go @@ -34,11 +34,11 @@ 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/containerd/log" "github.com/containerd/containerd/remotes" + "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/status.go b/remotes/docker/status.go index 1a9227725..c7764758f 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/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/moby/locker" ) diff --git a/remotes/handlers.go b/remotes/handlers.go index f24669dc4..f9d9cdb63 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -26,11 +26,11 @@ import ( "sync" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" ) diff --git a/rootfs/apply.go b/rootfs/apply.go index 35eae6d63..097c5aa6f 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -24,10 +24,10 @@ import ( "time" "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/runtime/nsmap.go b/runtime/nsmap.go index ed172adcc..0754575c5 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 d23e1e1ca..da12747f2 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 918b40d61..d40d77650 100644 --- a/runtime/v1/linux/runtime.go +++ b/runtime/v1/linux/runtime.go @@ -30,7 +30,6 @@ 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/log" @@ -47,6 +46,7 @@ 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/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go index 16a35dd79..ff80c483c 100644 --- a/runtime/v1/linux/task.go +++ b/runtime/v1/linux/task.go @@ -27,7 +27,6 @@ import ( cgroups "github.com/containerd/cgroups/v3/cgroup1" 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/log" @@ -36,6 +35,7 @@ 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/ttrpc" ) diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go index 79827cda6..5dbc972cc 100644 --- a/runtime/v1/shim/service.go +++ b/runtime/v1/shim/service.go @@ -29,7 +29,6 @@ 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/log" "github.com/containerd/containerd/mount" @@ -42,6 +41,7 @@ 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/typeurl/v2" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go index 2d6d66092..33d1d4579 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 73e1af771..4d5bea550 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -26,7 +26,6 @@ import ( "sync" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/log" "github.com/containerd/containerd/metadata" @@ -39,6 +38,7 @@ import ( "github.com/containerd/containerd/runtime" shimbinary "github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/sandbox" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/runtime/v2/process.go b/runtime/v2/process.go index e2c9a5c0d..3d37e6a46 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 dcc84f9c1..47fcb76f2 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 3a4c99ee7..1395c3769 100644 --- a/runtime/v2/runc/task/service.go +++ b/runtime/v2/runc/task/service.go @@ -30,7 +30,6 @@ 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,6 +44,7 @@ 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 26c68fe26..3efbd1112 100644 --- a/runtime/v2/runc/v1/service.go +++ b/runtime/v2/runc/v1/service.go @@ -34,7 +34,6 @@ 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" @@ -49,6 +48,7 @@ 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 e04fad263..ccb3989b7 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -37,7 +37,6 @@ 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/log" @@ -47,6 +46,7 @@ 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" ) const ( diff --git a/runtime/v2/shim/shim_windows.go b/runtime/v2/shim/shim_windows.go index a290a06fb..8181b4c81 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/containerd/errdefs" + "github.com/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 de6e873b3..addff53cf 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 7214bfc6a..f573d3495 100644 --- a/runtime/v2/shim_load.go +++ b/runtime/v2/shim_load.go @@ -22,11 +22,11 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/cleanup" + "github.com/containerd/errdefs" ) func (m *ShimManager) loadExistingTasks(ctx context.Context) error { diff --git a/runtime/v2/shim_test.go b/runtime/v2/shim_test.go index 13ca68634..d3f76388b 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 6ff9c9413..b49cc89df 100644 --- a/sandbox/proxy/controller.go +++ b/sandbox/proxy/controller.go @@ -20,9 +20,9 @@ import ( "context" api "github.com/containerd/containerd/api/services/sandbox/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/sandbox" + "github.com/containerd/errdefs" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/sandbox/proxy/store.go b/sandbox/proxy/store.go index 64e4a2b32..9544df810 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 cda646dde..5d0d42bdb 100644 --- a/sandbox/store.go +++ b/sandbox/store.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/services/containers/local.go b/services/containers/local.go index 2c85422d7..13b981124 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 76a9e6eea..2de76204c 100644 --- a/services/content/contentserver/contentserver.go +++ b/services/content/contentserver/contentserver.go @@ -24,10 +24,10 @@ import ( api "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/protobuf" ptypes "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" "google.golang.org/grpc" diff --git a/services/diff/local.go b/services/diff/local.go index 8295b88ee..6dc5e1115 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 309ad42e0..1e9791068 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 1b3ceb943..f9bf8e4cc 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 7aa78999c..5ff69e170 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -25,7 +25,6 @@ import ( 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" @@ -37,6 +36,7 @@ import ( ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" + "github.com/containerd/errdefs" ) func init() { diff --git a/services/introspection/introspection.go b/services/introspection/introspection.go index 7f88af4f9..b5daae4fb 100644 --- a/services/introspection/introspection.go +++ b/services/introspection/introspection.go @@ -20,9 +20,9 @@ import ( context "context" api "github.com/containerd/containerd/api/services/introspection/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" ptypes "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/errdefs" ) // Service defines the introspection service interface diff --git a/services/introspection/local.go b/services/introspection/local.go index 5f9fc10f4..fb534f77e 100644 --- a/services/introspection/local.go +++ b/services/introspection/local.go @@ -32,13 +32,13 @@ import ( 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" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" + "github.com/containerd/errdefs" ) func init() { diff --git a/services/leases/service.go b/services/leases/service.go index 9cebf7330..18e21cbd8 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 a4a2da05e..a027bb544 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 64f793d2e..0c91af346 100644 --- a/services/sandbox/controller_service.go +++ b/services/sandbox/controller_service.go @@ -24,12 +24,12 @@ import ( 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/log" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/sandbox" + "github.com/containerd/errdefs" ) func init() { diff --git a/services/sandbox/store_service.go b/services/sandbox/store_service.go index a5a8a9c3f..0fe02d3a4 100644 --- a/services/sandbox/store_service.go +++ b/services/sandbox/store_service.go @@ -23,10 +23,10 @@ import ( api "github.com/containerd/containerd/api/services/sandbox/v1" "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/sandbox" + "github.com/containerd/errdefs" ) func init() { diff --git a/services/server/config/config.go b/services/server/config/config.go index 8876f9017..063e71c3d 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 e4ab6b247..f44246914 100644 --- a/services/snapshots/service.go +++ b/services/snapshots/service.go @@ -24,7 +24,6 @@ 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/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/deprecation" @@ -34,6 +33,7 @@ import ( "github.com/containerd/containerd/services" "github.com/containerd/containerd/services/warning" "github.com/containerd/containerd/snapshots" + "github.com/containerd/errdefs" ) func init() { diff --git a/services/streaming/service.go b/services/streaming/service.go index 31c555ff8..315a8b488 100644 --- a/services/streaming/service.go +++ b/services/streaming/service.go @@ -21,12 +21,12 @@ import ( "io" api "github.com/containerd/containerd/api/services/streaming/v1" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "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/typeurl/v2" "google.golang.org/grpc" ) diff --git a/services/tasks/local.go b/services/tasks/local.go index a28292bd2..96c67d737 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -32,7 +32,6 @@ 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" @@ -52,6 +51,7 @@ 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/typeurl/v2" "github.com/opencontainers/go-digest" diff --git a/services/transfer/service.go b/services/transfer/service.go index 70fe39de5..8ed004b86 100644 --- a/services/transfer/service.go +++ b/services/transfer/service.go @@ -21,13 +21,13 @@ import ( 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/log" "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/typeurl/v2" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/snapshots/devmapper/metadata.go b/snapshots/devmapper/metadata.go index 9f5a1cd0d..f6dc0e3fb 100644 --- a/snapshots/devmapper/metadata.go +++ b/snapshots/devmapper/metadata.go @@ -25,7 +25,7 @@ import ( "fmt" "strconv" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go index b9db17a71..c6d0aad63 100644 --- a/snapshots/devmapper/snapshotter.go +++ b/snapshots/devmapper/snapshotter.go @@ -28,12 +28,12 @@ import ( "strings" "sync" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "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/hashicorp/go-multierror" ) diff --git a/snapshots/lcow/lcow.go b/snapshots/lcow/lcow.go index a0868e72d..d5e89d055 100644 --- a/snapshots/lcow/lcow.go +++ b/snapshots/lcow/lcow.go @@ -34,13 +34,13 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim/pkg/go-runhcs" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "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" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/snapshots/proxy/proxy.go b/snapshots/proxy/proxy.go index 3ef3b2698..8e3bd1f83 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 894ac2e02..3e8e8e45e 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 16847068d..e4a0bf097 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 b23fc6c32..69add453c 100644 --- a/snapshots/testsuite/testsuite.go +++ b/snapshots/testsuite/testsuite.go @@ -28,7 +28,6 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log/logtest" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" @@ -36,6 +35,7 @@ import ( "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/snapshots" "github.com/containerd/continuity/fs/fstest" + "github.com/containerd/errdefs" "github.com/stretchr/testify/assert" ) @@ -553,7 +553,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 4730ea067..c00f65240 100644 --- a/snapshots/windows/windows.go +++ b/snapshots/windows/windows.go @@ -34,7 +34,6 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/pkg/ociwclayer" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/platforms" @@ -42,6 +41,7 @@ import ( "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/storage" "github.com/containerd/continuity/fs" + "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/task.go b/task.go index 9667a1cf5..099afdcf8 100644 --- a/task.go +++ b/task.go @@ -33,7 +33,6 @@ 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" @@ -43,6 +42,7 @@ 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 da269016e..7bcd8a4e6 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 1ec0c3f47..f7d2ec91e 100644 --- a/tracing/plugin/otlp.go +++ b/tracing/plugin/otlp.go @@ -24,12 +24,12 @@ import ( "strconv" "time" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "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/sirupsen/logrus" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlptrace" diff --git a/transfer.go b/transfer.go index 9979aa75b..412957bb9 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" )