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

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

View File

@@ -19,8 +19,8 @@ package oci
import (
"context"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/snapshots"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

View File

@@ -27,10 +27,10 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/platforms"
)
const (

View File

@@ -29,12 +29,12 @@ import (
"strings"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/continuity/fs"
"github.com/containerd/log"
"github.com/moby/sys/user"

View File

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

View File

@@ -23,9 +23,9 @@ import (
"path/filepath"
"testing"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/pkg/cap"
"github.com/containerd/containerd/pkg/testutil"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/pkg/cap"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/continuity/fs/fstest"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert"

View File

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

View File

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

View File

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

View File

@@ -36,10 +36,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces"
)
type blob []byte

View File

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

View File

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

View File

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

View File

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

View File

@@ -23,9 +23,9 @@ import (
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/testutil"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil"
)
func TestGenerateSpec(t *testing.T) {

View File

@@ -24,7 +24,7 @@ import (
"os"
"path/filepath"
"github.com/containerd/containerd/pkg/userns"
"github.com/containerd/containerd/v2/pkg/userns"
specs "github.com/opencontainers/runtime-spec/specs-go"
"golang.org/x/sys/unix"
)

View File

@@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/containerd/containerd/pkg/userns"
"github.com/containerd/containerd/v2/pkg/userns"
)
func cleanupTest() {