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

Update go module to github.com/containerd/containerd/v2

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2023-10-29 20:52:21 -07:00
parent abfc8be530
commit 5fdf55e493
748 changed files with 3443 additions and 2839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration/client/benchmark_test.go
View File

@@ -20,9 +20,9 @@ import (
"fmt"
"testing"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/oci"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/oci"
)
func BenchmarkContainerCreate(b *testing.B) {

6
integration/client/client.go
View File

@@ -23,9 +23,9 @@ import (
"os"
"testing"
"github.com/containerd/containerd"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/log/logtest"
)

18
integration/client/client_test.go
View File

@@ -32,15 +32,15 @@ import (
"go.opentelemetry.io/otel"
exec "golang.org/x/sys/execabs"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
imagelist "github.com/containerd/containerd/integration/images"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/testutil"
"github.com/containerd/containerd/platforms"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
imagelist "github.com/containerd/containerd/v2/integration/images"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log"
)

10
integration/client/client_ttrpc_test.go
View File

@@ -21,11 +21,11 @@ import (
"testing"
"time"
v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/ttrpcutil"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/protobuf/types"
v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/ttrpcutil"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/ttrpc"
"github.com/stretchr/testify/assert"
)

6
integration/client/client_unix_test.go
View File

@@ -21,9 +21,9 @@ package client
import (
"testing"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/integration/images"
"github.com/containerd/containerd/platforms"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/integration/images"
"github.com/containerd/containerd/v2/platforms"
)
var (

6
integration/client/container_checkpoint_test.go
View File

@@ -29,9 +29,9 @@ import (
"syscall"
"testing"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/oci"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/oci"
)
const (

4
integration/client/container_fuzzer.go
View File

@@ -30,8 +30,8 @@ import (
"time"
fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/oci"
exec "golang.org/x/sys/execabs"
)

6
integration/client/container_idmapped_linux_test.go
View File

@@ -22,9 +22,9 @@ import (
"syscall"
"testing"
"github.com/containerd/containerd"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/snapshots/overlay/overlayutils"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/snapshots/overlay/overlayutils"
"github.com/opencontainers/runtime-spec/specs-go"
)

16
integration/client/container_linux_test.go
View File

@@ -33,14 +33,14 @@ import (
"github.com/containerd/cgroups/v3"
"github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/plugins"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/sys"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/sys"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/require"

26
integration/client/container_test.go
View File

@@ -30,19 +30,19 @@ import (
"testing"
"time"
. "github.com/containerd/containerd"
apievents "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/plugins"
gogotypes "github.com/containerd/containerd/protobuf/types"
_ "github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/v2/runc/options"
. "github.com/containerd/containerd/v2"
apievents "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
gogotypes "github.com/containerd/containerd/v2/protobuf/types"
_ "github.com/containerd/containerd/v2/runtime"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/continuity/fs"
"github.com/containerd/go-runc"
"github.com/containerd/log/logtest"

10
integration/client/content_test.go
View File

@@ -22,11 +22,11 @@ import (
"sync/atomic"
"testing"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/content/testsuite"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/content/testsuite"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces"
)
func newContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) {

10
integration/client/convert_test.go
View File

@@ -19,11 +19,11 @@ package client
import (
"testing"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/images/converter"
"github.com/containerd/containerd/images/converter/uncompress"
"github.com/containerd/containerd/platforms"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/converter"
"github.com/containerd/containerd/v2/images/converter/uncompress"
"github.com/containerd/containerd/v2/platforms"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/stretchr/testify/assert"
)

2
integration/client/daemon.go
View File

@@ -26,7 +26,7 @@ import (
"syscall"
"time"
. "github.com/containerd/containerd"
. "github.com/containerd/containerd/v2"
exec "golang.org/x/sys/execabs"
)

8
integration/client/daemon_config_linux_test.go
View File

@@ -27,10 +27,10 @@ import (
"time"
"github.com/containerd/cgroups/v3"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/plugins"
"github.com/containerd/containerd/runtime/v2/runc/options"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
)
// TestDaemonRuntimeRoot ensures plugin.linux.runtime_root is not ignored

10
integration/client/export_test.go
View File

@@ -24,11 +24,11 @@ import (
"os"
"testing"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/platforms"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/archive"
"github.com/containerd/containerd/v2/platforms"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

6
integration/client/helpers_unix_test.go
View File

@@ -22,9 +22,9 @@ import (
"context"
"fmt"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/oci"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

6
integration/client/helpers_windows_test.go
View File

@@ -22,9 +22,9 @@ import (
"io"
"strconv"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/oci"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

12
integration/client/image_test.go
View File

@@ -23,12 +23,12 @@ import (
"strings"
"testing"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
imagelist "github.com/containerd/containerd/integration/images"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/platforms"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
imagelist "github.com/containerd/containerd/v2/integration/images"
"github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/platforms"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

22
integration/client/import_test.go
View File

@@ -32,17 +32,17 @@ import (
"testing"
"time"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/archive/compression"
"github.com/containerd/containerd/archive/tartest"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/transfer"
tarchive "github.com/containerd/containerd/pkg/transfer/archive"
"github.com/containerd/containerd/pkg/transfer/image"
"github.com/containerd/containerd/platforms"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/archive/tartest"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/archive"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/transfer"
tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive"
"github.com/containerd/containerd/v2/pkg/transfer/image"
"github.com/containerd/containerd/v2/platforms"
digest "github.com/opencontainers/go-digest"
specs "github.com/opencontainers/image-spec/specs-go"

10
integration/client/lease_test.go
View File

@@ -20,11 +20,11 @@ import (
"runtime"
"testing"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
imagelist "github.com/containerd/containerd/integration/images"
"github.com/containerd/containerd/leases"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
imagelist "github.com/containerd/containerd/v2/integration/images"
"github.com/containerd/containerd/v2/leases"
"github.com/opencontainers/image-spec/identity"
)

12
integration/client/restart_monitor_test.go
View File

@@ -30,12 +30,12 @@ import (
"testing"
"time"
. "github.com/containerd/containerd"
eventtypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/testutil"
"github.com/containerd/containerd/runtime/restart"
srvconfig "github.com/containerd/containerd/services/server/config"
. "github.com/containerd/containerd/v2"
eventtypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/containerd/v2/runtime/restart"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/typeurl/v2"
"github.com/stretchr/testify/require"
exec "golang.org/x/sys/execabs"

2
integration/client/signals_test.go
View File

@@ -21,7 +21,7 @@ import (
"syscall"
"testing"
. "github.com/containerd/containerd"
. "github.com/containerd/containerd/v2"
)
func TestParseSignal(t *testing.T) {

6
integration/client/snapshot_test.go
View File

@@ -20,9 +20,9 @@ import (
"context"
"testing"
. "github.com/containerd/containerd"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/snapshots/testsuite"
. "github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/containerd/v2/snapshots/testsuite"
)
func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {

4
integration/client/transfer_test.go
View File

@@ -23,8 +23,8 @@ import (
"io"
"testing"
"github.com/containerd/containerd"
"github.com/containerd/containerd/pkg/transfer/archive"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/pkg/transfer/archive"
)
func TestTransferEcho(t *testing.T) {