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

Move namespaces to pkg/namespaces

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

2
client/client.go
View File

@ -52,10 +52,10 @@ import (
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
snproxy "github.com/containerd/containerd/v2/core/snapshots/proxy" snproxy "github.com/containerd/containerd/v2/core/snapshots/proxy"
"github.com/containerd/containerd/v2/defaults" "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/dialer"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/events" "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/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services/introspection" "github.com/containerd/containerd/v2/plugins/services/introspection"

2
client/container_opts.go
View File

@ -26,9 +26,9 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"

2
client/grpc.go
View File

@ -19,7 +19,7 @@ package client
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
client/namespaces.go
View File

@ -21,8 +21,8 @@ import (
"strings" "strings"
api "github.com/containerd/containerd/v2/api/services/namespaces/v1" 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/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
) )

2
client/services.go
View File

@ -31,7 +31,7 @@ import (
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/core/snapshots" "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" "github.com/containerd/containerd/v2/plugins"
srv "github.com/containerd/containerd/v2/plugins/services" srv "github.com/containerd/containerd/v2/plugins/services"
"github.com/containerd/containerd/v2/plugins/services/introspection" "github.com/containerd/containerd/v2/plugins/services/introspection"

2
cmd/containerd-shim-runc-v2/manager/manager_linux.go
View File

@ -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/process"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "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/pkg/schedcore"
"github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/runtime/v2/shim"

2
cmd/containerd-shim-runc-v2/process/io.go
View File

@ -32,7 +32,7 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/fifo" "github.com/containerd/fifo"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"

2
cmd/containerd-shim-runc-v2/process/io_test.go
View File

@ -24,7 +24,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
) )
func TestNewBinaryIO(t *testing.T) { func TestNewBinaryIO(t *testing.T) {

2
cmd/containerd-shim-runc-v2/runc/container.go
View File

@ -33,8 +33,8 @@ import (
"github.com/containerd/containerd/v2/api/runtime/task/v3" "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/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/core/mount" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/log" "github.com/containerd/log"

2
cmd/containerd-shim-runc-v2/runc/platform.go
View File

@ -30,7 +30,7 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "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/containerd/v2/pkg/stdio"
"github.com/containerd/fifo" "github.com/containerd/fifo"
) )

2
cmd/containerd-shim-runc-v2/task/service.go
View File

@ -32,8 +32,8 @@ import (
"github.com/containerd/containerd/v2/api/types/task" "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/process"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oom" "github.com/containerd/containerd/v2/pkg/oom"
oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1"
oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2"

2
cmd/containerd-stress/density.go
View File

@ -30,9 +30,9 @@ import (
"syscall" "syscall"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/containerd-stress/main.go
View File

@ -30,7 +30,7 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/integration/remote" "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/containerd/v2/plugins"
"github.com/containerd/log" "github.com/containerd/log"
metrics "github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"

2
cmd/containerd/command/publish.go
View File

@ -25,9 +25,9 @@ import (
"time" "time"
eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" 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/dialer"
"github.com/containerd/containerd/v2/pkg/errdefs" "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/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
"github.com/urfave/cli" "github.com/urfave/cli"

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

@ -19,7 +19,7 @@ package server
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
cmd/ctr/app/main.go
View File

@ -42,7 +42,7 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks"
versionCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/version" versionCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/version"
"github.com/containerd/containerd/v2/defaults" "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" "github.com/containerd/containerd/v2/version"
) )

2
cmd/ctr/commands/client.go
View File

@ -20,8 +20,8 @@ import (
gocontext "context" gocontext "context"
containerd "github.com/containerd/containerd/v2/client" 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/epoch"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/ctr/commands/cni.go
View File

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
containerd "github.com/containerd/containerd/v2/client" 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" "github.com/containerd/typeurl/v2"
) )

2
cmd/ctr/commands/namespaces/namespaces_linux.go
View File

@ -17,7 +17,7 @@
package namespaces package namespaces
import ( import (
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/runtime/opts" "github.com/containerd/containerd/v2/runtime/opts"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/ctr/commands/namespaces/namespaces_other.go
View File

@ -19,7 +19,7 @@
package namespaces package namespaces
import ( import (
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/ctr/commands/shim/shim.go
View File

@ -30,7 +30,7 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "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" ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/log" "github.com/containerd/log"

2
contrib/fuzz/containerd_import_fuzzer.go
View File

@ -22,7 +22,7 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers" fuzz "github.com/AdaLogics/go-fuzz-headers"
containerd "github.com/containerd/containerd/v2/client" 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) { func fuzzContext() (context.Context, context.CancelFunc) {

2
contrib/fuzz/exchange_fuzzer.go
View File

@ -20,9 +20,9 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers" fuzz "github.com/AdaLogics/go-fuzz-headers"
eventstypes "github.com/containerd/containerd/v2/api/events" 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"
"github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/events/exchange"
"github.com/containerd/containerd/v2/pkg/namespaces"
) )
func FuzzExchange(data []byte) int { func FuzzExchange(data []byte) int {

2
contrib/fuzz/metadata_fuzzer.go
View File

@ -32,7 +32,7 @@ import (
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/snapshots" "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/content/local"
"github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/plugins/snapshots/native"
) )

2
core/metadata/containers.go
View File

@ -25,11 +25,11 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/metadata/boltutil" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/identifiers"
"github.com/containerd/containerd/v2/pkg/labels" "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/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

2
core/metadata/containers_test.go
View File

@ -26,9 +26,9 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/containers" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters" "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"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"

2
core/metadata/content.go
View File

@ -27,10 +27,10 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/metadata/boltutil" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/log" "github.com/containerd/log"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
core/metadata/content_test.go
View File

@ -28,9 +28,9 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/core/content/testsuite"
"github.com/containerd/containerd/v2/core/leases" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
core/metadata/db.go
View File

@ -29,10 +29,10 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/snapshots" "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/cleanup"
"github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/containerd/v2/pkg/gc"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/log" "github.com/containerd/log"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

2
core/metadata/db_test.go
View File

@ -34,9 +34,9 @@ import (
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/snapshots" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/gc" "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/content/local"
"github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/plugins/snapshots/native"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"

2
core/metadata/images.go
View File

@ -27,11 +27,11 @@ import (
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/metadata/boltutil" "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/epoch"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/pkg/namespaces"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"

2
core/metadata/leases.go
View File

@ -26,9 +26,9 @@ import (
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/metadata/boltutil" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/namespaces"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

2
core/metadata/namespaces.go
View File

@ -21,10 +21,10 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/identifiers"
l "github.com/containerd/containerd/v2/pkg/labels" l "github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/pkg/namespaces"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

2
core/metadata/namespaces_test.go
View File

@ -21,7 +21,7 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/core/containers" "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/containerd/containerd/v2/protobuf/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
core/metadata/sandbox.go
View File

@ -25,10 +25,10 @@ import (
"github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/metadata/boltutil"
api "github.com/containerd/containerd/v2/core/sandbox" 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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/identifiers"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"go.etcd.io/bbolt" "go.etcd.io/bbolt"
) )

2
core/metadata/snapshot.go
View File

@ -28,10 +28,10 @@ import (
"github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/metadata/boltutil"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/log" "github.com/containerd/log"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

2
core/metadata/snapshot_test.go
View File

@ -30,9 +30,9 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/filters" "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/pkg/testutil"
"github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/plugins/snapshots/native"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"

2
core/snapshots/testsuite/testsuite.go
View File

@ -30,8 +30,8 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/randutil"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/continuity/fs/fstest" "github.com/containerd/continuity/fs/fstest"

2
integration/client/client.go
View File

@ -24,7 +24,7 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"
) )

2
integration/client/client_test.go
View File

@ -37,8 +37,8 @@ import (
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
imagelist "github.com/containerd/containerd/v2/integration/images" 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/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log" "github.com/containerd/log"

2
integration/client/client_ttrpc_test.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" 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/pkg/ttrpcutil"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"

2
integration/client/container_test.go
View File

@ -35,10 +35,10 @@ import (
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/errdefs" "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/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
gogotypes "github.com/containerd/containerd/v2/protobuf/types" gogotypes "github.com/containerd/containerd/v2/protobuf/types"

2
integration/client/content_test.go
View File

@ -25,8 +25,8 @@ import (
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/content/testsuite" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
) )
func newContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) { func newContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) {

2
integration/client/export_test.go
View File

@ -29,8 +29,8 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/images/archive" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/google/uuid" "github.com/google/uuid"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
integration/client/import_test.go
View File

@ -37,10 +37,10 @@ import (
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/core/images/archive"
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/containerd/v2/pkg/archive/tartest" "github.com/containerd/containerd/v2/pkg/archive/tartest"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"
tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive"
"github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/containerd/containerd/v2/pkg/transfer/image"

2
integration/containerd_image_test.go
View File

@ -27,9 +27,9 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/integration/images" "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/cri/labels"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"

2
integration/image_pull_timeout_test.go
View File

@ -42,10 +42,10 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/namespaces"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
criserver "github.com/containerd/containerd/v2/pkg/cri/server" criserver "github.com/containerd/containerd/v2/pkg/cri/server"
"github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/pkg/cri/server/images"
"github.com/containerd/containerd/v2/pkg/namespaces"
) )
var ( var (

2
integration/issue7496_linux_test.go
View File

@ -31,7 +31,7 @@ import (
apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" apitask "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/integration/images" "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/containerd/v2/runtime/v2/shim"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
integration/issue7496_shutdown_linux_test.go
View File

@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" 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. // TestIssue7496_ShouldRetryShutdown is based on https://github.com/containerd/containerd/issues/7496.

2
metrics/cgroups/v1/cgroups.go
View File

@ -23,9 +23,9 @@ import (
cgroups "github.com/containerd/cgroups/v3/cgroup1" cgroups "github.com/containerd/cgroups/v3/cgroup1"
eventstypes "github.com/containerd/containerd/v2/api/events" 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/errdefs"
"github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/runtime" "github.com/containerd/containerd/v2/runtime"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/docker/go-metrics" "github.com/docker/go-metrics"

2
metrics/cgroups/v1/metrics.go
View File

@ -27,7 +27,7 @@ import (
cmetrics "github.com/containerd/containerd/v2/metrics" cmetrics "github.com/containerd/containerd/v2/metrics"
"github.com/containerd/containerd/v2/metrics/cgroups/common" "github.com/containerd/containerd/v2/metrics/cgroups/common"
v1 "github.com/containerd/containerd/v2/metrics/types/v1" 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/containerd/v2/pkg/timeout"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

2
metrics/cgroups/v2/metrics.go
View File

@ -26,7 +26,7 @@ import (
cmetrics "github.com/containerd/containerd/v2/metrics" cmetrics "github.com/containerd/containerd/v2/metrics"
"github.com/containerd/containerd/v2/metrics/cgroups/common" "github.com/containerd/containerd/v2/metrics/cgroups/common"
v2 "github.com/containerd/containerd/v2/metrics/types/v2" 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/containerd/v2/pkg/timeout"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

2
oci/spec.go
View File

@ -29,7 +29,7 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/containers" "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" "github.com/containerd/containerd/v2/platforms"
) )

2
oci/spec_opts.go
View File

@ -33,7 +33,7 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/mount" "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/containerd/v2/platforms"
"github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs"
"github.com/containerd/log" "github.com/containerd/log"

2
oci/spec_opts_nonwindows_test.go
View File

@ -22,7 +22,7 @@ import (
"context" "context"
"testing" "testing"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
) )

2
oci/spec_opts_test.go
View File

@ -38,8 +38,8 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
) )
type blob []byte type blob []byte

2
oci/spec_opts_unix_test.go
View File

@ -23,7 +23,7 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/core/containers" "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" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
) )

2
oci/spec_opts_windows_test.go
View File

@ -22,7 +22,7 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/core/containers" "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" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"

2
oci/spec_test.go
View File

@ -24,7 +24,7 @@ import (
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/containerd/containerd/v2/core/containers" "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" "github.com/containerd/containerd/v2/pkg/testutil"
) )

2
pkg/cri/opts/spec_windows_test.go
View File

@ -28,8 +28,8 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/namespaces"
osinterface "github.com/containerd/containerd/v2/pkg/os" osinterface "github.com/containerd/containerd/v2/pkg/os"
) )

2
pkg/cri/util/util.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"time" "time"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/constants"
) )

