github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move protobuf package under pkg

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-04-29 15:09:24 -07:00
parent 3e9cace720
commit e1b94c0e7d
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
94 changed files with 122 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/client.go
View File

@ -55,9 +55,9 @@ import (
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/platforms" "github.com/containerd/platforms"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

2
client/container.go
View File

@ -32,7 +32,7 @@ import (
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/fifo" "github.com/containerd/fifo"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

4
client/container_checkpoint_opts.go
View File

@ -28,9 +28,9 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/pkg/rootfs"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/platforms" "github.com/containerd/platforms"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
imagespec "github.com/opencontainers/image-spec/specs-go/v1" imagespec "github.com/opencontainers/image-spec/specs-go/v1"

2
client/container_opts.go
View File

@ -28,7 +28,7 @@ import (
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"

4
client/container_restore_opts.go
View File

@ -24,8 +24,8 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/pkg/protobuf/proto"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
imagespec "github.com/opencontainers/image-spec/specs-go/v1" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
) )

4
client/containerstore.go
View File

@ -23,8 +23,8 @@ import (
containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" containersapi "github.com/containerd/containerd/v2/api/services/containers/v1"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
client/events.go
View File

@ -22,7 +22,7 @@ import (
eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" eventsapi "github.com/containerd/containerd/v2/api/services/events/v1"
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

4
client/image_store.go
View File

@ -23,8 +23,8 @@ import (
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )

2
client/namespaces.go
View File

@ -22,7 +22,7 @@ import (
api "github.com/containerd/containerd/v2/api/services/namespaces/v1" api "github.com/containerd/containerd/v2/api/services/namespaces/v1"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

2
client/process.go
View File

@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

2
client/sandbox.go
View File

@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
api "github.com/containerd/containerd/v2/core/sandbox" api "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

4
client/task.go
View File

@ -35,10 +35,10 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/protobuf"
google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/pkg/rootfs"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
google_protobuf "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

2
client/transfer.go
View File

@ -26,7 +26,7 @@ import (
"github.com/containerd/containerd/v2/core/streaming" "github.com/containerd/containerd/v2/core/streaming"
"github.com/containerd/containerd/v2/core/transfer" "github.com/containerd/containerd/v2/core/transfer"
"github.com/containerd/containerd/v2/core/transfer/proxy" "github.com/containerd/containerd/v2/core/transfer/proxy"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

2
cmd/containerd-shim-runc-v2/manager/manager_linux.go
View File

@ -40,9 +40,9 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/pkg/schedcore" "github.com/containerd/containerd/v2/pkg/schedcore"
"github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
runcC "github.com/containerd/go-runc" runcC "github.com/containerd/go-runc"

2
cmd/containerd-shim-runc-v2/process/deleted_state.go
View File

@ -24,7 +24,7 @@ import (
"fmt" "fmt"
"github.com/containerd/console" "github.com/containerd/console"
google_protobuf "github.com/containerd/containerd/v2/protobuf/types" google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

2
cmd/containerd-shim-runc-v2/process/init.go
View File

@ -33,8 +33,8 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
google_protobuf "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/fifo" "github.com/containerd/fifo"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"
"github.com/containerd/log" "github.com/containerd/log"

2
cmd/containerd-shim-runc-v2/process/init_state.go
View File

@ -23,7 +23,7 @@ import (
"errors" "errors"
"fmt" "fmt"
google_protobuf "github.com/containerd/containerd/v2/protobuf/types" google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"
"github.com/containerd/log" "github.com/containerd/log"
) )

2
cmd/containerd-shim-runc-v2/process/types.go
View File

@ -17,7 +17,7 @@
package process package process
import ( import (
google_protobuf "github.com/containerd/containerd/v2/protobuf/types" google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types"
) )
// Mount holds filesystem mount configuration // Mount holds filesystem mount configuration

4
cmd/containerd-shim-runc-v2/task/service.go
View File

@ -38,13 +38,13 @@ import (
"github.com/containerd/containerd/v2/pkg/oom" "github.com/containerd/containerd/v2/pkg/oom"
oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1"
oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2"
"github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/containerd/v2/pkg/sys/reaper"
"github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/containerd/v2/pkg/userns"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
runcC "github.com/containerd/go-runc" runcC "github.com/containerd/go-runc"
"github.com/containerd/log" "github.com/containerd/log"

4
cmd/containerd/command/publish.go
View File

@ -27,8 +27,8 @@ import (
eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" eventsapi "github.com/containerd/containerd/v2/api/services/events/v1"
"github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"google.golang.org/grpc" "google.golang.org/grpc"

2
cmd/ctr/commands/deprecations/deprecations.go
View File

@ -26,7 +26,7 @@ import (
api "github.com/containerd/containerd/v2/api/services/introspection/v1" api "github.com/containerd/containerd/v2/api/services/introspection/v1"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
) )
// Command is the parent for all commands under "deprecations" // Command is the parent for all commands under "deprecations"

2
cmd/ctr/commands/shim/shim.go
View File

@ -31,8 +31,8 @@ import (
"github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shim"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

2
contrib/snapshotservice/service.go
View File

@ -22,7 +22,7 @@ import (
snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

1
contrib/v2-migrate.sh
View File

@ -66,6 +66,7 @@ for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/runtime/$1$2"github.com\/containerd\/containerd\/v2\/core\/runtime/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/runtime/$1$2"github.com\/containerd\/containerd\/v2\/core\/runtime/g' $GOFILE
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/core\/runtime\/v2\/runc\/options/$1$2"github.com\/containerd\/containerd\/v2\/api\/types\/runc\/options/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/core\/runtime\/v2\/runc\/options/$1$2"github.com\/containerd\/containerd\/v2\/api\/types\/runc\/options/g' $GOFILE
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/runtimeoptions/$1$2"github.com\/containerd\/containerd\/v2\/api\/types\/runtimeoptions/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/runtimeoptions/$1$2"github.com\/containerd\/containerd\/v2\/api\/types\/runtimeoptions/g' $GOFILE
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/protobuf/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/protobuf/g' $GOFILE
# Migrate packages split out to their own repository # Migrate packages split out to their own repository
perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/platforms/$1$2"github.com\/containerd\/platforms/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/platforms/$1$2"github.com\/containerd\/platforms/g' $GOFILE

4
core/content/proxy/content_store.go
View File

@ -23,8 +23,8 @@ import (
contentapi "github.com/containerd/containerd/v2/api/services/content/v1" contentapi "github.com/containerd/containerd/v2/api/services/content/v1"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
protobuftypes "github.com/containerd/containerd/v2/protobuf/types" protobuftypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

2
core/content/proxy/content_writer.go
View File

@ -23,7 +23,7 @@ import (
contentapi "github.com/containerd/containerd/v2/api/services/content/v1" contentapi "github.com/containerd/containerd/v2/api/services/content/v1"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )

4
core/diff/proxy/differ.go
View File

@ -24,8 +24,8 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

4
core/diff/stream_unix.go
View File

@ -28,8 +28,8 @@ import (
"os/exec" "os/exec"
"sync" "sync"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

4
core/diff/stream_windows.go
View File

@ -29,8 +29,8 @@ import (
"github.com/Microsoft/go-winio" "github.com/Microsoft/go-winio"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

2
core/events/exchange/exchange_test.go
View File

@ -25,7 +25,7 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"

2
core/events/proxy/remote_events.go
View File

@ -23,7 +23,7 @@ import (
api "github.com/containerd/containerd/v2/api/services/events/v1" api "github.com/containerd/containerd/v2/api/services/events/v1"
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

2
core/introspection/proxy/remote.go
View File

@ -22,7 +22,7 @@ import (
api "github.com/containerd/containerd/v2/api/services/introspection/v1" api "github.com/containerd/containerd/v2/api/services/introspection/v1"
"github.com/containerd/containerd/v2/core/introspection" "github.com/containerd/containerd/v2/core/introspection"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"

2
core/leases/proxy/manager.go
View File

@ -21,7 +21,7 @@ import (
leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1" leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1"
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

6
core/metadata/boltutil/helpers.go
View File

@ -20,9 +20,9 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

4
core/metadata/containers.go
View File

@ -29,8 +29,8 @@ import (
"github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/identifiers"
"github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"

4
core/metadata/containers_test.go
View File

@ -28,8 +28,8 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

2
core/metadata/db_test.go
View File

@ -36,9 +36,9 @@ import (
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/containerd/v2/pkg/gc"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/plugins/snapshots/native"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
core/metadata/namespaces_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"go.etcd.io/bbolt" "go.etcd.io/bbolt"

2
core/metadata/sandbox_test.go
View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
api "github.com/containerd/containerd/v2/core/sandbox" api "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"

2
core/metrics/cgroups/common/type.go
View File

@ -21,7 +21,7 @@ package common
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
) )
// Statable type that returns cgroup metrics // Statable type that returns cgroup metrics

4
core/metrics/cgroups/metrics_test.go
View File

@ -31,10 +31,10 @@ import (
v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
v1types "github.com/containerd/containerd/v2/core/metrics/types/v1" v1types "github.com/containerd/containerd/v2/core/metrics/types/v1"
v2types "github.com/containerd/containerd/v2/core/metrics/types/v2" v2types "github.com/containerd/containerd/v2/core/metrics/types/v2"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
metrics "github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
) )

2
core/runtime/task.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"time" "time"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
) )
// TaskInfo provides task specific information // TaskInfo provides task specific information

6
core/runtime/v2/binary.go
View File

@ -28,10 +28,10 @@ import (
"github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/pkg/protobuf/types"
client "github.com/containerd/containerd/v2/pkg/shim" client "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/log" "github.com/containerd/log"
) )

2
core/runtime/v2/example/example.go
View File

@ -23,10 +23,10 @@ import (
taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2" taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2"
apitypes "github.com/containerd/containerd/v2/api/types" apitypes "github.com/containerd/containerd/v2/api/types"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
core/runtime/v2/process.go
View File

@ -23,7 +23,7 @@ import (
task "github.com/containerd/containerd/v2/api/runtime/task/v3" task "github.com/containerd/containerd/v2/api/runtime/task/v3"
tasktypes "github.com/containerd/containerd/v2/api/types/task" tasktypes "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
) )

4
core/runtime/v2/shim.go
View File

@ -41,10 +41,10 @@ import (
"github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/events/exchange"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/identifiers"
"github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
client "github.com/containerd/containerd/v2/pkg/shim" client "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
) )

2
core/runtime/v2/shim_manager.go
View File

@ -38,10 +38,10 @@ import (
"github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/internal/cleanup"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/protobuf"
shimbinary "github.com/containerd/containerd/v2/pkg/shim" shimbinary "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"
) )

2
core/runtime/v2/task_manager.go
View File

@ -30,9 +30,9 @@ import (
apitypes "github.com/containerd/containerd/v2/api/types" apitypes "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/internal/cleanup"
"github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf/proto"
) )
func init() { func init() {

4
core/sandbox/helpers.go
View File

@ -18,8 +18,8 @@ package sandbox
import ( import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
gogo_types "github.com/containerd/containerd/v2/protobuf/types" gogo_types "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

2
core/snapshots/proxy/proxy.go
View File

@ -23,7 +23,7 @@ import (
snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
protobuftypes "github.com/containerd/containerd/v2/protobuf/types" protobuftypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

2
core/snapshots/snapshotter.go
View File

@ -24,7 +24,7 @@ import (
snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
) )
const ( const (

4
integration/client/client_ttrpc_test.go
View File

@ -24,9 +24,9 @@ import (
v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1"
apitypes "github.com/containerd/containerd/v2/api/types" apitypes "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/pkg/ttrpcutil"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
integration/client/container_test.go
View File

@ -40,8 +40,8 @@ import (
"github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
gogotypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
gogotypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/go-runc" "github.com/containerd/go-runc"

4
internal/cri/server/container_checkpoint_linux.go
View File

@ -36,9 +36,9 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/pkg/protobuf/proto"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf/proto"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/log" "github.com/containerd/log"
v1 "github.com/opencontainers/image-spec/specs-go/v1" v1 "github.com/opencontainers/image-spec/specs-go/v1"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
internal/cri/server/container_stats_list.go
View File

@ -34,7 +34,7 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
"github.com/containerd/containerd/v2/internal/cri/store/stats" "github.com/containerd/containerd/v2/internal/cri/store/stats"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

2
internal/cri/server/container_stop.go
View File

@ -26,7 +26,7 @@ import (
eventtypes "github.com/containerd/containerd/v2/api/events" eventtypes "github.com/containerd/containerd/v2/api/events"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"

2
internal/cri/server/events.go
View File

@ -32,7 +32,7 @@ import (
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
containerdio "github.com/containerd/containerd/v2/pkg/cio" containerdio "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
) )
const ( const (

2
internal/cri/server/events/events_test.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
eventtypes "github.com/containerd/containerd/v2/api/events" eventtypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
internal/cri/server/helpers_test.go
View File

@ -32,8 +32,8 @@ import (
crilabels "github.com/containerd/containerd/v2/internal/cri/labels" crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtimespec "github.com/opencontainers/runtime-spec/specs-go"

2
internal/cri/server/podsandbox/controller.go
View File

@ -37,8 +37,8 @@ import (
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
osinterface "github.com/containerd/containerd/v2/pkg/os" osinterface "github.com/containerd/containerd/v2/pkg/os"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/platforms" "github.com/containerd/platforms"
) )

2
internal/cri/server/podsandbox/sandbox_stop.go
View File

@ -30,7 +30,7 @@ import (
"github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types" "github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types"
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
) )
func (c *Controller) Stop(ctx context.Context, sandboxID string, _ ...sandbox.StopOpt) error { func (c *Controller) Stop(ctx context.Context, sandboxID string, _ ...sandbox.StopOpt) error {

2
internal/cri/server/sandbox_stats_windows.go
View File

@ -30,7 +30,7 @@ import (
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
"github.com/containerd/containerd/v2/internal/cri/store/stats" "github.com/containerd/containerd/v2/internal/cri/store/stats"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

2
internal/cri/server/sandbox_stats_windows_test.go
View File

@ -24,7 +24,7 @@ import (
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
"github.com/containerd/containerd/v2/internal/cri/store/stats" "github.com/containerd/containerd/v2/internal/cri/store/stats"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
) )

2
internal/cri/server/service.go
View File

@ -53,8 +53,8 @@ import (
"github.com/containerd/containerd/v2/internal/registrar" "github.com/containerd/containerd/v2/internal/registrar"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
osinterface "github.com/containerd/containerd/v2/pkg/os" osinterface "github.com/containerd/containerd/v2/pkg/os"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
) )
var kernelSupportsRRO bool var kernelSupportsRRO bool

0
protobuf/any.go → pkg/protobuf/any.go
View File

0
protobuf/any_test.go → pkg/protobuf/any_test.go
View File

0
protobuf/compare.go → pkg/protobuf/compare.go
View File

0
protobuf/proto/proto.go → pkg/protobuf/proto/proto.go
View File

0
protobuf/timestamp.go → pkg/protobuf/timestamp.go
View File

0
protobuf/types/types.go → pkg/protobuf/types/types.go
View File

2
pkg/shim/publisher.go
View File

@ -25,8 +25,8 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/pkg/ttrpcutil"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
) )

4
pkg/shim/shim.go
View File

@ -34,10 +34,10 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"

4
pkg/shim/util.go
View File

@ -34,8 +34,8 @@ import (
"github.com/containerd/containerd/v2/pkg/atomicfile" "github.com/containerd/containerd/v2/pkg/atomicfile"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/pkg/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

4
plugins/services/containers/helpers.go
View File

@ -19,8 +19,8 @@ package containers
import ( import (
api "github.com/containerd/containerd/v2/api/services/containers/v1" api "github.com/containerd/containerd/v2/api/services/containers/v1"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

2
plugins/services/containers/local.go
View File

@ -25,9 +25,9 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/metadata"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
plugins/services/containers/service.go
View File

@ -21,9 +21,9 @@ import (
"io" "io"
api "github.com/containerd/containerd/v2/api/services/containers/v1" api "github.com/containerd/containerd/v2/api/services/containers/v1"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
"google.golang.org/grpc" "google.golang.org/grpc"

4
plugins/services/content/contentserver/contentserver.go
View File

@ -24,8 +24,8 @@ import (
api "github.com/containerd/containerd/v2/api/services/content/v1" api "github.com/containerd/containerd/v2/api/services/content/v1"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

4
plugins/services/events/service.go
View File

@ -25,9 +25,9 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/events/exchange"
"github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

4
plugins/services/events/ttrpc.go
View File

@ -23,8 +23,8 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/events/exchange"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
) )

2
plugins/services/images/helpers.go
View File

@ -20,7 +20,7 @@ import (
imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" imagesapi "github.com/containerd/containerd/v2/api/services/images/v1"
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
plugins/services/images/local.go
View File

@ -30,10 +30,10 @@ import (
"github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/deprecation"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/containerd/v2/pkg/gc"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/containerd/v2/plugins/services/warning" "github.com/containerd/containerd/v2/plugins/services/warning"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
plugins/services/images/service.go
View File

@ -20,9 +20,9 @@ import (
"context" "context"
imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" imagesapi "github.com/containerd/containerd/v2/api/services/images/v1"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
"google.golang.org/grpc" "google.golang.org/grpc"

4
plugins/services/introspection/local.go
View File

@ -34,11 +34,11 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/introspection" "github.com/containerd/containerd/v2/core/introspection"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/containerd/v2/plugins/services/warning" "github.com/containerd/containerd/v2/plugins/services/warning"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
plugins/services/introspection/service.go
View File

@ -23,9 +23,9 @@ import (
api "github.com/containerd/containerd/v2/api/services/introspection/v1" api "github.com/containerd/containerd/v2/api/services/introspection/v1"
"github.com/containerd/containerd/v2/core/introspection" "github.com/containerd/containerd/v2/core/introspection"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

4
plugins/services/leases/service.go
View File

@ -21,9 +21,9 @@ import (
api "github.com/containerd/containerd/v2/api/services/leases/v1" api "github.com/containerd/containerd/v2/api/services/leases/v1"
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
plugins/services/namespaces/local.go
View File

@ -25,9 +25,9 @@ import (
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
plugins/services/namespaces/service.go
View File

@ -20,9 +20,9 @@ import (
"context" "context"
api "github.com/containerd/containerd/v2/api/services/namespaces/v1" api "github.com/containerd/containerd/v2/api/services/namespaces/v1"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
"google.golang.org/grpc" "google.golang.org/grpc"

2
plugins/services/sandbox/controller_service.go
View File

@ -28,8 +28,8 @@ import (
api "github.com/containerd/containerd/v2/api/services/sandbox/v1" api "github.com/containerd/containerd/v2/api/services/sandbox/v1"
"github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events"
"github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"

2
plugins/services/snapshots/service.go
View File

@ -22,9 +22,9 @@ import (
snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"

4
plugins/services/streaming/service.go
View File

@ -22,9 +22,9 @@ import (
api "github.com/containerd/containerd/v2/api/services/streaming/v1" api "github.com/containerd/containerd/v2/api/services/streaming/v1"
"github.com/containerd/containerd/v2/core/streaming" "github.com/containerd/containerd/v2/core/streaming"
"github.com/containerd/containerd/v2/pkg/protobuf"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"

6
plugins/services/tasks/local.go
View File

@ -40,13 +40,13 @@ import (
"github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/blockio"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/protobuf"
"github.com/containerd/containerd/v2/pkg/protobuf/proto"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/rdt"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"

2
plugins/services/tasks/service.go
View File

@ -20,9 +20,9 @@ import (
"context" "context"
api "github.com/containerd/containerd/v2/api/services/tasks/v1" api "github.com/containerd/containerd/v2/api/services/tasks/v1"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
"google.golang.org/grpc" "google.golang.org/grpc"

2
plugins/services/transfer/service.go
View File

@ -26,8 +26,8 @@ import (
"github.com/containerd/containerd/v2/core/transfer" "github.com/containerd/containerd/v2/core/transfer"
tplugins "github.com/containerd/containerd/v2/core/transfer/plugins" tplugins "github.com/containerd/containerd/v2/core/transfer/plugins"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"

2
plugins/services/version/service.go
View File

@ -20,8 +20,8 @@ import (
"context" "context"
api "github.com/containerd/containerd/v2/api/services/version/v1" api "github.com/containerd/containerd/v2/api/services/version/v1"
ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
ctrdversion "github.com/containerd/containerd/v2/version" ctrdversion "github.com/containerd/containerd/v2/version"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"