diff --git a/client/client.go b/client/client.go index 44a71f8c5..dc0c783e4 100644 --- a/client/client.go +++ b/client/client.go @@ -47,6 +47,8 @@ import ( leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy" "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/core/remotes/docker" + "github.com/containerd/containerd/v2/core/sandbox" + sandboxproxy "github.com/containerd/containerd/v2/core/sandbox/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" @@ -55,8 +57,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/sandbox" - sandboxproxy "github.com/containerd/containerd/v2/sandbox/proxy" "github.com/containerd/containerd/v2/services/introspection" "github.com/containerd/containerd/v2/snapshots" snproxy "github.com/containerd/containerd/v2/snapshots/proxy" diff --git a/client/sandbox.go b/client/sandbox.go index b78c0a4f8..0cad5d42f 100644 --- a/client/sandbox.go +++ b/client/sandbox.go @@ -23,10 +23,10 @@ import ( "time" "github.com/containerd/containerd/v2/core/containers" + api "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/protobuf/types" - api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" ) diff --git a/client/services.go b/client/services.go index 6b360b1bd..f3e88b055 100644 --- a/client/services.go +++ b/client/services.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/sandbox" srv "github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/services/introspection" "github.com/containerd/containerd/v2/snapshots" diff --git a/core/metadata/adaptors.go b/core/metadata/adaptors.go index 5e5346e0c..292f29b49 100644 --- a/core/metadata/adaptors.go +++ b/core/metadata/adaptors.go @@ -23,8 +23,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/containerd/v2/snapshots" ) diff --git a/core/metadata/sandbox.go b/core/metadata/sandbox.go index 9d7b84efc..8db1fde00 100644 --- a/core/metadata/sandbox.go +++ b/core/metadata/sandbox.go @@ -24,11 +24,11 @@ import ( "time" "github.com/containerd/containerd/v2/core/metadata/boltutil" + api "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/namespaces" - api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/core/metadata/sandbox_test.go b/core/metadata/sandbox_test.go index d3c517476..e89c49348 100644 --- a/core/metadata/sandbox_test.go +++ b/core/metadata/sandbox_test.go @@ -19,9 +19,9 @@ package metadata import ( "testing" + api "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf/types" - api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" ) diff --git a/sandbox/bridge.go b/core/sandbox/bridge.go similarity index 100% rename from sandbox/bridge.go rename to core/sandbox/bridge.go diff --git a/sandbox/controller.go b/core/sandbox/controller.go similarity index 100% rename from sandbox/controller.go rename to core/sandbox/controller.go diff --git a/sandbox/helpers.go b/core/sandbox/helpers.go similarity index 100% rename from sandbox/helpers.go rename to core/sandbox/helpers.go diff --git a/sandbox/proxy/controller.go b/core/sandbox/proxy/controller.go similarity index 98% rename from sandbox/proxy/controller.go rename to core/sandbox/proxy/controller.go index 4bb08b3a3..a10242c4b 100644 --- a/sandbox/proxy/controller.go +++ b/core/sandbox/proxy/controller.go @@ -22,9 +22,9 @@ import ( api "github.com/containerd/containerd/v2/api/services/sandbox/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/sandbox" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/sandbox/proxy/store.go b/core/sandbox/proxy/store.go similarity index 97% rename from sandbox/proxy/store.go rename to core/sandbox/proxy/store.go index bb2f9aa28..5ce61515d 100644 --- a/sandbox/proxy/store.go +++ b/core/sandbox/proxy/store.go @@ -20,8 +20,8 @@ import ( "context" api "github.com/containerd/containerd/v2/api/services/sandbox/v1" + sb "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" - sb "github.com/containerd/containerd/v2/sandbox" ) // remoteSandboxStore is a low-level containerd client to manage sandbox environments metadata diff --git a/sandbox/store.go b/core/sandbox/store.go similarity index 100% rename from sandbox/store.go rename to core/sandbox/store.go diff --git a/sandbox/store_test.go b/core/sandbox/store_test.go similarity index 100% rename from sandbox/store_test.go rename to core/sandbox/store_test.go diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go index 95772a544..176045715 100644 --- a/pkg/cri/cri.go +++ b/pkg/cri/cri.go @@ -25,6 +25,7 @@ import ( "github.com/containerd/plugin/registry" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/instrument" @@ -34,7 +35,6 @@ import ( nriservice "github.com/containerd/containerd/v2/pkg/nri" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/sandbox" "google.golang.org/grpc" diff --git a/pkg/cri/server/podsandbox/controller.go b/pkg/cri/server/podsandbox/controller.go index 240d6f550..416f0ba28 100644 --- a/pkg/cri/server/podsandbox/controller.go +++ b/pkg/cri/server/podsandbox/controller.go @@ -28,6 +28,7 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" @@ -40,7 +41,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/sandbox" ) func init() { diff --git a/pkg/cri/server/podsandbox/recover.go b/pkg/cri/server/podsandbox/recover.go index 53a6eea21..fd83d2de4 100644 --- a/pkg/cri/server/podsandbox/recover.go +++ b/pkg/cri/server/podsandbox/recover.go @@ -26,12 +26,12 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" + sandbox2 "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/netns" - sandbox2 "github.com/containerd/containerd/v2/sandbox" ) // loadContainerTimeout is the default timeout for loading a container/sandbox. diff --git a/pkg/cri/server/podsandbox/sandbox_run.go b/pkg/cri/server/podsandbox/sandbox_run.go index 559cc771a..f3391ab45 100644 --- a/pkg/cri/server/podsandbox/sandbox_run.go +++ b/pkg/cri/server/podsandbox/sandbox_run.go @@ -31,6 +31,7 @@ import ( containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" @@ -39,7 +40,6 @@ import ( imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/containerd/v2/snapshots" ) diff --git a/pkg/cri/server/podsandbox/sandbox_status.go b/pkg/cri/server/podsandbox/sandbox_status.go index 32184b254..025b5eaed 100644 --- a/pkg/cri/server/podsandbox/sandbox_status.go +++ b/pkg/cri/server/podsandbox/sandbox_status.go @@ -25,10 +25,10 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/server/base" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" - "github.com/containerd/containerd/v2/sandbox" ) func (c *Controller) Status(ctx context.Context, sandboxID string, verbose bool) (sandbox.ControllerStatus, error) { diff --git a/pkg/cri/server/podsandbox/sandbox_stop.go b/pkg/cri/server/podsandbox/sandbox_stop.go index e0e8d9093..b80c64c89 100644 --- a/pkg/cri/server/podsandbox/sandbox_stop.go +++ b/pkg/cri/server/podsandbox/sandbox_stop.go @@ -26,12 +26,12 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/sandbox" ) func (c *Controller) Stop(ctx context.Context, sandboxID string, _ ...sandbox.StopOpt) error { diff --git a/pkg/cri/server/podsandbox/types/podsandbox.go b/pkg/cri/server/podsandbox/types/podsandbox.go index 65f8cba6e..321d845a7 100644 --- a/pkg/cri/server/podsandbox/types/podsandbox.go +++ b/pkg/cri/server/podsandbox/types/podsandbox.go @@ -22,9 +22,9 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/pkg/cri/store" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - "github.com/containerd/containerd/v2/sandbox" ) type PodSandbox struct { diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index 90cb6cb59..2501b7cb6 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -32,6 +32,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" + sb "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/pkg/cri/annotations" "github.com/containerd/containerd/v2/pkg/cri/bandwidth" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" @@ -39,7 +40,6 @@ import ( sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/netns" - sb "github.com/containerd/containerd/v2/sandbox" ) func init() { diff --git a/pkg/cri/server/sandbox_service.go b/pkg/cri/server/sandbox_service.go index 51c0ee1b6..4371bca86 100644 --- a/pkg/cri/server/sandbox_service.go +++ b/pkg/cri/server/sandbox_service.go @@ -22,8 +22,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "github.com/containerd/containerd/v2/sandbox" ) type criSandboxService struct { diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index 32c322cf7..be61e008b 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -31,6 +31,7 @@ import ( "k8s.io/kubelet/pkg/cri/streaming" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/nri" @@ -43,7 +44,6 @@ import ( ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/containerd/v2/pkg/registrar" - "github.com/containerd/containerd/v2/sandbox" ) // defaultNetworkPlugin is used for the default CNI configuration diff --git a/pkg/cri/server/service_test.go b/pkg/cri/server/service_test.go index f7cf56eae..36137c0f0 100644 --- a/pkg/cri/server/service_test.go +++ b/pkg/cri/server/service_test.go @@ -23,6 +23,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/cri/store/label" @@ -31,7 +32,6 @@ import ( ostesting "github.com/containerd/containerd/v2/pkg/os/testing" "github.com/containerd/containerd/v2/pkg/registrar" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/sandbox" ) type fakeSandboxService struct{} diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index b73ad2549..050c792b0 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -24,6 +24,7 @@ import ( runtimeAPI "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events/exchange" @@ -31,7 +32,6 @@ import ( "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime" v2 "github.com/containerd/containerd/v2/runtime/v2" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 8b6dc7aa8..7737aa2e5 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -28,6 +28,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/metadata" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events/exchange" "github.com/containerd/containerd/v2/namespaces" @@ -38,7 +39,6 @@ import ( "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/runtime" shimbinary "github.com/containerd/containerd/v2/runtime/v2/shim" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/services/sandbox/controller_service.go b/services/sandbox/controller_service.go index 84a5367e8..5275ad19b 100644 --- a/services/sandbox/controller_service.go +++ b/services/sandbox/controller_service.go @@ -26,11 +26,11 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/sandbox/v1" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/services/sandbox/store_service.go b/services/sandbox/store_service.go index eaafd0128..b6c1ebe86 100644 --- a/services/sandbox/store_service.go +++ b/services/sandbox/store_service.go @@ -23,9 +23,9 @@ import ( api "github.com/containerd/containerd/v2/api/services/sandbox/v1" "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/services/server/server.go b/services/server/server.go index 5ced19e06..92afdea67 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -53,6 +53,7 @@ import ( csproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/core/diff" diffproxy "github.com/containerd/containerd/v2/core/diff/proxy" + sbproxy "github.com/containerd/containerd/v2/core/sandbox/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/dialer" @@ -60,7 +61,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/content/local" - sbproxy "github.com/containerd/containerd/v2/sandbox/proxy" srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/services/warning" ssproxy "github.com/containerd/containerd/v2/snapshots/proxy"