2
pkg/events/exchange/exchange.go
View File

@ -22,11 +22,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/identifiers"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
goevents "github.com/docker/go-events" goevents "github.com/docker/go-events"

2
pkg/events/exchange/exchange_test.go
View File

@ -23,9 +23,9 @@ import (
"time" "time"
eventstypes "github.com/containerd/containerd/v2/api/events" 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/errdefs"
"github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"

0
namespaces/context.go → pkg/namespaces/context.go
View File

0
namespaces/context_test.go → pkg/namespaces/context_test.go
View File

0
namespaces/grpc.go → pkg/namespaces/grpc.go
View File

0
namespaces/store.go → pkg/namespaces/store.go
View File

0
namespaces/ttrpc.go → pkg/namespaces/ttrpc.go
View File

0
namespaces/ttrpc_test.go → pkg/namespaces/ttrpc_test.go
View File

2
pkg/nri/domain.go
View File

@ -21,8 +21,8 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/log" "github.com/containerd/log"
nri "github.com/containerd/nri/pkg/adaptation" nri "github.com/containerd/nri/pkg/adaptation"
) )

2
plugins/restart/monitor.go
View File

@ -24,7 +24,7 @@ import (
"time" "time"
containerd "github.com/containerd/containerd/v2/client" 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/plugins"
"github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/containerd/v2/runtime/restart"
"github.com/containerd/log" "github.com/containerd/log"

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

@ -23,9 +23,9 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
api "github.com/containerd/containerd/v2/api/services/namespaces/v1" api "github.com/containerd/containerd/v2/api/services/namespaces/v1"
"github.com/containerd/containerd/v2/core/metadata" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/events" "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"
"github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"

2
plugins/snapshots/devmapper/snapshotter_test.go
View File

@ -32,7 +32,7 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/core/snapshots/testsuite" "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/pkg/testutil"
"github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup"
"github.com/containerd/log" "github.com/containerd/log"

2
plugins/streaming/manager.go
View File

@ -23,9 +23,9 @@ import (
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/metadata" "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/errdefs"
"github.com/containerd/containerd/v2/pkg/gc" "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/pkg/streaming"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin" "github.com/containerd/plugin"

2
runtime/nsmap.go
View File

@ -21,8 +21,8 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
) )
type object interface { type object interface {

2
runtime/opts/opts_linux.go
View File

@ -22,7 +22,7 @@ import (
"github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3"
cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroup1 "github.com/containerd/cgroups/v3/cgroup1"
cgroup2 "github.com/containerd/cgroups/v3/cgroup2" 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 // WithNamespaceCgroupDeletion removes the cgroup directory that was created for the namespace

2
runtime/v2/binary.go
View File

@ -26,7 +26,7 @@ import (
gruntime "runtime" gruntime "runtime"
"github.com/containerd/containerd/v2/api/runtime/task/v2" "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"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"

2
runtime/v2/bundle.go
View File

@ -24,9 +24,9 @@ import (
"runtime" "runtime"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/identifiers"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )

2
runtime/v2/bundle_linux_test.go
View File

@ -26,8 +26,8 @@ import (
"syscall" "syscall"
"testing" "testing"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"

2
runtime/v2/manager.go
View File

@ -29,10 +29,10 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/sandbox" "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/cleanup"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/events/exchange" "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/pkg/timeout"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"

2
runtime/v2/shim/publisher.go
View File

@ -22,8 +22,8 @@ import (
"time" "time"
v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" 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/events"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/pkg/ttrpcutil"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/log" "github.com/containerd/log"

2
runtime/v2/shim/shim.go
View File

@ -31,8 +31,8 @@ import (
"time" "time"
shimapi "github.com/containerd/containerd/v2/api/runtime/task/v3" 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/events"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"

2
runtime/v2/shim/util.go
View File

@ -32,9 +32,9 @@ import (
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/atomicfile" "github.com/containerd/containerd/v2/pkg/atomicfile"
"github.com/containerd/containerd/v2/pkg/errdefs" "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/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
) )

2
runtime/v2/shim/util_unix.go
View File

@ -31,7 +31,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/defaults" "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" "github.com/containerd/containerd/v2/sys"
) )

2
runtime/v2/shim_load.go
View File

@ -23,9 +23,9 @@ import (
"path/filepath" "path/filepath"
"github.com/containerd/containerd/v2/core/mount" "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/cleanup"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/log" "github.com/containerd/log"
) )

2
runtime/v2/shim_windows.go
View File

@ -26,7 +26,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
) )
type deferredPipeConnection struct { type deferredPipeConnection struct {