Merge pull request #9306 from dmcgowan/containerd-v2-module

Containerd v2 module
This commit is contained in:
Akihiro Suda
2023-11-01 15:20:35 +00:00
committed by GitHub
921 changed files with 3313 additions and 53225 deletions

View File

@@ -23,8 +23,8 @@ import (
"sync"
"time"
internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis"
"github.com/containerd/containerd/pkg/cri/util"
internalapi "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis"
"github.com/containerd/containerd/v2/pkg/cri/util"
"github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
)

View File

@@ -29,10 +29,10 @@ import (
"strings"
"syscall"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/log"
"github.com/urfave/cli"
)

View File

@@ -23,9 +23,9 @@ import (
"syscall"
"time"
"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"
"github.com/containerd/log"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

View File

@@ -28,10 +28,10 @@ import (
"syscall"
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/integration/remote"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/plugins"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/integration/remote"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/log"
metrics "github.com/docker/go-metrics"
"github.com/urfave/cli"

View File

@@ -23,9 +23,9 @@ import (
"sync"
"time"
"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"
"github.com/containerd/log"
)