Merge pull request #9316 from dmcgowan/rename-client-package

Move client to subpackage

Makefile

@@ -81,7 +81,7 @@ STATICRELEASE=containerd-static-$(VERSION:v%=%)-${GOOS}-${GOARCH}
 CRIRELEASE=cri-containerd-$(VERSION:v%=%)-${GOOS}-${GOARCH}
 CRICNIRELEASE=cri-containerd-cni-$(VERSION:v%=%)-${GOOS}-${GOARCH}
 
-PKG=github.com/containerd/containerd
+PKG=github.com/containerd/containerd/v2
 
 # Project binaries.
 COMMANDS=ctr containerd containerd-stress

client/client.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
@@ -82,7 +82,7 @@ func init() {
 
 // New returns a new containerd client that is connected to the containerd
 // instance provided by address
-func New(address string, opts ...ClientOpt) (*Client, error) {
+func New(address string, opts ...Opt) (*Client, error) {
 	var copts clientOpts
 	for _, o := range opts {
 		if err := o(&copts); err != nil {
@@ -174,7 +174,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 
 // NewWithConn returns a new containerd client that is connected to the containerd
 // instance provided by the connection
-func NewWithConn(conn *grpc.ClientConn, opts ...ClientOpt) (*Client, error) {
+func NewWithConn(conn *grpc.ClientConn, opts ...Opt) (*Client, error) {
 	var copts clientOpts
 	for _, o := range opts {
 		if err := o(&copts); err != nil {

client/client_opts.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"time"
@@ -38,14 +38,14 @@ type clientOpts struct {
 	timeout         time.Duration
 }
 
-// ClientOpt allows callers to set options on the containerd client
-type ClientOpt func(c *clientOpts) error
+// Opt allows callers to set options on the containerd client
+type Opt func(c *clientOpts) error
 
 // WithDefaultNamespace sets the default namespace on the client
 //
 // Any operation that does not have a namespace set on the context will
 // be provided the default namespace
-func WithDefaultNamespace(ns string) ClientOpt {
+func WithDefaultNamespace(ns string) Opt {
 	return func(c *clientOpts) error {
 		c.defaultns = ns
 		return nil
@@ -53,7 +53,7 @@ func WithDefaultNamespace(ns string) ClientOpt {
 }
 
 // WithDefaultRuntime sets the default runtime on the client
-func WithDefaultRuntime(rt string) ClientOpt {
+func WithDefaultRuntime(rt string) Opt {
 	return func(c *clientOpts) error {
 		c.defaultRuntime = rt
 		return nil
@@ -61,7 +61,7 @@ func WithDefaultRuntime(rt string) ClientOpt {
 }
 
 // WithDefaultPlatform sets the default platform matcher on the client
-func WithDefaultPlatform(platform platforms.MatchComparer) ClientOpt {
+func WithDefaultPlatform(platform platforms.MatchComparer) Opt {
 	return func(c *clientOpts) error {
 		c.defaultPlatform = platform
 		return nil
@@ -69,7 +69,7 @@ func WithDefaultPlatform(platform platforms.MatchComparer) ClientOpt {
 }
 
 // WithDialOpts allows grpc.DialOptions to be set on the connection
-func WithDialOpts(opts []grpc.DialOption) ClientOpt {
+func WithDialOpts(opts []grpc.DialOption) Opt {
 	return func(c *clientOpts) error {
 		c.dialOptions = opts
 		return nil
@@ -77,7 +77,7 @@ func WithDialOpts(opts []grpc.DialOption) ClientOpt {
 }
 
 // WithCallOpts allows grpc.CallOptions to be set on the connection
-func WithCallOpts(opts []grpc.CallOption) ClientOpt {
+func WithCallOpts(opts []grpc.CallOption) Opt {
 	return func(c *clientOpts) error {
 		c.callOptions = opts
 		return nil
@@ -85,7 +85,7 @@ func WithCallOpts(opts []grpc.CallOption) ClientOpt {
 }
 
 // WithServices sets services used by the client.
-func WithServices(opts ...ServicesOpt) ClientOpt {
+func WithServices(opts ...ServicesOpt) Opt {
 	return func(c *clientOpts) error {
 		c.services = &services{}
 		for _, o := range opts {
@@ -96,7 +96,7 @@ func WithServices(opts ...ServicesOpt) ClientOpt {
 }
 
 // WithTimeout sets the connection timeout for the client
-func WithTimeout(d time.Duration) ClientOpt {
+func WithTimeout(d time.Duration) Opt {
 	return func(c *clientOpts) error {
 		c.timeout = d
 		return nil

client/container.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/container_checkpoint_opts.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"

client/container_opts.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/container_opts_unix.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/container_restore_opts.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/containerstore.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/diff.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"

client/events.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/export.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/grpc.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/image.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/image_store.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/import.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/install.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"archive/tar"

client/install_opts.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 // InstallOpts configures binary installs
 type InstallOpts func(*InstallConfig)

client/lease.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/namespaces.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/oss_fuzz.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"github.com/AdamKorcz/go-118-fuzz-build/testing"

client/process.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/pull.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/sandbox.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/services.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"fmt"
@@ -183,7 +183,7 @@ func WithSandboxStore(client sandbox.Store) ServicesOpt {
 
 // WithInMemoryServices is suitable for cases when there is need to use containerd's client from
 // another (in-memory) containerd plugin (such as CRI).
-func WithInMemoryServices(ic *plugin.InitContext) ClientOpt {
+func WithInMemoryServices(ic *plugin.InitContext) Opt {
 	return func(c *clientOpts) error {
 		var opts []ServicesOpt
 		for t, fn := range map[plugin.Type]func(interface{}) ServicesOpt{

client/signals.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/snapshotter_default_linux.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 const (
 	// DefaultSnapshotter will set the default snapshotter for the platform.

client/snapshotter_default_unix.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 const (
 	// DefaultSnapshotter will set the default snapshotter for the platform.

client/snapshotter_default_windows.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 const (
 	// DefaultSnapshotter will set the default snapshotter for the platform.

client/snapshotter_opts_unix.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/snapshotter_opts_windows.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/task.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/task_opts.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/task_opts_unix.go

@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

client/transfer.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

cmd/containerd-stress/density.go

@@ -29,8 +29,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/log"

cmd/containerd-stress/exec_worker.go

@@ -23,8 +23,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/log"
 	specs "github.com/opencontainers/runtime-spec/specs-go"

cmd/containerd-stress/main.go

@@ -28,7 +28,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/integration/remote"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/plugins"

cmd/containerd-stress/worker.go

@@ -23,8 +23,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/log"
 )

cmd/ctr/commands/client.go

@@ -19,7 +19,7 @@ package commands
 import (
 	gocontext "context"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/containerd/v2/pkg/epoch"
 	"github.com/containerd/log"
@@ -54,7 +54,7 @@ func AppContext(context *cli.Context) (gocontext.Context, gocontext.CancelFunc)
 }
 
 // NewClient returns a new containerd client
-func NewClient(context *cli.Context, opts ...containerd.ClientOpt) (*containerd.Client, gocontext.Context, gocontext.CancelFunc, error) {
+func NewClient(context *cli.Context, opts ...containerd.Opt) (*containerd.Client, gocontext.Context, gocontext.CancelFunc, error) {
 	timeoutOpt := containerd.WithTimeout(context.GlobalDuration("connect-timeout"))
 	opts = append(opts, timeoutOpt)
 	client, err := containerd.New(context.GlobalString("address"), opts...)

cmd/ctr/commands/cni.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/namespaces"
 	"github.com/containerd/typeurl/v2"
 )

cmd/ctr/commands/containers/checkpoint.go

@@ -20,7 +20,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/urfave/cli"

cmd/ctr/commands/containers/containers.go

@@ -23,8 +23,8 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	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"

cmd/ctr/commands/containers/restore.go

@@ -20,8 +20,8 @@ import (
 	"errors"
 
 	"github.com/containerd/console"
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	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/errdefs"

cmd/ctr/commands/content/fetch.go

@@ -26,7 +26,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/content"
 	"github.com/containerd/containerd/v2/errdefs"

cmd/ctr/commands/images/import.go

@@ -25,7 +25,7 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/urfave/cli"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/images/archive"
 	"github.com/containerd/containerd/v2/pkg/transfer"

cmd/ctr/commands/images/mount.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/leases"

cmd/ctr/commands/images/pull.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands/content"
 	"github.com/containerd/containerd/v2/images"

cmd/ctr/commands/images/push.go

@@ -26,7 +26,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands/content"
 	"github.com/containerd/containerd/v2/images"

cmd/ctr/commands/images/usage.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/pkg/progress"
 

cmd/ctr/commands/install/install.go

@@ -17,7 +17,7 @@
 package install
 
 import (
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/urfave/cli"
 )

cmd/ctr/commands/run/run.go

@@ -28,8 +28,8 @@ import (
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/urfave/cli"
 
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	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"

cmd/ctr/commands/run/run_unix.go

@@ -30,7 +30,7 @@ import (
 
 	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/container-orchestrated-devices/container-device-interface/pkg/parser"
-	"github.com/containerd/containerd/v2"
+	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"

cmd/ctr/commands/run/run_windows.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	"github.com/containerd/console"
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/containerd/v2/pkg/netns"

cmd/ctr/commands/sandboxes/sandboxes.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/oci"

cmd/ctr/commands/signals.go

@@ -22,7 +22,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/log"
 )

cmd/ctr/commands/tasks/checkpoint.go

@@ -20,7 +20,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/runtime/v2/runc/options"
 	"github.com/urfave/cli"

cmd/ctr/commands/tasks/delete.go

@@ -19,8 +19,8 @@ package tasks
 import (
 	gocontext "context"
 
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/log"
 	"github.com/urfave/cli"

cmd/ctr/commands/tasks/exec.go

@@ -23,8 +23,8 @@ import (
 	"os"
 
 	"github.com/containerd/console"
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/log"

cmd/ctr/commands/tasks/kill.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	gocni "github.com/containerd/go-cni"
 	"github.com/containerd/log"

cmd/ctr/commands/tasks/start.go

@@ -20,8 +20,8 @@ import (
 	"errors"
 
 	"github.com/containerd/console"
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/log"

cmd/ctr/commands/tasks/tasks_unix.go

@@ -26,8 +26,8 @@ import (
 	"os/signal"
 
 	"github.com/containerd/console"
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/log"
 	"github.com/urfave/cli"
 	"golang.org/x/sys/unix"

cmd/ctr/commands/tasks/tasks_windows.go

@@ -23,8 +23,8 @@ import (
 	"time"
 
 	"github.com/containerd/console"
-	"github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/log"
 	"github.com/urfave/cli"
 )

contrib/fuzz/containerd_import_fuzzer.go

@@ -21,7 +21,7 @@ import (
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/namespaces"
 )
 

contrib/fuzz/cri_sbserver_fuzzer.go

@@ -21,7 +21,7 @@ package fuzz
 import (
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
 	"github.com/containerd/containerd/v2/pkg/cri/server"
 )

contrib/fuzz/cri_server_fuzzer.go

@@ -21,7 +21,7 @@ package fuzz
 import (
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
 	"github.com/containerd/containerd/v2/pkg/cri/server"
 )

integration/build_local_containerd_helper_test.go

@@ -22,7 +22,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/pkg/cri/constants"
 	"github.com/containerd/containerd/v2/platforms"
 	"github.com/containerd/containerd/v2/plugin"

integration/client/benchmark_test.go

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

integration/client/client.go

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

integration/client/client_test.go

@@ -32,7 +32,7 @@ import (
 	"go.opentelemetry.io/otel"
 	exec "golang.org/x/sys/execabs"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
@@ -189,7 +189,7 @@ func TestMain(m *testing.M) {
 	os.Exit(status)
 }
 
-func newClient(t testing.TB, address string, opts ...ClientOpt) (*Client, error) {
+func newClient(t testing.TB, address string, opts ...Opt) (*Client, error) {
 	if testing.Short() {
 		t.Skip()
 	}

integration/client/client_unix_test.go

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

integration/client/container_checkpoint_test.go

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

integration/client/container_fuzzer.go

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

integration/client/container_idmapped_linux_test.go

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

integration/client/container_linux_test.go

@@ -33,8 +33,8 @@ import (
 	"github.com/containerd/cgroups/v3"
 	"github.com/containerd/cgroups/v3/cgroup1"
 	cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
-	. "github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/cio"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/containers"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/oci"

integration/client/container_test.go

@@ -30,9 +30,9 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/containerd/containerd/v2"
 	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/errdefs"
 	"github.com/containerd/containerd/v2/images"

integration/client/content_test.go

@@ -22,7 +22,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/content"
 	"github.com/containerd/containerd/v2/content/testsuite"
 	"github.com/containerd/containerd/v2/errdefs"

integration/client/convert_test.go

@@ -19,7 +19,7 @@ package client
 import (
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/converter"
 	"github.com/containerd/containerd/v2/images/converter/uncompress"

integration/client/daemon.go

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

integration/client/daemon_config_linux_test.go

@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/containerd/cgroups/v3"
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/runtime/v2/runc/options"

integration/client/export_test.go

@@ -24,7 +24,7 @@ import (
 	"os"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/content"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/archive"

integration/client/image_test.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	imagelist "github.com/containerd/containerd/v2/integration/images"

integration/client/import_test.go

@@ -32,9 +32,9 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/containerd/containerd/v2"
 	"github.com/containerd/containerd/v2/archive/compression"
 	"github.com/containerd/containerd/v2/archive/tartest"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/archive"
 	"github.com/containerd/containerd/v2/leases"

integration/client/lease_test.go

@@ -20,7 +20,7 @@ import (
 	"runtime"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	imagelist "github.com/containerd/containerd/v2/integration/images"

integration/client/restart_monitor_test.go

@@ -30,8 +30,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/containerd/containerd/v2"
 	eventtypes "github.com/containerd/containerd/v2/api/events"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/containerd/v2/runtime/restart"

integration/client/signals_test.go

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

integration/client/snapshot_test.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	. "github.com/containerd/containerd/v2"
+	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/snapshots"
 	"github.com/containerd/containerd/v2/snapshots/testsuite"
 )

integration/client/transfer_test.go

@@ -23,7 +23,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/pkg/transfer/archive"
 )
 

integration/container_update_resources_test.go

@@ -28,7 +28,7 @@ import (
 	"github.com/containerd/cgroups/v3"
 	"github.com/containerd/cgroups/v3/cgroup1"
 	cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/integration/images"
 	criopts "github.com/containerd/containerd/v2/pkg/cri/opts"
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"

integration/containerd_image_test.go

@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/integration/images"
 	"github.com/containerd/containerd/v2/namespaces"

integration/image_pull_timeout_test.go

@@ -33,7 +33,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/content"
 	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/namespaces"

integration/main_test.go

@@ -33,7 +33,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/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

integration/restart_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/integration/images"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

pkg/cri/config/config_unix.go

@@ -21,7 +21,7 @@ package config
 import (
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/pelletier/go-toml/v2"
 	"k8s.io/kubelet/pkg/cri/streaming"
 )

pkg/cri/config/config_windows.go

@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"k8s.io/kubelet/pkg/cri/streaming"
 )
 

pkg/cri/cri.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/pkg/cri/nri"
 	"github.com/containerd/containerd/v2/pkg/cri/server"
 	nriservice "github.com/containerd/containerd/v2/pkg/nri"

pkg/cri/nri/nri_api_linux.go

@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/containers"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/pkg/blockio"

pkg/cri/nri/nri_api_other.go

@@ -21,7 +21,7 @@ package nri
 import (
 	"context"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/containers"
 	cstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
 	sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"

pkg/cri/opts/container.go

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

pkg/cri/server/container_attach.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/containerd/containerd/v2"
+	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/log"
 	"k8s.io/client-go/tools/remotecommand"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"