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

Move containers to core/containers

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

2
client/client.go
View File

@ -39,7 +39,7 @@ import (
"github.com/containerd/containerd/v2/api/services/tasks/v1"
versionservice "github.com/containerd/containerd/v2/api/services/version/v1"
apitypes "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
contentproxy "github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/defaults"

2
client/container.go
View File

@ -28,7 +28,7 @@ import (
"github.com/containerd/containerd/v2/api/types"
tasktypes "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/oci"

2
client/container_checkpoint_opts.go
View File

@ -24,7 +24,7 @@ import (
"runtime"
tasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/platforms"

2
client/container_opts.go
View File

@ -22,7 +22,7 @@ import (
"errors"
"fmt"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"

2
client/container_opts_unix.go
View File

@ -25,7 +25,7 @@ import (
"path/filepath"
"syscall"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/mount"
"github.com/opencontainers/image-spec/identity"

2
client/container_restore_opts.go
View File

@ -21,7 +21,7 @@ import (
"errors"
"fmt"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/protobuf/proto"

2
client/containerstore.go
View File

@ -22,7 +22,7 @@ import (
"io"
containersapi "github.com/containerd/containerd/v2/api/services/containers/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"

2
client/sandbox.go
View File

@ -22,7 +22,7 @@ import (
"fmt"
"time"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/protobuf/types"

2
client/services.go
View File

@ -25,7 +25,7 @@ import (
introspectionapi "github.com/containerd/containerd/v2/api/services/introspection/v1"
namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1"
"github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases"

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

@ -27,7 +27,7 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/run"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/log"
"github.com/containerd/typeurl/v2"

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

@ -22,7 +22,7 @@ import (
"github.com/urfave/cli"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/platforms"
)

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

@ -32,7 +32,7 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/tasks"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
clabels "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/oci"

2
cmd/ctr/commands/run/run_unix.go
View File

@ -32,10 +32,10 @@ import (
"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/contrib/apparmor"
"github.com/containerd/containerd/v2/contrib/nvidia"
"github.com/containerd/containerd/v2/contrib/seccomp"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"
"github.com/containerd/containerd/v2/platforms"

2
contrib/apparmor/apparmor.go
View File

@ -24,7 +24,7 @@ import (
"fmt"
"os"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

2
contrib/apparmor/apparmor_unsupported.go
View File

@ -22,7 +22,7 @@ import (
"context"
"errors"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

2
contrib/fuzz/metadata_fuzzer.go
View File

@ -26,7 +26,7 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
bolt "go.etcd.io/bbolt"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases"

2
contrib/nvidia/nvidia.go
View File

@ -24,7 +24,7 @@ import (
"strconv"
"strings"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

2
contrib/seccomp/seccomp.go
View File

@ -22,7 +22,7 @@ import (
"fmt"
"os"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
"github.com/opencontainers/runtime-spec/specs-go"
)

0
containers/containers.go → core/containers/containers.go
View File

2
integration/client/benchmark_test.go
View File

@ -21,7 +21,7 @@ import (
"testing"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
)

2
integration/client/container_linux_test.go
View File

@ -36,7 +36,7 @@ import (
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/v2/cio"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/plugins"

2
integration/client/container_test.go
View File

@ -34,7 +34,7 @@ import (
apievents "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/cio"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/namespaces"

2
integration/client/helpers_unix_test.go
View File

@ -23,7 +23,7 @@ import (
"fmt"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

2
integration/client/helpers_windows_test.go
View File

@ -23,7 +23,7 @@ import (
"strconv"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

2
integration/main_test.go
View File

@ -44,7 +44,7 @@ import (
"k8s.io/klog/v2"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
cri "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis"
_ "github.com/containerd/containerd/v2/integration/images" // Keep this around to parse `imageListFile` command line var
"github.com/containerd/containerd/v2/integration/remote"

2
metadata/adaptors.go
View File

@ -19,7 +19,7 @@ package metadata
import (
"strings"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/images"

2
metadata/containers.go
View File

@ -23,7 +23,7 @@ import (
"sync/atomic"
"time"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/identifiers"

2
metadata/containers_test.go
View File

@ -25,7 +25,7 @@ import (
"testing"
"time"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/namespaces"

2
metadata/db_test.go
View File

@ -29,7 +29,7 @@ import (
"testing"
"time"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/gc"

2
metadata/namespaces_test.go
View File

@ -20,7 +20,7 @@ import (
"context"
"testing"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/stretchr/testify/assert"

2
oci/spec.go
View File

@ -28,7 +28,7 @@ import (
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/platforms"
)

2
oci/spec_opts.go
View File

@ -29,7 +29,7 @@ import (
"strings"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/mount"

2
oci/spec_opts_linux.go
View File

@ -19,7 +19,7 @@ package oci
import (
"context"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/pkg/cap"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

2
oci/spec_opts_linux_test.go
View File

@ -23,7 +23,7 @@ import (
"path/filepath"
"testing"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/pkg/cap"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/continuity/fs/fstest"

2
oci/spec_opts_nonlinux.go
View File

@ -21,7 +21,7 @@ package oci
import (
"context"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
)
// WithAllCurrentCapabilities propagates the effective capabilities of the caller process to the container process.

2
oci/spec_opts_nonwindows.go
View File

@ -21,7 +21,7 @@ package oci
import (
"context"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
)
// WithDefaultPathEnv sets the $PATH environment variable to the

2
oci/spec_opts_test.go
View File

@ -36,7 +36,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces"

2
oci/spec_opts_unix.go
View File

@ -21,7 +21,7 @@ package oci
import (
"context"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
)
// WithHostDevices adds all the hosts device nodes to the container's spec

2
oci/spec_opts_unix_test.go
View File

@ -22,7 +22,7 @@ import (
"context"
"testing"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/namespaces"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
specs "github.com/opencontainers/runtime-spec/specs-go"

2
oci/spec_opts_windows.go
View File

@ -24,7 +24,7 @@ import (
"github.com/opencontainers/runtime-spec/specs-go"
"golang.org/x/sys/windows"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
)
func escapeAndCombineArgs(args []string) string {

2
oci/spec_opts_windows_test.go
View File

@ -21,7 +21,7 @@ import (
"os"
"testing"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/namespaces"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
oci/spec_test.go
View File

@ -23,7 +23,7 @@ import (
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil"
)

2
pkg/cri/nri/nri_api_linux.go
View File

@ -22,7 +22,7 @@ import (
"fmt"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/blockio"
"github.com/containerd/containerd/v2/pkg/cri/annotations"

2
pkg/cri/nri/nri_api_other.go
View File

@ -22,7 +22,7 @@ import (
"context"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
cstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
"github.com/opencontainers/runtime-spec/specs-go"

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

@ -27,7 +27,7 @@ import (
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/snapshots"

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

@ -26,7 +26,7 @@ import (
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
osinterface "github.com/containerd/containerd/v2/pkg/os"
)

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

@ -31,7 +31,7 @@ import (
"golang.org/x/sys/unix"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/log"
)

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

@ -31,7 +31,7 @@ import (
"github.com/opencontainers/selinux/go-selinux/label"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/oci"
osinterface "github.com/containerd/containerd/v2/pkg/os"

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

@ -21,7 +21,7 @@ package opts
import (
"context"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
)

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

@ -21,7 +21,7 @@ package opts
import (
"context"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"

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

@ -29,7 +29,7 @@ import (
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cri/util"
)

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

@ -23,7 +23,7 @@ import (
"errors"
"strings"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"

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

@ -24,7 +24,7 @@ import (
"sort"
"strings"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
osinterface "github.com/containerd/containerd/v2/pkg/os"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"

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

@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/require"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci"
osinterface "github.com/containerd/containerd/v2/pkg/os"

2
pkg/cri/server/container_create.go
View File

@ -35,7 +35,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/blockio"
"github.com/containerd/containerd/v2/pkg/cri/annotations"

2
pkg/cri/server/container_create_linux_test.go
View File

@ -26,9 +26,9 @@ import (
"testing"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/contrib/apparmor"
"github.com/containerd/containerd/v2/contrib/seccomp"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/platforms"

2
pkg/cri/server/container_update_resources.go
View File

@ -28,7 +28,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/log"

2
pkg/cri/server/helpers.go
View File

@ -32,7 +32,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
clabels "github.com/containerd/containerd/v2/labels"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"

2
pkg/cri/server/helpers_test.go
View File

@ -26,7 +26,7 @@ import (
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"

2
pkg/cri/server/podsandbox/helpers.go
View File

@ -30,7 +30,7 @@ import (
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
clabels "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/oci"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"

2
pkg/cri/server/podsandbox/sandbox_status.go
View File

@ -24,7 +24,7 @@ import (
"github.com/containerd/typeurl/v2"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/cri/server/base"
"github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types"

2
runtime/restart/restart.go
View File

@ -38,7 +38,7 @@ import (
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/log"
)

2
runtime/v2/manager.go
View File

@ -26,7 +26,7 @@ import (
"strings"
"sync"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events/exchange"
"github.com/containerd/containerd/v2/metadata"

2
services/containers/helpers.go
View File

@ -18,7 +18,7 @@ package containers
import (
api "github.com/containerd/containerd/v2/api/services/containers/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/typeurl/v2"

2
services/containers/local.go
View File

@ -22,7 +22,7 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events"
api "github.com/containerd/containerd/v2/api/services/containers/v1"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/metadata"

2
services/tasks/local.go
View File

@ -30,7 +30,7 @@ import (
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events"