Update to containerd v2

Signed-off-by: apostasie <[email protected]>

cmd/nerdctl/completion.go

@@ -20,7 +20,7 @@ import (
  "context"
  "time"
 
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/labels"
  "github.com/containerd/nerdctl/v2/pkg/netutil"

cmd/nerdctl/compose_images.go

@@ -22,9 +22,9 @@ import (
  "strings"
  "text/tabwriter"
 
- "github.com/containerd/containerd"
- "github.com/containerd/containerd/pkg/progress"
- "github.com/containerd/containerd/snapshots"
+ containerd "github.com/containerd/containerd/v2/client"
+ "github.com/containerd/containerd/v2/core/snapshots"
+ "github.com/containerd/containerd/v2/pkg/progress"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/compose"
  "github.com/containerd/nerdctl/v2/pkg/formatter"

cmd/nerdctl/compose_ps.go

@@ -23,9 +23,9 @@ import (
  "text/tabwriter"
  "time"
 
- "github.com/containerd/containerd"
- "github.com/containerd/containerd/errdefs"
- "github.com/containerd/containerd/runtime/restart"
+ containerd "github.com/containerd/containerd/v2/client"
+ "github.com/containerd/containerd/v2/core/runtime/restart"
+ "github.com/containerd/errdefs"
  gocni "github.com/containerd/go-cni"
  "github.com/containerd/log"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"

cmd/nerdctl/compose_start.go

@@ -21,8 +21,8 @@ import (
  "fmt"
  "os"
 
- "github.com/containerd/containerd"
- "github.com/containerd/containerd/errdefs"
+ containerd "github.com/containerd/containerd/v2/client"
+ "github.com/containerd/errdefs"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/compose"
  "github.com/containerd/nerdctl/v2/pkg/containerutil"

cmd/nerdctl/compose_top.go

@@ -19,7 +19,7 @@ package main
 import (
  "fmt"
 
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/compose"

cmd/nerdctl/container_attach.go

@@ -17,7 +17,7 @@
 package main
 
 import (
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_diff.go

@@ -23,9 +23,9 @@ import (
  "path/filepath"
  "time"
 
- "github.com/containerd/containerd"
- "github.com/containerd/containerd/leases"
- "github.com/containerd/containerd/mount"
+ containerd "github.com/containerd/containerd/v2/client"
+ "github.com/containerd/containerd/v2/core/leases"
+ "github.com/containerd/containerd/v2/core/mount"
  "github.com/containerd/continuity/fs"
  "github.com/containerd/log"
  "github.com/containerd/nerdctl/v2/pkg/api/types"

cmd/nerdctl/container_exec.go

@@ -19,7 +19,7 @@ package main
 import (
  "errors"
 
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_kill.go

@@ -17,7 +17,7 @@
 package main
 
 import (
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_pause.go

@@ -17,7 +17,7 @@
 package main
 
 import (
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_run_cgroup_linux_test.go

@@ -24,7 +24,7 @@ import (
  "testing"
 
  "github.com/containerd/cgroups/v3"
- "github.com/containerd/containerd/pkg/userns"
+ "github.com/containerd/containerd/v2/pkg/userns"
  "github.com/containerd/continuity/testutil/loopback"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"
  "github.com/containerd/nerdctl/v2/pkg/testutil"

cmd/nerdctl/container_run_linux.go

@@ -19,7 +19,7 @@ package main
 import (
  "strings"
 
- "github.com/containerd/containerd/pkg/cap"
+ "github.com/containerd/containerd/v2/pkg/cap"
  "github.com/spf13/cobra"
 )
 

cmd/nerdctl/container_run_mount_linux_test.go

@@ -23,7 +23,7 @@ import (
  "strings"
  "testing"
 
- "github.com/containerd/containerd/mount"
+ "github.com/containerd/containerd/v2/core/mount"
  "github.com/containerd/nerdctl/v2/pkg/rootlessutil"
  "github.com/containerd/nerdctl/v2/pkg/testutil"
  mobymount "github.com/moby/sys/mount"

cmd/nerdctl/container_run_network_linux_test.go

@@ -25,7 +25,7 @@ import (
  "strings"
  "testing"
 
- "github.com/containerd/containerd/errdefs"
+ "github.com/containerd/errdefs"
  "github.com/containerd/nerdctl/v2/pkg/rootlessutil"
  "github.com/containerd/nerdctl/v2/pkg/testutil"
  "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"

cmd/nerdctl/container_run_test.go

@@ -398,7 +398,7 @@ RUN echo '\
  "path/filepath" \n\
  "sync" \n\
  \n\
- "github.com/containerd/containerd/runtime/v2/logging"\n\
+ "github.com/containerd/containerd/v2/core/runtime/v2/logging"\n\
  )\n\
 
  func main() {\n\

cmd/nerdctl/container_start.go

@@ -17,7 +17,7 @@
 package main
 
 import (
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_stats.go

@@ -17,7 +17,7 @@
 package main
 
 import (
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_stop.go

@@ -19,7 +19,7 @@ package main
 import (
  "time"
 
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_top.go

@@ -20,7 +20,7 @@ import (
  "errors"
  "fmt"
 
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_unpause.go

@@ -17,7 +17,7 @@
 package main
 
 import (
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_update.go

@@ -23,9 +23,9 @@ import (
  "fmt"
  "runtime"
 
- "github.com/containerd/containerd"
- "github.com/containerd/containerd/containers"
- "github.com/containerd/containerd/errdefs"
+ containerd "github.com/containerd/containerd/v2/client"
+ "github.com/containerd/containerd/v2/core/containers"
+ "github.com/containerd/errdefs"
  "github.com/containerd/log"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"

cmd/nerdctl/container_wait.go

@@ -17,7 +17,7 @@
 package main
 
 import (
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/image_encrypt_linux_test.go

@@ -24,8 +24,8 @@ import (
  "path/filepath"
  "testing"
 
- "github.com/containerd/containerd"
- "github.com/containerd/containerd/content"
+ containerd "github.com/containerd/containerd/v2/client"
+ "github.com/containerd/containerd/v2/core/content"
  "github.com/containerd/nerdctl/v2/pkg/buildkitutil"
  "github.com/containerd/nerdctl/v2/pkg/testutil"
  "github.com/containerd/nerdctl/v2/pkg/testutil/testregistry"

cmd/nerdctl/image_history.go

@@ -28,7 +28,7 @@ import (
  "text/template"
  "time"
 
- "github.com/containerd/containerd"
+ containerd "github.com/containerd/containerd/v2/client"
  "github.com/containerd/log"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/formatter"

cmd/nerdctl/main_test.go

@@ -21,7 +21,7 @@ import (
  "path/filepath"
  "testing"
 
- "github.com/containerd/containerd"
+ "github.com/containerd/containerd/v2/defaults"
  "github.com/containerd/nerdctl/v2/pkg/testutil"
  "gotest.tools/v3/assert"
 )
@@ -55,7 +55,7 @@ snapshotter = "dummy-snapshotter-via-toml"
  base := testutil.NewBase(t)
 
  // [Default]
- base.Cmd("info", "-f", "{{.Driver}}").AssertOutExactly(containerd.DefaultSnapshotter + "\n")
+ base.Cmd("info", "-f", "{{.Driver}}").AssertOutExactly(defaults.DefaultSnapshotter + "\n")
 
  // [TOML, Default]
  base.Env = append(base.Env, "NERDCTL_TOML="+tomlPath)

cmd/nerdctl/namespace.go

@@ -23,7 +23,7 @@ import (
  "strings"
  "text/tabwriter"
 
- "github.com/containerd/containerd/namespaces"
+ "github.com/containerd/containerd/v2/pkg/namespaces"
  "github.com/containerd/log"
  "github.com/containerd/nerdctl/v2/pkg/clientutil"
  "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore"

cmd/nerdctl/network_create.go

@@ -19,7 +19,7 @@ package main
 import (
  "fmt"
 
- "github.com/containerd/containerd/identifiers"
+ "github.com/containerd/containerd/v2/pkg/identifiers"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/cmd/network"
  "github.com/containerd/nerdctl/v2/pkg/strutil"

cmd/nerdctl/volume_create.go

@@ -19,7 +19,7 @@ package main
 import (
  "fmt"
 
- "github.com/containerd/containerd/errdefs"
+ "github.com/containerd/errdefs"
  "github.com/containerd/nerdctl/v2/pkg/api/types"
  "github.com/containerd/nerdctl/v2/pkg/cmd/volume"
 

cmd/nerdctl/volume_create_test.go

@@ -19,7 +19,7 @@ package main
 import (
  "testing"
 
- "github.com/containerd/containerd/errdefs"
+ "github.com/containerd/errdefs"
  "github.com/containerd/nerdctl/v2/pkg/testutil"
  "gotest.tools/v3/icmd"
 )

cmd/nerdctl/volume_inspect_test.go

@@ -25,7 +25,7 @@ import (
  "strings"
  "testing"
 
- "github.com/containerd/containerd/errdefs"
+ "github.com/containerd/errdefs"
  "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native"
  "github.com/containerd/nerdctl/v2/pkg/testutil"
  "gotest.tools/v3/assert"

cmd/nerdctl/volume_namespace_test.go

@@ -19,7 +19,7 @@ package main
 import (
  "testing"
 
- "github.com/containerd/containerd/errdefs"
+ "github.com/containerd/errdefs"
  "github.com/containerd/nerdctl/v2/pkg/testutil"
  "gotest.tools/v3/icmd"
 )

cmd/nerdctl/volume_remove_linux_test.go

@@ -21,7 +21,7 @@ import (
  "strings"
  "testing"
 
- "github.com/containerd/containerd/errdefs"
+ "github.com/containerd/errdefs"
  "github.com/containerd/nerdctl/v2/pkg/testutil"
  "gotest.tools/v3/assert"
  "gotest.tools/v3/icmd"