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

Move services to plugins/services

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-17 09:52:57 -08:00
parent ce41d1c90a
commit 92d2a5fc02
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
50 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client.go
View File

@ -56,8 +56,8 @@ import (
"github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services/introspection"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/services/introspection"
"github.com/containerd/containerd/v2/snapshots"
snproxy "github.com/containerd/containerd/v2/snapshots/proxy"
"github.com/containerd/typeurl/v2"

4
client/services.go
View File

@ -32,8 +32,8 @@ import (
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins"
srv "github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/services/introspection"
srv "github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/containerd/v2/plugins/services/introspection"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/plugin"
)

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

@ -27,24 +27,24 @@ import (
_ "github.com/containerd/containerd/v2/plugins/metadata"
_ "github.com/containerd/containerd/v2/plugins/restart"
_ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/services/containers"
_ "github.com/containerd/containerd/v2/plugins/services/content"
_ "github.com/containerd/containerd/v2/plugins/services/diff"
_ "github.com/containerd/containerd/v2/plugins/services/events"
_ "github.com/containerd/containerd/v2/plugins/services/healthcheck"
_ "github.com/containerd/containerd/v2/plugins/services/images"
_ "github.com/containerd/containerd/v2/plugins/services/introspection"
_ "github.com/containerd/containerd/v2/plugins/services/leases"
_ "github.com/containerd/containerd/v2/plugins/services/namespaces"
_ "github.com/containerd/containerd/v2/plugins/services/opt"
_ "github.com/containerd/containerd/v2/plugins/services/sandbox"
_ "github.com/containerd/containerd/v2/plugins/services/snapshots"
_ "github.com/containerd/containerd/v2/plugins/services/streaming"
_ "github.com/containerd/containerd/v2/plugins/services/tasks"
_ "github.com/containerd/containerd/v2/plugins/services/transfer"
_ "github.com/containerd/containerd/v2/plugins/services/version"
_ "github.com/containerd/containerd/v2/plugins/services/warning"
_ "github.com/containerd/containerd/v2/plugins/streaming"
_ "github.com/containerd/containerd/v2/plugins/transfer"
_ "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"
)

2
cmd/containerd/server/server.go
View File

@ -62,7 +62,7 @@ import (
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/containerd/v2/services/warning"
"github.com/containerd/containerd/v2/plugins/services/warning"
ssproxy "github.com/containerd/containerd/v2/snapshots/proxy"
"github.com/containerd/containerd/v2/sys"
"github.com/containerd/plugin"

32
contrib/fuzz/builtins.go
View File

@ -29,23 +29,23 @@ import (
_ "github.com/containerd/containerd/v2/plugins/metadata"
_ "github.com/containerd/containerd/v2/plugins/restart"
_ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/services/containers"
_ "github.com/containerd/containerd/v2/plugins/services/content"
_ "github.com/containerd/containerd/v2/plugins/services/diff"
_ "github.com/containerd/containerd/v2/plugins/services/events"
_ "github.com/containerd/containerd/v2/plugins/services/healthcheck"
_ "github.com/containerd/containerd/v2/plugins/services/images"
_ "github.com/containerd/containerd/v2/plugins/services/introspection"
_ "github.com/containerd/containerd/v2/plugins/services/leases"
_ "github.com/containerd/containerd/v2/plugins/services/namespaces"
_ "github.com/containerd/containerd/v2/plugins/services/opt"
_ "github.com/containerd/containerd/v2/plugins/services/sandbox"
_ "github.com/containerd/containerd/v2/plugins/services/snapshots"
_ "github.com/containerd/containerd/v2/plugins/services/streaming"
_ "github.com/containerd/containerd/v2/plugins/services/tasks"
_ "github.com/containerd/containerd/v2/plugins/services/transfer"
_ "github.com/containerd/containerd/v2/plugins/services/version"
_ "github.com/containerd/containerd/v2/plugins/streaming"
_ "github.com/containerd/containerd/v2/plugins/transfer"
_ "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"
)

22
integration/build_local_containerd_helper_test.go
View File

@ -40,19 +40,19 @@ import (
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/plugins/leases"
_ "github.com/containerd/containerd/v2/plugins/metadata"
_ "github.com/containerd/containerd/v2/plugins/services/containers"
_ "github.com/containerd/containerd/v2/plugins/services/content"
_ "github.com/containerd/containerd/v2/plugins/services/diff"
_ "github.com/containerd/containerd/v2/plugins/services/events"
_ "github.com/containerd/containerd/v2/plugins/services/images"
_ "github.com/containerd/containerd/v2/plugins/services/introspection"
_ "github.com/containerd/containerd/v2/plugins/services/leases"
_ "github.com/containerd/containerd/v2/plugins/services/namespaces"
_ "github.com/containerd/containerd/v2/plugins/services/snapshots"
_ "github.com/containerd/containerd/v2/plugins/services/tasks"
_ "github.com/containerd/containerd/v2/plugins/services/version"
_ "github.com/containerd/containerd/v2/runtime/v2"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
_ "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/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/snapshots"
_ "github.com/containerd/containerd/v2/services/tasks"
_ "github.com/containerd/containerd/v2/services/version"
"github.com/stretchr/testify/require"
)

2
integration/build_local_containerd_helper_test_linux.go
View File

@ -19,6 +19,6 @@ package integration
import (
// Register for linux platforms
_ "github.com/containerd/containerd/v2/plugins/sandbox" // WithInMemoryServices will fail otherwise
_ "github.com/containerd/containerd/v2/services/sandbox" // WithInMemoryServices will fail otherwise
_ "github.com/containerd/containerd/v2/plugins/services/sandbox" // WithInMemoryServices will fail otherwise
_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin"
)

2
pkg/cri/server/base/cri_base.go
View File

@ -36,7 +36,7 @@ import (
"github.com/containerd/containerd/v2/pkg/cri/constants"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/services/warning"
"github.com/containerd/containerd/v2/plugins/services/warning"
)
// CRIBase contains common dependencies for CRI's runtime, image, and podsandbox services.

0
services/containers/helpers.go → plugins/services/containers/helpers.go
View File

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

@ -27,8 +27,8 @@ import (
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
bolt "go.etcd.io/bbolt"

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

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

0
services/content/contentserver/contentserver.go → plugins/services/content/contentserver/contentserver.go
View File

4
services/content/service.go → plugins/services/content/service.go
View File

@ -19,8 +19,8 @@ package content
import (
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/services/content/contentserver"
"github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/containerd/v2/plugins/services/content/contentserver"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
)

2
services/content/store.go → plugins/services/content/store.go
View File

@ -24,7 +24,7 @@ import (
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
digest "github.com/opencontainers/go-digest"

2
services/diff/local.go → plugins/services/diff/local.go
View File

@ -26,7 +26,7 @@ import (
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
"github.com/containerd/typeurl/v2"

2
services/diff/service.go → plugins/services/diff/service.go
View File

@ -21,7 +21,7 @@ import (
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
"google.golang.org/grpc"

0
services/diff/service_unix.go → plugins/services/diff/service_unix.go
View File

0
services/diff/service_windows.go → plugins/services/diff/service_windows.go
View File

0
services/events/service.go → plugins/services/events/service.go
View File

0
services/events/ttrpc.go → plugins/services/events/ttrpc.go
View File

0
services/healthcheck/service.go → plugins/services/healthcheck/service.go
View File

0
services/images/helpers.go → plugins/services/images/helpers.go
View File

4
services/images/local.go → plugins/services/images/local.go
View File

@ -34,9 +34,9 @@ import (
"github.com/containerd/containerd/v2/pkg/deprecation"
"github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/containerd/v2/plugins/services/warning"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/services/warning"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
)

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

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

0
services/introspection/introspection.go → plugins/services/introspection/introspection.go
View File

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

@ -35,10 +35,10 @@ import (
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services"
"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/containerd/v2/services"
"github.com/containerd/containerd/v2/services/warning"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
)

0
services/introspection/pidns_linux.go → plugins/services/introspection/pidns_linux.go
View File

0
services/introspection/pidns_others.go → plugins/services/introspection/pidns_others.go
View File

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

@ -22,8 +22,8 @@ import (
api "github.com/containerd/containerd/v2/api/services/introspection/v1"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
"google.golang.org/grpc"

0
services/leases/service.go → plugins/services/leases/service.go
View File

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

@ -27,8 +27,8 @@ import (
"github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
bolt "go.etcd.io/bbolt"

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

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

0
services/opt/path_unix.go → plugins/services/opt/path_unix.go
View File

0
services/opt/path_windows.go → plugins/services/opt/path_windows.go
View File

0
services/opt/service.go → plugins/services/opt/service.go
View File

0
services/sandbox/controller_service.go → plugins/services/sandbox/controller_service.go
View File

0
services/sandbox/store_service.go → plugins/services/sandbox/store_service.go
View File

0
services/services.go → plugins/services/services.go
View File

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

@ -23,8 +23,8 @@ import (
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/log"
"github.com/containerd/plugin"

2
services/snapshots/snapshotters.go → plugins/services/snapshots/snapshotters.go
View File

@ -19,7 +19,7 @@ package snapshots
import (
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
)

0
services/streaming/service.go → plugins/services/streaming/service.go
View File

2
services/tasks/local.go → plugins/services/tasks/local.go
View File

@ -42,12 +42,12 @@ import (
"github.com/containerd/containerd/v2/pkg/rdt"
"github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/plugins"
"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/containerd/v2/runtime"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/log"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"

0
services/tasks/local_darwin.go → plugins/services/tasks/local_darwin.go
View File

0
services/tasks/local_freebsd.go → plugins/services/tasks/local_freebsd.go
View File

0
services/tasks/local_unix.go → plugins/services/tasks/local_unix.go
View File

0
services/tasks/local_windows.go → plugins/services/tasks/local_windows.go
View File

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

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

0
services/transfer/service.go → plugins/services/transfer/service.go
View File

0
services/version/service.go → plugins/services/version/service.go
View File

0
services/warning/service.go → plugins/services/warning/service.go
View File