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

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() {