diff --git a/client/client.go b/client/client.go index de022ae2d..a88a5f97a 100644 --- a/client/client.go +++ b/client/client.go @@ -52,10 +52,10 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" snproxy "github.com/containerd/containerd/v2/core/snapshots/proxy" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/introspection" diff --git a/client/container_opts.go b/client/container_opts.go index f5a3a8e32..36bf6564d 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/opencontainers/image-spec/identity" diff --git a/client/grpc.go b/client/grpc.go index ab4179ede..99325094a 100644 --- a/client/grpc.go +++ b/client/grpc.go @@ -19,7 +19,7 @@ package client import ( "context" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "google.golang.org/grpc" ) diff --git a/client/namespaces.go b/client/namespaces.go index 9aaf9b6aa..31bf9068b 100644 --- a/client/namespaces.go +++ b/client/namespaces.go @@ -21,8 +21,8 @@ import ( "strings" api "github.com/containerd/containerd/v2/api/services/namespaces/v1" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/client/services.go b/client/services.go index 4fee9e39d..d5e8361ce 100644 --- a/client/services.go +++ b/client/services.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" srv "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services/introspection" diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index 8b87c8ba5..deb8c47d5 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/schedcore" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/shim" diff --git a/cmd/containerd-shim-runc-v2/process/io.go b/cmd/containerd-shim-runc-v2/process/io.go index 3aae5b0ad..466b506b1 100644 --- a/cmd/containerd-shim-runc-v2/process/io.go +++ b/cmd/containerd-shim-runc-v2/process/io.go @@ -32,7 +32,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" diff --git a/cmd/containerd-shim-runc-v2/process/io_test.go b/cmd/containerd-shim-runc-v2/process/io_test.go index 9ea1bb6e5..30dabce26 100644 --- a/cmd/containerd-shim-runc-v2/process/io_test.go +++ b/cmd/containerd-shim-runc-v2/process/io_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) func TestNewBinaryIO(t *testing.T) { diff --git a/cmd/containerd-shim-runc-v2/runc/container.go b/cmd/containerd-shim-runc-v2/runc/container.go index 6067f3142..275ebb448 100644 --- a/cmd/containerd-shim-runc-v2/runc/container.go +++ b/cmd/containerd-shim-runc-v2/runc/container.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" diff --git a/cmd/containerd-shim-runc-v2/runc/platform.go b/cmd/containerd-shim-runc-v2/runc/platform.go index 8b0a75891..68b00ab67 100644 --- a/cmd/containerd-shim-runc-v2/runc/platform.go +++ b/cmd/containerd-shim-runc-v2/runc/platform.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/fifo" ) diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index 2b52ec369..fadaaf236 100644 --- a/cmd/containerd-shim-runc-v2/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oom" oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" diff --git a/cmd/containerd-stress/density.go b/cmd/containerd-stress/density.go index acd172e28..9ecdda9c4 100644 --- a/cmd/containerd-stress/density.go +++ b/cmd/containerd-stress/density.go @@ -30,9 +30,9 @@ import ( "syscall" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/containerd-stress/main.go b/cmd/containerd-stress/main.go index df5c06b78..98ba07590 100644 --- a/cmd/containerd-stress/main.go +++ b/cmd/containerd-stress/main.go @@ -30,7 +30,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/integration/remote" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" metrics "github.com/docker/go-metrics" diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go index f82ba83b2..820618956 100644 --- a/cmd/containerd/command/publish.go +++ b/cmd/containerd/command/publish.go @@ -25,9 +25,9 @@ import ( "time" eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" "github.com/urfave/cli" diff --git a/cmd/containerd/server/namespace.go b/cmd/containerd/server/namespace.go index 46cda4b2d..82870b2d2 100644 --- a/cmd/containerd/server/namespace.go +++ b/cmd/containerd/server/namespace.go @@ -19,7 +19,7 @@ package server import ( "context" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "google.golang.org/grpc" ) diff --git a/cmd/ctr/app/main.go b/cmd/ctr/app/main.go index 9e4af514e..115aa3c5c 100644 --- a/cmd/ctr/app/main.go +++ b/cmd/ctr/app/main.go @@ -42,7 +42,7 @@ import ( "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/pkg/namespaces" "github.com/containerd/containerd/v2/version" ) diff --git a/cmd/ctr/commands/client.go b/cmd/ctr/commands/client.go index 0caa9a77b..b78efab0e 100644 --- a/cmd/ctr/commands/client.go +++ b/cmd/ctr/commands/client.go @@ -20,8 +20,8 @@ import ( gocontext "context" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/cni.go b/cmd/ctr/commands/cni.go index 053ae268e..43d2cb5ab 100644 --- a/cmd/ctr/commands/cni.go +++ b/cmd/ctr/commands/cni.go @@ -21,7 +21,7 @@ import ( "fmt" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/typeurl/v2" ) diff --git a/cmd/ctr/commands/namespaces/namespaces_linux.go b/cmd/ctr/commands/namespaces/namespaces_linux.go index e40d893b4..b3223a040 100644 --- a/cmd/ctr/commands/namespaces/namespaces_linux.go +++ b/cmd/ctr/commands/namespaces/namespaces_linux.go @@ -17,7 +17,7 @@ package namespaces import ( - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/runtime/opts" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/namespaces/namespaces_other.go b/cmd/ctr/commands/namespaces/namespaces_other.go index 0f82e1204..6a46367d0 100644 --- a/cmd/ctr/commands/namespaces/namespaces_other.go +++ b/cmd/ctr/commands/namespaces/namespaces_other.go @@ -19,7 +19,7 @@ package namespaces import ( - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index af9ac27ef..e4c1be7d7 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" diff --git a/contrib/fuzz/containerd_import_fuzzer.go b/contrib/fuzz/containerd_import_fuzzer.go index c39d6601a..33edbefbb 100644 --- a/contrib/fuzz/containerd_import_fuzzer.go +++ b/contrib/fuzz/containerd_import_fuzzer.go @@ -22,7 +22,7 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) func fuzzContext() (context.Context, context.CancelFunc) { diff --git a/contrib/fuzz/exchange_fuzzer.go b/contrib/fuzz/exchange_fuzzer.go index b3dcc6e02..4348d1ba2 100644 --- a/contrib/fuzz/exchange_fuzzer.go +++ b/contrib/fuzz/exchange_fuzzer.go @@ -20,9 +20,9 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events/exchange" + "github.com/containerd/containerd/v2/pkg/namespaces" ) func FuzzExchange(data []byte) int { diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index ffd5a722b..4fa8a3d96 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/snapshots/native" ) diff --git a/core/metadata/containers.go b/core/metadata/containers.go index 6e0d6f331..4aebf18f5 100644 --- a/core/metadata/containers.go +++ b/core/metadata/containers.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" diff --git a/core/metadata/containers_test.go b/core/metadata/containers_test.go index 30b6d7b76..4ca974630 100644 --- a/core/metadata/containers_test.go +++ b/core/metadata/containers_test.go @@ -26,9 +26,9 @@ import ( "time" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log/logtest" diff --git a/core/metadata/content.go b/core/metadata/content.go index 4fe22712c..68b88fc55 100644 --- a/core/metadata/content.go +++ b/core/metadata/content.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/content_test.go b/core/metadata/content_test.go index fd334871c..f9b3df14a 100644 --- a/core/metadata/content_test.go +++ b/core/metadata/content_test.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/db.go b/core/metadata/db.go index 9181bb2bd..ea748f9a9 100644 --- a/core/metadata/db.go +++ b/core/metadata/db.go @@ -29,10 +29,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/gc" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/db_test.go b/core/metadata/db_test.go index 500378283..cf66619ee 100644 --- a/core/metadata/db_test.go +++ b/core/metadata/db_test.go @@ -34,9 +34,9 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/gc" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/core/metadata/images.go b/core/metadata/images.go index 69951e552..7b34cfad3 100644 --- a/core/metadata/images.go +++ b/core/metadata/images.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/core/metadata/leases.go b/core/metadata/leases.go index f8e8cd1a1..d20b5f309 100644 --- a/core/metadata/leases.go +++ b/core/metadata/leases.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/namespaces" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/namespaces.go b/core/metadata/namespaces.go index 0b9ee8df8..5b67f09b4 100644 --- a/core/metadata/namespaces.go +++ b/core/metadata/namespaces.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/identifiers" l "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/namespaces_test.go b/core/metadata/namespaces_test.go index 130c7488f..72bc4e9e4 100644 --- a/core/metadata/namespaces_test.go +++ b/core/metadata/namespaces_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/metadata/sandbox.go b/core/metadata/sandbox.go index a62ce26f2..53b516396 100644 --- a/core/metadata/sandbox.go +++ b/core/metadata/sandbox.go @@ -25,10 +25,10 @@ import ( "github.com/containerd/containerd/v2/core/metadata/boltutil" api "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/identifiers" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot.go b/core/metadata/snapshot.go index 9f4b93071..b264b84b7 100644 --- a/core/metadata/snapshot.go +++ b/core/metadata/snapshot.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index 1adc7cf9f..ce99a7baa 100644 --- a/core/metadata/snapshot_test.go +++ b/core/metadata/snapshot_test.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/testsuite" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/native" bolt "go.etcd.io/bbolt" diff --git a/core/snapshots/testsuite/testsuite.go b/core/snapshots/testsuite/testsuite.go index 52698dde5..8f49d3588 100644 --- a/core/snapshots/testsuite/testsuite.go +++ b/core/snapshots/testsuite/testsuite.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs/fstest" diff --git a/integration/client/client.go b/integration/client/client.go index d62488379..787edb710 100644 --- a/integration/client/client.go +++ b/integration/client/client.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log/logtest" ) diff --git a/integration/client/client_test.go b/integration/client/client_test.go index e5c2d748b..8fcec91a2 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -37,8 +37,8 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" imagelist "github.com/containerd/containerd/v2/integration/images" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/integration/client/client_ttrpc_test.go b/integration/client/client_ttrpc_test.go index 03ba8b46a..7d327645d 100644 --- a/integration/client/client_ttrpc_test.go +++ b/integration/client/client_ttrpc_test.go @@ -22,7 +22,7 @@ import ( "time" v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 5ddd0d9a0..8a14776cf 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -35,10 +35,10 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" gogotypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/integration/client/content_test.go b/integration/client/content_test.go index d192d844c..38ce387c8 100644 --- a/integration/client/content_test.go +++ b/integration/client/content_test.go @@ -25,8 +25,8 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" ) func newContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) { diff --git a/integration/client/export_test.go b/integration/client/export_test.go index 940314028..c1c9e3346 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/google/uuid" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index 84fcab9e2..f33c0bb3d 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -37,10 +37,10 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/archive/tartest" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go index 84080b06f..a80fca1fc 100644 --- a/integration/containerd_image_test.go +++ b/integration/containerd_image_test.go @@ -27,9 +27,9 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/integration/images" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index df8fe474a..3492fb26e 100644 --- a/integration/image_pull_timeout_test.go +++ b/integration/image_pull_timeout_test.go @@ -42,10 +42,10 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/namespaces" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criserver "github.com/containerd/containerd/v2/pkg/cri/server" "github.com/containerd/containerd/v2/pkg/cri/server/images" + "github.com/containerd/containerd/v2/pkg/namespaces" ) var ( diff --git a/integration/issue7496_linux_test.go b/integration/issue7496_linux_test.go index 8d4cd3dad..9b36aad41 100644 --- a/integration/issue7496_linux_test.go +++ b/integration/issue7496_linux_test.go @@ -31,7 +31,7 @@ import ( apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/integration/images" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/ttrpc" "github.com/stretchr/testify/assert" diff --git a/integration/issue7496_shutdown_linux_test.go b/integration/issue7496_shutdown_linux_test.go index 7af2327d5..6106a48cb 100644 --- a/integration/issue7496_shutdown_linux_test.go +++ b/integration/issue7496_shutdown_linux_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) // TestIssue7496_ShouldRetryShutdown is based on https://github.com/containerd/containerd/issues/7496. diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go index aac42c0c6..9d9b96ecc 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -23,9 +23,9 @@ import ( cgroups "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/runtime" "github.com/containerd/log" "github.com/docker/go-metrics" diff --git a/metrics/cgroups/v1/metrics.go b/metrics/cgroups/v1/metrics.go index 423d6af98..3e9956514 100644 --- a/metrics/cgroups/v1/metrics.go +++ b/metrics/cgroups/v1/metrics.go @@ -27,7 +27,7 @@ import ( cmetrics "github.com/containerd/containerd/v2/metrics" "github.com/containerd/containerd/v2/metrics/cgroups/common" v1 "github.com/containerd/containerd/v2/metrics/types/v1" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/metrics/cgroups/v2/metrics.go b/metrics/cgroups/v2/metrics.go index bfd1b0443..e02f17b79 100644 --- a/metrics/cgroups/v2/metrics.go +++ b/metrics/cgroups/v2/metrics.go @@ -26,7 +26,7 @@ import ( cmetrics "github.com/containerd/containerd/v2/metrics" "github.com/containerd/containerd/v2/metrics/cgroups/common" v2 "github.com/containerd/containerd/v2/metrics/types/v2" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/oci/spec.go b/oci/spec.go index ab9e7897d..a09b57c91 100644 --- a/oci/spec.go +++ b/oci/spec.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/platforms" ) diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 26e6913a6..2cbb48f6d 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -33,7 +33,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/continuity/fs" "github.com/containerd/log" diff --git a/oci/spec_opts_nonwindows_test.go b/oci/spec_opts_nonwindows_test.go index cf5620c49..f14298a1c 100644 --- a/oci/spec_opts_nonwindows_test.go +++ b/oci/spec_opts_nonwindows_test.go @@ -22,7 +22,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go index 4407655af..8033d1ada 100644 --- a/oci/spec_opts_test.go +++ b/oci/spec_opts_test.go @@ -38,8 +38,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" ) type blob []byte diff --git a/oci/spec_opts_unix_test.go b/oci/spec_opts_unix_test.go index 59fcfbeac..289d5feb3 100644 --- a/oci/spec_opts_unix_test.go +++ b/oci/spec_opts_unix_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ocispec "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/oci/spec_opts_windows_test.go b/oci/spec_opts_windows_test.go index cbb501b0d..ad80ca42d 100644 --- a/oci/spec_opts_windows_test.go +++ b/oci/spec_opts_windows_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/oci/spec_test.go b/oci/spec_test.go index f2a2f197b..5e0a48986 100644 --- a/oci/spec_test.go +++ b/oci/spec_test.go @@ -24,7 +24,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" ) diff --git a/pkg/cri/opts/spec_windows_test.go b/pkg/cri/opts/spec_windows_test.go index eec4c512e..4b5e3e8e5 100644 --- a/pkg/cri/opts/spec_windows_test.go +++ b/pkg/cri/opts/spec_windows_test.go @@ -28,8 +28,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/namespaces" osinterface "github.com/containerd/containerd/v2/pkg/os" ) diff --git a/pkg/cri/util/util.go b/pkg/cri/util/util.go index 07647bd8e..0f641b72d 100644 --- a/pkg/cri/util/util.go +++ b/pkg/cri/util/util.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/cri/constants" ) diff --git a/pkg/events/exchange/exchange.go b/pkg/events/exchange/exchange.go index b5f30eb06..269d1e258 100644 --- a/pkg/events/exchange/exchange.go +++ b/pkg/events/exchange/exchange.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/identifiers" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" diff --git a/pkg/events/exchange/exchange_test.go b/pkg/events/exchange/exchange_test.go index 098db9ce1..a6f9ece60 100644 --- a/pkg/events/exchange/exchange_test.go +++ b/pkg/events/exchange/exchange_test.go @@ -23,9 +23,9 @@ import ( "time" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" diff --git a/namespaces/context.go b/pkg/namespaces/context.go similarity index 100% rename from namespaces/context.go rename to pkg/namespaces/context.go diff --git a/namespaces/context_test.go b/pkg/namespaces/context_test.go similarity index 100% rename from namespaces/context_test.go rename to pkg/namespaces/context_test.go diff --git a/namespaces/grpc.go b/pkg/namespaces/grpc.go similarity index 100% rename from namespaces/grpc.go rename to pkg/namespaces/grpc.go diff --git a/namespaces/store.go b/pkg/namespaces/store.go similarity index 100% rename from namespaces/store.go rename to pkg/namespaces/store.go diff --git a/namespaces/ttrpc.go b/pkg/namespaces/ttrpc.go similarity index 100% rename from namespaces/ttrpc.go rename to pkg/namespaces/ttrpc.go diff --git a/namespaces/ttrpc_test.go b/pkg/namespaces/ttrpc_test.go similarity index 100% rename from namespaces/ttrpc_test.go rename to pkg/namespaces/ttrpc_test.go diff --git a/pkg/nri/domain.go b/pkg/nri/domain.go index 011a8bef1..319be05f5 100644 --- a/pkg/nri/domain.go +++ b/pkg/nri/domain.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" nri "github.com/containerd/nri/pkg/adaptation" ) diff --git a/plugins/restart/monitor.go b/plugins/restart/monitor.go index e73311779..057a0a2c1 100644 --- a/plugins/restart/monitor.go +++ b/plugins/restart/monitor.go @@ -24,7 +24,7 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/log" diff --git a/plugins/services/namespaces/local.go b/plugins/services/namespaces/local.go index c458d72f4..4451790e6 100644 --- a/plugins/services/namespaces/local.go +++ b/plugins/services/namespaces/local.go @@ -23,9 +23,9 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/namespaces/v1" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/plugins/snapshots/devmapper/snapshotter_test.go b/plugins/snapshots/devmapper/snapshotter_test.go index f70b45dd4..fba424df2 100644 --- a/plugins/snapshots/devmapper/snapshotter_test.go +++ b/plugins/snapshots/devmapper/snapshotter_test.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/testsuite" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/log" diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index 7a4fce40b..4548c7d75 100644 --- a/plugins/streaming/manager.go +++ b/plugins/streaming/manager.go @@ -23,9 +23,9 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/gc" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" diff --git a/runtime/nsmap.go b/runtime/nsmap.go index e1841342b..d459f34b1 100644 --- a/runtime/nsmap.go +++ b/runtime/nsmap.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" ) type object interface { diff --git a/runtime/opts/opts_linux.go b/runtime/opts/opts_linux.go index 99dd30d57..c1c2cb021 100644 --- a/runtime/opts/opts_linux.go +++ b/runtime/opts/opts_linux.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/cgroups/v3" cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroup2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) // WithNamespaceCgroupDeletion removes the cgroup directory that was created for the namespace diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go index 0888c675d..c1c1fc96e 100644 --- a/runtime/v2/binary.go +++ b/runtime/v2/binary.go @@ -26,7 +26,7 @@ import ( gruntime "runtime" "github.com/containerd/containerd/v2/api/runtime/task/v2" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/runtime/v2/bundle.go b/runtime/v2/bundle.go index b82c10b1c..c031bd3eb 100644 --- a/runtime/v2/bundle.go +++ b/runtime/v2/bundle.go @@ -24,9 +24,9 @@ import ( "runtime" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/identifiers" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/runtime/v2/bundle_linux_test.go b/runtime/v2/bundle_linux_test.go index af3b6538d..f9db732e4 100644 --- a/runtime/v2/bundle_linux_test.go +++ b/runtime/v2/bundle_linux_test.go @@ -26,8 +26,8 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index d1c11f847..d0f45d04b 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -29,10 +29,10 @@ 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/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events/exchange" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/runtime/v2/shim/publisher.go b/runtime/v2/shim/publisher.go index 234627091..3628a2c6b 100644 --- a/runtime/v2/shim/publisher.go +++ b/runtime/v2/shim/publisher.go @@ -22,8 +22,8 @@ import ( "time" v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go index 4d9c7f875..a3075aa7d 100644 --- a/runtime/v2/shim/shim.go +++ b/runtime/v2/shim/shim.go @@ -31,8 +31,8 @@ import ( "time" shimapi "github.com/containerd/containerd/v2/api/runtime/task/v3" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go index 22f4f4e3d..7b8d601a4 100644 --- a/runtime/v2/shim/util.go +++ b/runtime/v2/shim/util.go @@ -32,9 +32,9 @@ import ( "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/atomicfile" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go index a1f722494..ea520f22a 100644 --- a/runtime/v2/shim/util_unix.go +++ b/runtime/v2/shim/util_unix.go @@ -31,7 +31,7 @@ import ( "time" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/sys" ) diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go index 5f0a386b5..3f59a7a2e 100644 --- a/runtime/v2/shim_load.go +++ b/runtime/v2/shim_load.go @@ -23,9 +23,9 @@ import ( "path/filepath" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" ) diff --git a/runtime/v2/shim_windows.go b/runtime/v2/shim_windows.go index 80f31140f..1bca7686f 100644 --- a/runtime/v2/shim_windows.go +++ b/runtime/v2/shim_windows.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) type deferredPipeConnection struct {