From 92d2a5fc0247eba00ad82f355b7cd5d0bafec440 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:52:57 -0800 Subject: [PATCH] Move services to plugins/services Signed-off-by: Derek McGowan --- client/client.go | 2 +- client/services.go | 4 +-- cmd/containerd/builtins/builtins.go | 34 +++++++++---------- cmd/containerd/server/server.go | 2 +- contrib/fuzz/builtins.go | 32 ++++++++--------- .../build_local_containerd_helper_test.go | 22 ++++++------ ...uild_local_containerd_helper_test_linux.go | 4 +-- pkg/cri/server/base/cri_base.go | 2 +- .../services}/containers/helpers.go | 0 .../services}/containers/local.go | 2 +- .../services}/containers/service.go | 2 +- .../content/contentserver/contentserver.go | 0 .../services}/content/service.go | 4 +-- .../services}/content/store.go | 2 +- {services => plugins/services}/diff/local.go | 2 +- .../services}/diff/service.go | 2 +- .../services}/diff/service_unix.go | 0 .../services}/diff/service_windows.go | 0 .../services}/events/service.go | 0 .../services}/events/ttrpc.go | 0 .../services}/healthcheck/service.go | 0 .../services}/images/helpers.go | 0 .../services}/images/local.go | 4 +-- .../services}/images/service.go | 2 +- .../services}/introspection/introspection.go | 0 .../services}/introspection/local.go | 4 +-- .../services}/introspection/pidns_linux.go | 0 .../services}/introspection/pidns_others.go | 0 .../services}/introspection/service.go | 2 +- .../services}/leases/service.go | 0 .../services}/namespaces/local.go | 2 +- .../services}/namespaces/service.go | 2 +- .../services}/opt/path_unix.go | 0 .../services}/opt/path_windows.go | 0 {services => plugins/services}/opt/service.go | 0 .../services}/sandbox/controller_service.go | 0 .../services}/sandbox/store_service.go | 0 {services => plugins/services}/services.go | 0 .../services}/snapshots/service.go | 2 +- .../services}/snapshots/snapshotters.go | 2 +- .../services}/streaming/service.go | 0 {services => plugins/services}/tasks/local.go | 2 +- .../services}/tasks/local_darwin.go | 0 .../services}/tasks/local_freebsd.go | 0 .../services}/tasks/local_unix.go | 0 .../services}/tasks/local_windows.go | 0 .../services}/tasks/service.go | 2 +- .../services}/transfer/service.go | 0 .../services}/version/service.go | 0 .../services}/warning/service.go | 0 50 files changed, 70 insertions(+), 70 deletions(-) rename {services => plugins/services}/containers/helpers.go (100%) rename {services => plugins/services}/containers/local.go (99%) rename {services => plugins/services}/containers/service.go (98%) rename {services => plugins/services}/content/contentserver/contentserver.go (100%) rename {services => plugins/services}/content/service.go (89%) rename {services => plugins/services}/content/store.go (97%) rename {services => plugins/services}/diff/local.go (98%) rename {services => plugins/services}/diff/service.go (96%) rename {services => plugins/services}/diff/service_unix.go (100%) rename {services => plugins/services}/diff/service_windows.go (100%) rename {services => plugins/services}/events/service.go (100%) rename {services => plugins/services}/events/ttrpc.go (100%) rename {services => plugins/services}/healthcheck/service.go (100%) rename {services => plugins/services}/images/helpers.go (100%) rename {services => plugins/services}/images/local.go (98%) rename {services => plugins/services}/images/service.go (97%) rename {services => plugins/services}/introspection/introspection.go (100%) rename {services => plugins/services}/introspection/local.go (98%) rename {services => plugins/services}/introspection/pidns_linux.go (100%) rename {services => plugins/services}/introspection/pidns_others.go (100%) rename {services => plugins/services}/introspection/service.go (97%) rename {services => plugins/services}/leases/service.go (100%) rename {services => plugins/services}/namespaces/local.go (99%) rename {services => plugins/services}/namespaces/service.go (97%) rename {services => plugins/services}/opt/path_unix.go (100%) rename {services => plugins/services}/opt/path_windows.go (100%) rename {services => plugins/services}/opt/service.go (100%) rename {services => plugins/services}/sandbox/controller_service.go (100%) rename {services => plugins/services}/sandbox/store_service.go (100%) rename {services => plugins/services}/services.go (100%) rename {services => plugins/services}/snapshots/service.go (99%) rename {services => plugins/services}/snapshots/snapshotters.go (95%) rename {services => plugins/services}/streaming/service.go (100%) rename {services => plugins/services}/tasks/local.go (99%) rename {services => plugins/services}/tasks/local_darwin.go (100%) rename {services => plugins/services}/tasks/local_freebsd.go (100%) rename {services => plugins/services}/tasks/local_unix.go (100%) rename {services => plugins/services}/tasks/local_windows.go (100%) rename {services => plugins/services}/tasks/service.go (98%) rename {services => plugins/services}/transfer/service.go (100%) rename {services => plugins/services}/version/service.go (100%) rename {services => plugins/services}/warning/service.go (100%) diff --git a/client/client.go b/client/client.go index dc0c783e4..326914109 100644 --- a/client/client.go +++ b/client/client.go @@ -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" diff --git a/client/services.go b/client/services.go index f3e88b055..eaaadb364 100644 --- a/client/services.go +++ b/client/services.go @@ -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" ) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index e89c500a1..7675d0657 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -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" ) diff --git a/cmd/containerd/server/server.go b/cmd/containerd/server/server.go index f9fb0960a..cd898dbc9 100644 --- a/cmd/containerd/server/server.go +++ b/cmd/containerd/server/server.go @@ -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" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index c7ea417aa..337726368 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -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" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 7e9f48968..aca1c0ac6 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -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" ) diff --git a/integration/build_local_containerd_helper_test_linux.go b/integration/build_local_containerd_helper_test_linux.go index 1ce31d7ad..3e6f17bef 100644 --- a/integration/build_local_containerd_helper_test_linux.go +++ b/integration/build_local_containerd_helper_test_linux.go @@ -18,7 +18,7 @@ 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/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" ) diff --git a/pkg/cri/server/base/cri_base.go b/pkg/cri/server/base/cri_base.go index 888a8a9cb..da001761d 100644 --- a/pkg/cri/server/base/cri_base.go +++ b/pkg/cri/server/base/cri_base.go @@ -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. diff --git a/services/containers/helpers.go b/plugins/services/containers/helpers.go similarity index 100% rename from services/containers/helpers.go rename to plugins/services/containers/helpers.go diff --git a/services/containers/local.go b/plugins/services/containers/local.go similarity index 99% rename from services/containers/local.go rename to plugins/services/containers/local.go index a254d8496..4961188ee 100644 --- a/services/containers/local.go +++ b/plugins/services/containers/local.go @@ -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" diff --git a/services/containers/service.go b/plugins/services/containers/service.go similarity index 98% rename from services/containers/service.go rename to plugins/services/containers/service.go index d78017968..81b636217 100644 --- a/services/containers/service.go +++ b/plugins/services/containers/service.go @@ -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" diff --git a/services/content/contentserver/contentserver.go b/plugins/services/content/contentserver/contentserver.go similarity index 100% rename from services/content/contentserver/contentserver.go rename to plugins/services/content/contentserver/contentserver.go diff --git a/services/content/service.go b/plugins/services/content/service.go similarity index 89% rename from services/content/service.go rename to plugins/services/content/service.go index 0ad90233d..9cdf1bdfa 100644 --- a/services/content/service.go +++ b/plugins/services/content/service.go @@ -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" ) diff --git a/services/content/store.go b/plugins/services/content/store.go similarity index 97% rename from services/content/store.go rename to plugins/services/content/store.go index bca229d73..ea9368cc4 100644 --- a/services/content/store.go +++ b/plugins/services/content/store.go @@ -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" diff --git a/services/diff/local.go b/plugins/services/diff/local.go similarity index 98% rename from services/diff/local.go rename to plugins/services/diff/local.go index e53ec7b61..2b9b95987 100644 --- a/services/diff/local.go +++ b/plugins/services/diff/local.go @@ -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" diff --git a/services/diff/service.go b/plugins/services/diff/service.go similarity index 96% rename from services/diff/service.go rename to plugins/services/diff/service.go index 9144aebfa..fd829fc83 100644 --- a/services/diff/service.go +++ b/plugins/services/diff/service.go @@ -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" diff --git a/services/diff/service_unix.go b/plugins/services/diff/service_unix.go similarity index 100% rename from services/diff/service_unix.go rename to plugins/services/diff/service_unix.go diff --git a/services/diff/service_windows.go b/plugins/services/diff/service_windows.go similarity index 100% rename from services/diff/service_windows.go rename to plugins/services/diff/service_windows.go diff --git a/services/events/service.go b/plugins/services/events/service.go similarity index 100% rename from services/events/service.go rename to plugins/services/events/service.go diff --git a/services/events/ttrpc.go b/plugins/services/events/ttrpc.go similarity index 100% rename from services/events/ttrpc.go rename to plugins/services/events/ttrpc.go diff --git a/services/healthcheck/service.go b/plugins/services/healthcheck/service.go similarity index 100% rename from services/healthcheck/service.go rename to plugins/services/healthcheck/service.go diff --git a/services/images/helpers.go b/plugins/services/images/helpers.go similarity index 100% rename from services/images/helpers.go rename to plugins/services/images/helpers.go diff --git a/services/images/local.go b/plugins/services/images/local.go similarity index 98% rename from services/images/local.go rename to plugins/services/images/local.go index f31dcd8bf..76e558111 100644 --- a/services/images/local.go +++ b/plugins/services/images/local.go @@ -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" ) diff --git a/services/images/service.go b/plugins/services/images/service.go similarity index 97% rename from services/images/service.go rename to plugins/services/images/service.go index 3b09201b4..b00e6b3ae 100644 --- a/services/images/service.go +++ b/plugins/services/images/service.go @@ -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" diff --git a/services/introspection/introspection.go b/plugins/services/introspection/introspection.go similarity index 100% rename from services/introspection/introspection.go rename to plugins/services/introspection/introspection.go diff --git a/services/introspection/local.go b/plugins/services/introspection/local.go similarity index 98% rename from services/introspection/local.go rename to plugins/services/introspection/local.go index e1405ad8d..c5ae95dab 100644 --- a/services/introspection/local.go +++ b/plugins/services/introspection/local.go @@ -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" ) diff --git a/services/introspection/pidns_linux.go b/plugins/services/introspection/pidns_linux.go similarity index 100% rename from services/introspection/pidns_linux.go rename to plugins/services/introspection/pidns_linux.go diff --git a/services/introspection/pidns_others.go b/plugins/services/introspection/pidns_others.go similarity index 100% rename from services/introspection/pidns_others.go rename to plugins/services/introspection/pidns_others.go diff --git a/services/introspection/service.go b/plugins/services/introspection/service.go similarity index 97% rename from services/introspection/service.go rename to plugins/services/introspection/service.go index 6c791913a..18db874e9 100644 --- a/services/introspection/service.go +++ b/plugins/services/introspection/service.go @@ -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" diff --git a/services/leases/service.go b/plugins/services/leases/service.go similarity index 100% rename from services/leases/service.go rename to plugins/services/leases/service.go diff --git a/services/namespaces/local.go b/plugins/services/namespaces/local.go similarity index 99% rename from services/namespaces/local.go rename to plugins/services/namespaces/local.go index 48d6e8444..9fb700757 100644 --- a/services/namespaces/local.go +++ b/plugins/services/namespaces/local.go @@ -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" diff --git a/services/namespaces/service.go b/plugins/services/namespaces/service.go similarity index 97% rename from services/namespaces/service.go rename to plugins/services/namespaces/service.go index 123a18d83..856d60e55 100644 --- a/services/namespaces/service.go +++ b/plugins/services/namespaces/service.go @@ -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" diff --git a/services/opt/path_unix.go b/plugins/services/opt/path_unix.go similarity index 100% rename from services/opt/path_unix.go rename to plugins/services/opt/path_unix.go diff --git a/services/opt/path_windows.go b/plugins/services/opt/path_windows.go similarity index 100% rename from services/opt/path_windows.go rename to plugins/services/opt/path_windows.go diff --git a/services/opt/service.go b/plugins/services/opt/service.go similarity index 100% rename from services/opt/service.go rename to plugins/services/opt/service.go diff --git a/services/sandbox/controller_service.go b/plugins/services/sandbox/controller_service.go similarity index 100% rename from services/sandbox/controller_service.go rename to plugins/services/sandbox/controller_service.go diff --git a/services/sandbox/store_service.go b/plugins/services/sandbox/store_service.go similarity index 100% rename from services/sandbox/store_service.go rename to plugins/services/sandbox/store_service.go diff --git a/services/services.go b/plugins/services/services.go similarity index 100% rename from services/services.go rename to plugins/services/services.go diff --git a/services/snapshots/service.go b/plugins/services/snapshots/service.go similarity index 99% rename from services/snapshots/service.go rename to plugins/services/snapshots/service.go index 8323b4237..8e5de34d5 100644 --- a/services/snapshots/service.go +++ b/plugins/services/snapshots/service.go @@ -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" diff --git a/services/snapshots/snapshotters.go b/plugins/services/snapshots/snapshotters.go similarity index 95% rename from services/snapshots/snapshotters.go rename to plugins/services/snapshots/snapshotters.go index 6364b580b..73bc5890f 100644 --- a/services/snapshots/snapshotters.go +++ b/plugins/services/snapshots/snapshotters.go @@ -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" ) diff --git a/services/streaming/service.go b/plugins/services/streaming/service.go similarity index 100% rename from services/streaming/service.go rename to plugins/services/streaming/service.go diff --git a/services/tasks/local.go b/plugins/services/tasks/local.go similarity index 99% rename from services/tasks/local.go rename to plugins/services/tasks/local.go index c61152304..fc886f4d6 100644 --- a/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -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" diff --git a/services/tasks/local_darwin.go b/plugins/services/tasks/local_darwin.go similarity index 100% rename from services/tasks/local_darwin.go rename to plugins/services/tasks/local_darwin.go diff --git a/services/tasks/local_freebsd.go b/plugins/services/tasks/local_freebsd.go similarity index 100% rename from services/tasks/local_freebsd.go rename to plugins/services/tasks/local_freebsd.go diff --git a/services/tasks/local_unix.go b/plugins/services/tasks/local_unix.go similarity index 100% rename from services/tasks/local_unix.go rename to plugins/services/tasks/local_unix.go diff --git a/services/tasks/local_windows.go b/plugins/services/tasks/local_windows.go similarity index 100% rename from services/tasks/local_windows.go rename to plugins/services/tasks/local_windows.go diff --git a/services/tasks/service.go b/plugins/services/tasks/service.go similarity index 98% rename from services/tasks/service.go rename to plugins/services/tasks/service.go index a601d0662..84ad12a92 100644 --- a/services/tasks/service.go +++ b/plugins/services/tasks/service.go @@ -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" diff --git a/services/transfer/service.go b/plugins/services/transfer/service.go similarity index 100% rename from services/transfer/service.go rename to plugins/services/transfer/service.go diff --git a/services/version/service.go b/plugins/services/version/service.go similarity index 100% rename from services/version/service.go rename to plugins/services/version/service.go diff --git a/services/warning/service.go b/plugins/services/warning/service.go similarity index 100% rename from services/warning/service.go rename to plugins/services/warning/service.go