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

Merge pull request #9306 from dmcgowan/containerd-v2-module

Browse Source 
Containerd v2 module
This commit is contained in:
Akihiro Suda
2023-11-01 15:20:35 +00:00
committed by GitHub
parent d8d2b79e1d 5fdf55e493
commit 19ff94b701
921 changed files with 3313 additions and 53225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/containerd-shim-runc-v2/main.go
View File

@@ -21,10 +21,10 @@ package main
import (
"context"
"github.com/containerd/containerd/runtime/v2/runc/manager"
_ "github.com/containerd/containerd/runtime/v2/runc/pause"
_ "github.com/containerd/containerd/runtime/v2/runc/task/plugin"
"github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/v2/runtime/v2/runc/manager"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/pause"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/task/plugin"
"github.com/containerd/containerd/v2/runtime/v2/shim"
)
func main() {

4
cmd/containerd-stress/cri_worker.go
View File

@@ -23,8 +23,8 @@ import (
"sync"
"time"
internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis"
"github.com/containerd/containerd/pkg/cri/util"
internalapi "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis"
"github.com/containerd/containerd/v2/pkg/cri/util"
"github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
)

8
cmd/containerd-stress/density.go
View File

@@ -29,10 +29,10 @@ import (
"strings"
"syscall"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/log"
"github.com/urfave/cli"
)

6
cmd/containerd-stress/exec_worker.go
View File

@@ -23,9 +23,9 @@ import (
"syscall"
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/log"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

8
cmd/containerd-stress/main.go
View File

@@ -28,10 +28,10 @@ import (
"syscall"
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/integration/remote"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/plugins"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/integration/remote"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/log"
metrics "github.com/docker/go-metrics"
"github.com/urfave/cli"

6
cmd/containerd-stress/worker.go
View File

@@ -23,9 +23,9 @@ import (
"sync"
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/log"
)

2
cmd/containerd/builtins/btrfs_linux.go
View File

@@ -18,4 +18,4 @@
package builtins
import _ "github.com/containerd/containerd/snapshots/btrfs/plugin"
import _ "github.com/containerd/containerd/v2/snapshots/btrfs/plugin"

58
cmd/containerd/builtins/builtins.go
View File

@@ -18,33 +18,33 @@ package builtins
// register containerd builtins here
import (
_ "github.com/containerd/containerd/diff/walking/plugin"
_ "github.com/containerd/containerd/events/plugin"
_ "github.com/containerd/containerd/gc/scheduler"
_ "github.com/containerd/containerd/leases/plugin"
_ "github.com/containerd/containerd/metadata/plugin"
_ "github.com/containerd/containerd/pkg/nri/plugin"
_ "github.com/containerd/containerd/plugins/imageverifier"
_ "github.com/containerd/containerd/plugins/sandbox"
_ "github.com/containerd/containerd/plugins/streaming"
_ "github.com/containerd/containerd/plugins/transfer"
_ "github.com/containerd/containerd/runtime/restart/monitor"
_ "github.com/containerd/containerd/runtime/v2"
_ "github.com/containerd/containerd/services/containers"
_ "github.com/containerd/containerd/services/content"
_ "github.com/containerd/containerd/services/diff"
_ "github.com/containerd/containerd/services/events"
_ "github.com/containerd/containerd/services/healthcheck"
_ "github.com/containerd/containerd/services/images"
_ "github.com/containerd/containerd/services/introspection"
_ "github.com/containerd/containerd/services/leases"
_ "github.com/containerd/containerd/services/namespaces"
_ "github.com/containerd/containerd/services/opt"
_ "github.com/containerd/containerd/services/sandbox"
_ "github.com/containerd/containerd/services/snapshots"
_ "github.com/containerd/containerd/services/streaming"
_ "github.com/containerd/containerd/services/tasks"
_ "github.com/containerd/containerd/services/transfer"
_ "github.com/containerd/containerd/services/version"
_ "github.com/containerd/containerd/services/warning"
_ "github.com/containerd/containerd/v2/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/events/plugin"
_ "github.com/containerd/containerd/v2/gc/scheduler"
_ "github.com/containerd/containerd/v2/leases/plugin"
_ "github.com/containerd/containerd/v2/metadata/plugin"
_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
_ "github.com/containerd/containerd/v2/plugins/imageverifier"
_ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/streaming"
_ "github.com/containerd/containerd/v2/plugins/transfer"
_ "github.com/containerd/containerd/v2/runtime/restart/monitor"
_ "github.com/containerd/containerd/v2/runtime/v2"
_ "github.com/containerd/containerd/v2/services/containers"
_ "github.com/containerd/containerd/v2/services/content"
_ "github.com/containerd/containerd/v2/services/diff"
_ "github.com/containerd/containerd/v2/services/events"
_ "github.com/containerd/containerd/v2/services/healthcheck"
_ "github.com/containerd/containerd/v2/services/images"
_ "github.com/containerd/containerd/v2/services/introspection"
_ "github.com/containerd/containerd/v2/services/leases"
_ "github.com/containerd/containerd/v2/services/namespaces"
_ "github.com/containerd/containerd/v2/services/opt"
_ "github.com/containerd/containerd/v2/services/sandbox"
_ "github.com/containerd/containerd/v2/services/snapshots"
_ "github.com/containerd/containerd/v2/services/streaming"
_ "github.com/containerd/containerd/v2/services/tasks"
_ "github.com/containerd/containerd/v2/services/transfer"
_ "github.com/containerd/containerd/v2/services/version"
_ "github.com/containerd/containerd/v2/services/warning"
)

12
cmd/containerd/builtins/builtins_linux.go
View File

@@ -17,10 +17,10 @@
package builtins
import (
_ "github.com/containerd/containerd/metrics/cgroups"
_ "github.com/containerd/containerd/metrics/cgroups/v2"
_ "github.com/containerd/containerd/runtime/v2/runc/options"
_ "github.com/containerd/containerd/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/snapshots/native/plugin"
_ "github.com/containerd/containerd/snapshots/overlay/plugin"
_ "github.com/containerd/containerd/v2/metrics/cgroups"
_ "github.com/containerd/containerd/v2/metrics/cgroups/v2"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/v2/snapshots/native/plugin"
_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin"
)

4
cmd/containerd/builtins/builtins_unix.go
View File

@@ -19,6 +19,6 @@
package builtins
import (
_ "github.com/containerd/containerd/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/snapshots/native/plugin"
_ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/v2/snapshots/native/plugin"
)

8
cmd/containerd/builtins/builtins_windows.go
View File

@@ -17,8 +17,8 @@
package builtins
import (
_ "github.com/containerd/containerd/diff/lcow"
_ "github.com/containerd/containerd/diff/windows"
_ "github.com/containerd/containerd/snapshots/lcow"
_ "github.com/containerd/containerd/snapshots/windows"
_ "github.com/containerd/containerd/v2/diff/lcow"
_ "github.com/containerd/containerd/v2/diff/windows"
_ "github.com/containerd/containerd/v2/snapshots/lcow"
_ "github.com/containerd/containerd/v2/snapshots/windows"
)

2
cmd/containerd/builtins/cri.go
View File

@@ -19,5 +19,5 @@
package builtins
import (
_ "github.com/containerd/containerd/pkg/cri"
_ "github.com/containerd/containerd/v2/pkg/cri"
)

2
cmd/containerd/builtins/devmapper_linux.go
View File

@@ -18,4 +18,4 @@
package builtins
import _ "github.com/containerd/containerd/snapshots/devmapper/plugin"
import _ "github.com/containerd/containerd/v2/snapshots/devmapper/plugin"

2
cmd/containerd/builtins/tracing.go
View File

@@ -19,5 +19,5 @@
package builtins
import (
_ "github.com/containerd/containerd/tracing/plugin"
_ "github.com/containerd/containerd/v2/tracing/plugin"
)

12
cmd/containerd/command/config.go
View File

@@ -21,12 +21,12 @@ import (
"os"
"path/filepath"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/pkg/timeout"
"github.com/containerd/containerd/plugin/registry"
"github.com/containerd/containerd/services/server"
srvconfig "github.com/containerd/containerd/services/server/config"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/services/server"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pelletier/go-toml/v2"
"github.com/urfave/cli"

16
cmd/containerd/command/main.go
View File

@@ -27,14 +27,14 @@ import (
"runtime"
"time"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/errdefs"
_ "github.com/containerd/containerd/metrics" // import containerd build info
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/services/server"
srvconfig "github.com/containerd/containerd/services/server/config"
"github.com/containerd/containerd/sys"
"github.com/containerd/containerd/version"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/errdefs"
_ "github.com/containerd/containerd/v2/metrics" // import containerd build info
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/services/server"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/containerd/v2/sys"
"github.com/containerd/containerd/v2/version"
"github.com/containerd/log"
"github.com/urfave/cli"
"google.golang.org/grpc/grpclog"

2
cmd/containerd/command/main_unix.go
View File

@@ -23,7 +23,7 @@ import (
"os"
"path/filepath"
"github.com/containerd/containerd/services/server"
"github.com/containerd/containerd/v2/services/server"
"github.com/containerd/log"
"golang.org/x/sys/unix"
)

2
cmd/containerd/command/main_windows.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/Microsoft/go-winio/pkg/etw"
"github.com/Microsoft/go-winio/pkg/etwlogrus"
"github.com/Microsoft/go-winio/pkg/guid"
"github.com/containerd/containerd/services/server"
"github.com/containerd/containerd/v2/services/server"
"github.com/containerd/log"
"github.com/sirupsen/logrus"
"golang.org/x/sys/windows"

2
cmd/containerd/command/oci-hook.go
View File

@@ -25,7 +25,7 @@ import (
"syscall"
"text/template"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2/oci"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
)

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

@@ -24,12 +24,12 @@ import (
"os"
"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"
eventsapi "github.com/containerd/containerd/v2/api/services/events/v1"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/urfave/cli"
"google.golang.org/grpc"
"google.golang.org/grpc/backoff"

2
cmd/containerd/command/service_unsupported.go
View File

@@ -19,7 +19,7 @@
package command
import (
"github.com/containerd/containerd/services/server"
"github.com/containerd/containerd/v2/services/server"
"github.com/urfave/cli"
)

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

@@ -23,8 +23,8 @@ import (
"path/filepath"
"time"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/services/server"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/services/server"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
exec "golang.org/x/sys/execabs"

8
cmd/containerd/main.go
View File

@@ -21,11 +21,11 @@ import (
"fmt"
"os"
"github.com/containerd/containerd/cmd/containerd/command"
"github.com/containerd/containerd/pkg/hasher"
"github.com/containerd/containerd/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies
"github.com/containerd/containerd/v2/cmd/containerd/command"
"github.com/containerd/containerd/v2/pkg/hasher"
"github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies
_ "github.com/containerd/containerd/cmd/containerd/builtins"
_ "github.com/containerd/containerd/v2/cmd/containerd/builtins"
)
func init() {

40
cmd/ctr/app/main.go
View File

@@ -24,26 +24,26 @@ import (
"github.com/urfave/cli"
"google.golang.org/grpc/grpclog"
"github.com/containerd/containerd/cmd/ctr/commands/containers"
"github.com/containerd/containerd/cmd/ctr/commands/content"
"github.com/containerd/containerd/cmd/ctr/commands/deprecations"
"github.com/containerd/containerd/cmd/ctr/commands/events"
"github.com/containerd/containerd/cmd/ctr/commands/images"
"github.com/containerd/containerd/cmd/ctr/commands/info"
"github.com/containerd/containerd/cmd/ctr/commands/install"
"github.com/containerd/containerd/cmd/ctr/commands/leases"
namespacesCmd "github.com/containerd/containerd/cmd/ctr/commands/namespaces"
ociCmd "github.com/containerd/containerd/cmd/ctr/commands/oci"
"github.com/containerd/containerd/cmd/ctr/commands/plugins"
"github.com/containerd/containerd/cmd/ctr/commands/pprof"
"github.com/containerd/containerd/cmd/ctr/commands/run"
"github.com/containerd/containerd/cmd/ctr/commands/sandboxes"
"github.com/containerd/containerd/cmd/ctr/commands/snapshots"
"github.com/containerd/containerd/cmd/ctr/commands/tasks"
versionCmd "github.com/containerd/containerd/cmd/ctr/commands/version"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/version"
"github.com/containerd/containerd/v2/cmd/ctr/commands/containers"
"github.com/containerd/containerd/v2/cmd/ctr/commands/content"
"github.com/containerd/containerd/v2/cmd/ctr/commands/deprecations"
"github.com/containerd/containerd/v2/cmd/ctr/commands/events"
"github.com/containerd/containerd/v2/cmd/ctr/commands/images"
"github.com/containerd/containerd/v2/cmd/ctr/commands/info"
"github.com/containerd/containerd/v2/cmd/ctr/commands/install"
"github.com/containerd/containerd/v2/cmd/ctr/commands/leases"
namespacesCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/namespaces"
ociCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/oci"
"github.com/containerd/containerd/v2/cmd/ctr/commands/plugins"
"github.com/containerd/containerd/v2/cmd/ctr/commands/pprof"
"github.com/containerd/containerd/v2/cmd/ctr/commands/run"
"github.com/containerd/containerd/v2/cmd/ctr/commands/sandboxes"
"github.com/containerd/containerd/v2/cmd/ctr/commands/snapshots"
"github.com/containerd/containerd/v2/cmd/ctr/commands/tasks"
versionCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/version"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/version"
)
var extraCmds = []cli.Command{}

2
cmd/ctr/app/main_unix.go
View File

@@ -18,7 +18,7 @@
package app
import "github.com/containerd/containerd/cmd/ctr/commands/shim"
import "github.com/containerd/containerd/v2/cmd/ctr/commands/shim"
func init() {
extraCmds = append(extraCmds, shim.Command)

6
cmd/ctr/commands/client.go
View File

@@ -19,9 +19,9 @@ package commands
import (
gocontext "context"
"github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/epoch"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/log"
"github.com/urfave/cli"
)

6
cmd/ctr/commands/cni.go
View File

@@ -20,14 +20,14 @@ import (
"context"
"fmt"
"github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/typeurl/v2"
)
func init() {
typeurl.Register(&NetworkMetaData{},
"github.com/containerd/containerd/cmd/ctr/commands", "NetworkMetaData")
"github.com/containerd/containerd/v2/cmd/ctr/commands", "NetworkMetaData")
}
const (

4
cmd/ctr/commands/commands.go
View File

@@ -23,8 +23,8 @@ import (
"path/filepath"
"strings"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/pkg/atomicfile"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/pkg/atomicfile"
"github.com/urfave/cli"
)

6
cmd/ctr/commands/containers/checkpoint.go
View File

@@ -20,9 +20,9 @@ import (
"errors"
"fmt"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs"
"github.com/urfave/cli"
)

12
cmd/ctr/commands/containers/containers.go
View File

@@ -23,12 +23,12 @@ import (
"strings"
"text/tabwriter"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"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/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/run"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/log"
"github.com/containerd/typeurl/v2"
"github.com/urfave/cli"

10
cmd/ctr/commands/containers/restore.go
View File

@@ -20,11 +20,11 @@ import (
"errors"
"github.com/containerd/console"
"github.com/containerd/containerd"
"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/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/tasks"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/log"
"github.com/urfave/cli"
)

8
cmd/ctr/commands/content/content.go
View File

@@ -26,10 +26,10 @@ import (
"text/tabwriter"
"time"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
units "github.com/docker/go-units"
digest "github.com/opencontainers/go-digest"

16
cmd/ctr/commands/content/fetch.go
View File

@@ -26,14 +26,14 @@ import (
"text/tabwriter"
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

6
cmd/ctr/commands/content/prune.go
View File

@@ -21,9 +21,9 @@ import (
"time"
"unicode"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/log"
"github.com/urfave/cli"
)

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

@@ -24,10 +24,10 @@ import (
"github.com/urfave/cli"
api "github.com/containerd/containerd/api/services/introspection/v1"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/protobuf"
ptypes "github.com/containerd/containerd/protobuf/types"
api "github.com/containerd/containerd/v2/api/services/introspection/v1"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
)
// Command is the parent for all commands under "deprecations"

6
cmd/ctr/commands/events/events.go
View File

@@ -20,14 +20,14 @@ import (
"encoding/json"
"fmt"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/events"
"github.com/containerd/log"
"github.com/containerd/typeurl/v2"
"github.com/urfave/cli"
// Register grpc event types
_ "github.com/containerd/containerd/api/events"
_ "github.com/containerd/containerd/v2/api/events"
)
// Command is the cli command for displaying containerd events

8
cmd/ctr/commands/images/convert.go
View File

@@ -20,10 +20,10 @@ import (
"errors"
"fmt"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/images/converter"
"github.com/containerd/containerd/images/converter/uncompress"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/images/converter"
"github.com/containerd/containerd/v2/images/converter/uncompress"
"github.com/containerd/containerd/v2/platforms"
"github.com/urfave/cli"
)

12
cmd/ctr/commands/images/export.go
View File

@@ -24,12 +24,12 @@ import (
"github.com/urfave/cli"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/pkg/transfer"
tarchive "github.com/containerd/containerd/pkg/transfer/archive"
"github.com/containerd/containerd/pkg/transfer/image"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/images/archive"
"github.com/containerd/containerd/v2/pkg/transfer"
tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive"
"github.com/containerd/containerd/v2/pkg/transfer/image"
"github.com/containerd/containerd/v2/platforms"
)
var exportCommand = cli.Command{

10
cmd/ctr/commands/images/images.go
View File

@@ -24,11 +24,11 @@ import (
"strings"
"text/tabwriter"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log"
"github.com/urfave/cli"
)

14
cmd/ctr/commands/images/import.go
View File

@@ -25,13 +25,13 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/pkg/transfer"
tarchive "github.com/containerd/containerd/pkg/transfer/archive"
"github.com/containerd/containerd/pkg/transfer/image"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/images/archive"
"github.com/containerd/containerd/v2/pkg/transfer"
tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive"
"github.com/containerd/containerd/v2/pkg/transfer/image"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log"
)

4
cmd/ctr/commands/images/inspect.go
View File

@@ -19,8 +19,8 @@ package images
import (
"os"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/pkg/display"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/pkg/display"
"github.com/urfave/cli"
)

12
cmd/ctr/commands/images/mount.go
View File

@@ -20,12 +20,12 @@ import (
"fmt"
"time"
"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/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/platforms"
"github.com/opencontainers/image-spec/identity"
"github.com/urfave/cli"
)

18
cmd/ctr/commands/images/pull.go
View File

@@ -24,15 +24,15 @@ import (
"strings"
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/cmd/ctr/commands/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/pkg/transfer"
"github.com/containerd/containerd/pkg/transfer/image"
"github.com/containerd/containerd/pkg/transfer/registry"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/pkg/transfer/image"
"github.com/containerd/containerd/v2/pkg/transfer/registry"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log"
"github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

22
cmd/ctr/commands/images/push.go
View File

@@ -26,17 +26,17 @@ import (
"text/tabwriter"
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/cmd/ctr/commands/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/pkg/transfer"
"github.com/containerd/containerd/pkg/transfer/image"
"github.com/containerd/containerd/pkg/transfer/registry"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/pkg/transfer/image"
"github.com/containerd/containerd/v2/pkg/transfer/registry"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/log"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

6
cmd/ctr/commands/images/tag.go
View File

@@ -21,9 +21,9 @@ 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/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/transfer/image"
"github.com/distribution/reference"
)

8
cmd/ctr/commands/images/unmount.go
View File

@@ -19,10 +19,10 @@ package images
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/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/mount"
"github.com/urfave/cli"
)

6
cmd/ctr/commands/images/usage.go
View File

@@ -21,9 +21,9 @@ import (
"os"
"text/tabwriter"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/pkg/progress"
"github.com/opencontainers/image-spec/identity"
"github.com/urfave/cli"

6
cmd/ctr/commands/info/info.go
View File

@@ -17,9 +17,9 @@
package info
import (
api "github.com/containerd/containerd/api/services/introspection/v1"
"github.com/containerd/containerd/cmd/ctr/commands"
ptypes "github.com/containerd/containerd/protobuf/types"
api "github.com/containerd/containerd/v2/api/services/introspection/v1"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/urfave/cli"
)

4
cmd/ctr/commands/install/install.go
View File

@@ -17,8 +17,8 @@
package install
import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/urfave/cli"
)

4
cmd/ctr/commands/leases/leases.go
View File

@@ -24,8 +24,8 @@ import (
"text/tabwriter"
"time"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/leases"
"github.com/urfave/cli"
)

4
cmd/ctr/commands/namespaces/namespaces.go
View File

@@ -24,8 +24,8 @@ import (
"strings"
"text/tabwriter"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/log"
"github.com/urfave/cli"
)

4
cmd/ctr/commands/namespaces/namespaces_linux.go
View File

@@ -17,8 +17,8 @@
package namespaces
import (
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/runtime/opts"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/runtime/opts"
"github.com/urfave/cli"
)

2
cmd/ctr/commands/namespaces/namespaces_other.go
View File

@@ -19,7 +19,7 @@
package namespaces
import (
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/v2/namespaces"
"github.com/urfave/cli"
)

8
cmd/ctr/commands/oci/oci.go
View File

@@ -21,10 +21,10 @@ import (
"github.com/urfave/cli"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/platforms"
)
// Command is the parent for all OCI related tools under 'oci'

8
cmd/ctr/commands/plugins/plugins.go
View File

@@ -23,10 +23,10 @@ import (
"strings"
"text/tabwriter"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/platforms"
pluginutils "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/platforms"
pluginutils "github.com/containerd/containerd/v2/plugin"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli"
"google.golang.org/grpc/codes"

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

@@ -23,7 +23,7 @@ import (
"os"
"time"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/v2/defaults"
"github.com/urfave/cli"
)

8
cmd/ctr/commands/resolver.go
View File

@@ -31,10 +31,10 @@ import (
"strings"
"github.com/containerd/console"
"github.com/containerd/containerd/pkg/transfer/registry"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker"
"github.com/containerd/containerd/remotes/docker/config"
"github.com/containerd/containerd/v2/pkg/transfer/registry"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/containerd/v2/remotes/docker/config"
"github.com/containerd/log"
"github.com/urfave/cli"
)

16
cmd/ctr/commands/run/run.go
View File

@@ -28,14 +28,14 @@ import (
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/cmd/ctr/commands/tasks"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
clabels "github.com/containerd/containerd/labels"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/tasks"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/errdefs"
clabels "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/log"
)

22
cmd/ctr/commands/run/run_unix.go
View File

@@ -30,17 +30,17 @@ import (
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/contrib/apparmor"
"github.com/containerd/containerd/contrib/nvidia"
"github.com/containerd/containerd/contrib/seccomp"
"github.com/containerd/containerd/oci"
runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/contrib/apparmor"
"github.com/containerd/containerd/v2/contrib/nvidia"
"github.com/containerd/containerd/v2/contrib/seccomp"
"github.com/containerd/containerd/v2/oci"
runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/log"
"github.com/intel/goresctrl/pkg/blockio"
"github.com/opencontainers/runtime-spec/specs-go"

10
cmd/ctr/commands/run/run_windows.go
View File

@@ -23,11 +23,11 @@ import (
"github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
"github.com/containerd/console"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/netns"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/netns"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/log"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"

8
cmd/ctr/commands/sandboxes/sandboxes.go
View File

@@ -22,10 +22,10 @@ import (
"os"
"text/tabwriter"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/log"
"github.com/urfave/cli"
)

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

@@ -28,11 +28,11 @@ import (
"strings"
"github.com/containerd/console"
"github.com/containerd/containerd/api/runtime/task/v2"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/namespaces"
ptypes "github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/namespaces"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/log"
"github.com/containerd/ttrpc"
"github.com/containerd/typeurl/v2"

4
cmd/ctr/commands/signals.go
View File

@@ -22,8 +22,8 @@ import (
"os/signal"
"syscall"
"github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/log"
)

14
cmd/ctr/commands/snapshots/snapshots.go
View File

@@ -28,13 +28,13 @@ import (
"text/tabwriter"
"time"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/diff"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/rootfs"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/rootfs"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/log"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

4
cmd/ctr/commands/tasks/attach.go
View File

@@ -18,8 +18,8 @@ package tasks
import (
"github.com/containerd/console"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/log"
"github.com/urfave/cli"
)

6
cmd/ctr/commands/tasks/checkpoint.go
View File

@@ -20,9 +20,9 @@ import (
"errors"
"fmt"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/urfave/cli"
)

6
cmd/ctr/commands/tasks/delete.go
View File

@@ -19,9 +19,9 @@ package tasks
import (
gocontext "context"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/log"
"github.com/urfave/cli"
)

8
cmd/ctr/commands/tasks/exec.go
View File

@@ -23,10 +23,10 @@ import (
"os"
"github.com/containerd/console"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/log"
"github.com/urfave/cli"
)

4
cmd/ctr/commands/tasks/kill.go
View File

@@ -21,8 +21,8 @@ import (
"errors"
"fmt"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
gocni "github.com/containerd/go-cni"
"github.com/containerd/log"
"github.com/containerd/typeurl/v2"

4
cmd/ctr/commands/tasks/list.go
View File

@@ -21,8 +21,8 @@ import (
"os"
"text/tabwriter"
tasks "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/cmd/ctr/commands"
tasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/urfave/cli"
)

2
cmd/ctr/commands/tasks/metrics.go
View File

@@ -26,7 +26,7 @@ import (
wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats"
v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/typeurl/v2"
"github.com/urfave/cli"
)

2
cmd/ctr/commands/tasks/pause.go
View File

@@ -17,7 +17,7 @@
package tasks
import (
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/urfave/cli"
)

2
cmd/ctr/commands/tasks/ps.go
View File

@@ -22,7 +22,7 @@ import (
"os"
"text/tabwriter"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/typeurl/v2"
"github.com/urfave/cli"
)

2
cmd/ctr/commands/tasks/resume.go
View File

@@ -17,7 +17,7 @@
package tasks
import (
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/urfave/cli"
)

8
cmd/ctr/commands/tasks/start.go
View File

@@ -20,10 +20,10 @@ import (
"errors"
"github.com/containerd/console"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/log"
"github.com/urfave/cli"
)

4
cmd/ctr/commands/tasks/tasks_unix.go
View File

@@ -26,8 +26,8 @@ import (
"os/signal"
"github.com/containerd/console"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
"golang.org/x/sys/unix"

4
cmd/ctr/commands/tasks/tasks_windows.go
View File

@@ -23,8 +23,8 @@ import (
"time"
"github.com/containerd/console"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
)

4
cmd/ctr/commands/version/version.go
View File

@@ -20,8 +20,8 @@ import (
"fmt"
"os"
"github.com/containerd/containerd/cmd/ctr/commands"
"github.com/containerd/containerd/version"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/version"
"github.com/urfave/cli"
)

6
cmd/ctr/main.go
View File

@@ -21,9 +21,9 @@ import (
"fmt"
"os"
"github.com/containerd/containerd/cmd/ctr/app"
"github.com/containerd/containerd/pkg/hasher"
"github.com/containerd/containerd/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies
"github.com/containerd/containerd/v2/cmd/ctr/app"
"github.com/containerd/containerd/v2/pkg/hasher"
"github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies
"github.com/urfave/cli"
)

4
cmd/gen-manpages/main.go
View File

@@ -23,8 +23,8 @@ import (
"path/filepath"
"strings"
"github.com/containerd/containerd/cmd/containerd/command"
"github.com/containerd/containerd/cmd/ctr/app"
"github.com/containerd/containerd/v2/cmd/containerd/command"
"github.com/containerd/containerd/v2/cmd/ctr/app"
"github.com/urfave/cli"
)