From 5fdf55e493d68079d22a08de1a7afe522e5838e5 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Sun, 29 Oct 2023 20:52:21 -0700 Subject: [PATCH] Update go module to github.com/containerd/containerd/v2 Signed-off-by: Derek McGowan --- api/events/container.pb.go | 10 +- api/events/container.proto | 2 +- api/events/content.pb.go | 10 +- api/events/content.proto | 2 +- api/events/image.pb.go | 8 +- api/events/image.proto | 2 +- api/events/namespace.pb.go | 10 +- api/events/namespace.proto | 2 +- api/events/sandbox.pb.go | 8 +- api/events/sandbox.proto | 2 +- api/events/snapshot.pb.go | 10 +- api/events/snapshot.proto | 2 +- api/events/task.pb.go | 11 +- api/events/task.proto | 2 +- api/next.pb.txt | 74 +++---- api/runtime/sandbox/v1/sandbox.pb.go | 10 +- api/runtime/sandbox/v1/sandbox.proto | 2 +- api/runtime/task/v2/shim.pb.go | 12 +- api/runtime/task/v2/shim.proto | 2 +- api/runtime/task/v3/shim.pb.go | 12 +- api/runtime/task/v3/shim.proto | 2 +- api/services/containers/v1/containers.pb.go | 10 +- api/services/containers/v1/containers.proto | 2 +- api/services/content/v1/content.pb.go | 10 +- api/services/content/v1/content.proto | 2 +- api/services/diff/v1/diff.pb.go | 10 +- api/services/diff/v1/diff.proto | 2 +- api/services/events/v1/events.pb.go | 12 +- api/services/events/v1/events.proto | 2 +- api/services/images/v1/images.pb.go | 10 +- api/services/images/v1/images.proto | 2 +- .../introspection/v1/introspection.pb.go | 12 +- .../introspection/v1/introspection.proto | 2 +- api/services/leases/v1/leases.pb.go | 8 +- api/services/leases/v1/leases.proto | 2 +- api/services/namespaces/v1/namespace.pb.go | 10 +- api/services/namespaces/v1/namespace.proto | 2 +- api/services/sandbox/v1/sandbox.pb.go | 12 +- api/services/sandbox/v1/sandbox.proto | 2 +- api/services/snapshots/v1/snapshots.pb.go | 12 +- api/services/snapshots/v1/snapshots.proto | 2 +- api/services/streaming/v1/streaming.pb.go | 11 +- api/services/streaming/v1/streaming.proto | 2 +- api/services/tasks/v1/tasks.pb.go | 12 +- api/services/tasks/v1/tasks.proto | 2 +- api/services/transfer/v1/transfer.pb.go | 10 +- api/services/transfer/v1/transfer.proto | 2 +- api/services/ttrpc/events/v1/events.pb.go | 12 +- api/services/ttrpc/events/v1/events.proto | 2 +- api/services/version/v1/version.pb.go | 10 +- api/services/version/v1/version.proto | 2 +- api/types/descriptor.pb.go | 8 +- api/types/descriptor.proto | 2 +- api/types/metrics.pb.go | 8 +- api/types/metrics.proto | 2 +- api/types/mount.pb.go | 6 +- api/types/mount.proto | 2 +- api/types/platform.pb.go | 8 +- api/types/platform.proto | 2 +- api/types/sandbox.pb.go | 8 +- api/types/sandbox.proto | 2 +- api/types/task/task.pb.go | 6 +- api/types/task/task.proto | 2 +- api/types/transfer/imagestore.pb.go | 10 +- api/types/transfer/imagestore.proto | 2 +- api/types/transfer/importexport.pb.go | 10 +- api/types/transfer/importexport.proto | 2 +- api/types/transfer/progress.pb.go | 8 +- api/types/transfer/progress.proto | 2 +- api/types/transfer/registry.pb.go | 8 +- api/types/transfer/registry.proto | 2 +- api/types/transfer/streaming.pb.go | 8 +- api/types/transfer/streaming.proto | 2 +- archive/issues_test.go | 4 +- archive/tar.go | 6 +- archive/tar_linux_test.go | 6 +- archive/tar_test.go | 4 +- archive/tar_unix.go | 2 +- cio/io.go | 2 +- client.go | 68 +++---- client_opts.go | 8 +- cmd/containerd-shim-runc-v2/main.go | 8 +- cmd/containerd-stress/cri_worker.go | 4 +- cmd/containerd-stress/density.go | 8 +- cmd/containerd-stress/exec_worker.go | 6 +- cmd/containerd-stress/main.go | 8 +- cmd/containerd-stress/worker.go | 6 +- cmd/containerd/builtins/btrfs_linux.go | 2 +- cmd/containerd/builtins/builtins.go | 58 +++--- cmd/containerd/builtins/builtins_linux.go | 12 +- cmd/containerd/builtins/builtins_unix.go | 4 +- cmd/containerd/builtins/builtins_windows.go | 8 +- cmd/containerd/builtins/cri.go | 2 +- cmd/containerd/builtins/devmapper_linux.go | 2 +- cmd/containerd/builtins/tracing.go | 2 +- cmd/containerd/command/config.go | 12 +- cmd/containerd/command/main.go | 16 +- cmd/containerd/command/main_unix.go | 2 +- cmd/containerd/command/main_windows.go | 2 +- cmd/containerd/command/oci-hook.go | 2 +- cmd/containerd/command/publish.go | 12 +- cmd/containerd/command/service_unsupported.go | 2 +- cmd/containerd/command/service_windows.go | 4 +- cmd/containerd/main.go | 8 +- cmd/ctr/app/main.go | 40 ++-- cmd/ctr/app/main_unix.go | 2 +- cmd/ctr/commands/client.go | 6 +- cmd/ctr/commands/cni.go | 6 +- cmd/ctr/commands/commands.go | 4 +- cmd/ctr/commands/containers/checkpoint.go | 6 +- cmd/ctr/commands/containers/containers.go | 12 +- cmd/ctr/commands/containers/restore.go | 10 +- cmd/ctr/commands/content/content.go | 8 +- cmd/ctr/commands/content/fetch.go | 16 +- cmd/ctr/commands/content/prune.go | 6 +- cmd/ctr/commands/deprecations/deprecations.go | 8 +- cmd/ctr/commands/events/events.go | 6 +- cmd/ctr/commands/images/convert.go | 8 +- cmd/ctr/commands/images/export.go | 12 +- cmd/ctr/commands/images/images.go | 10 +- cmd/ctr/commands/images/import.go | 14 +- cmd/ctr/commands/images/inspect.go | 4 +- cmd/ctr/commands/images/mount.go | 12 +- cmd/ctr/commands/images/pull.go | 18 +- cmd/ctr/commands/images/push.go | 22 +- cmd/ctr/commands/images/tag.go | 6 +- cmd/ctr/commands/images/unmount.go | 8 +- cmd/ctr/commands/images/usage.go | 6 +- cmd/ctr/commands/info/info.go | 6 +- cmd/ctr/commands/install/install.go | 4 +- cmd/ctr/commands/leases/leases.go | 4 +- cmd/ctr/commands/namespaces/namespaces.go | 4 +- .../commands/namespaces/namespaces_linux.go | 4 +- .../commands/namespaces/namespaces_other.go | 2 +- cmd/ctr/commands/oci/oci.go | 8 +- cmd/ctr/commands/plugins/plugins.go | 8 +- cmd/ctr/commands/pprof/pprof.go | 2 +- cmd/ctr/commands/resolver.go | 8 +- cmd/ctr/commands/run/run.go | 16 +- cmd/ctr/commands/run/run_unix.go | 22 +- cmd/ctr/commands/run/run_windows.go | 10 +- cmd/ctr/commands/sandboxes/sandboxes.go | 8 +- cmd/ctr/commands/shim/shim.go | 10 +- cmd/ctr/commands/signals.go | 4 +- cmd/ctr/commands/snapshots/snapshots.go | 14 +- cmd/ctr/commands/tasks/attach.go | 4 +- cmd/ctr/commands/tasks/checkpoint.go | 6 +- cmd/ctr/commands/tasks/delete.go | 6 +- cmd/ctr/commands/tasks/exec.go | 8 +- cmd/ctr/commands/tasks/kill.go | 4 +- cmd/ctr/commands/tasks/list.go | 4 +- cmd/ctr/commands/tasks/metrics.go | 2 +- cmd/ctr/commands/tasks/pause.go | 2 +- cmd/ctr/commands/tasks/ps.go | 2 +- cmd/ctr/commands/tasks/resume.go | 2 +- cmd/ctr/commands/tasks/start.go | 8 +- cmd/ctr/commands/tasks/tasks_unix.go | 4 +- cmd/ctr/commands/tasks/tasks_windows.go | 4 +- cmd/ctr/commands/version/version.go | 4 +- cmd/ctr/main.go | 6 +- cmd/gen-manpages/main.go | 4 +- container.go | 20 +- container_checkpoint_opts.go | 18 +- container_opts.go | 16 +- container_opts_unix.go | 6 +- container_restore_opts.go | 10 +- containerstore.go | 10 +- content/adaptor.go | 2 +- content/helpers.go | 4 +- content/helpers_test.go | 2 +- content/local/content_local_fuzzer.go | 2 +- content/local/locks.go | 2 +- content/local/readerat.go | 4 +- content/local/store.go | 6 +- content/local/store_test.go | 10 +- content/local/test_helper.go | 2 +- content/local/writer.go | 4 +- content/proxy/content_reader.go | 2 +- content/proxy/content_store.go | 10 +- content/proxy/content_writer.go | 8 +- content/testsuite/testsuite.go | 6 +- contrib/apparmor/apparmor.go | 4 +- contrib/apparmor/apparmor_unsupported.go | 4 +- contrib/diffservice/service.go | 10 +- contrib/fuzz/archive_fuzzer.go | 6 +- contrib/fuzz/builtins.go | 58 +++--- contrib/fuzz/builtins_linux.go | 12 +- contrib/fuzz/builtins_unix.go | 4 +- contrib/fuzz/builtins_windows.go | 8 +- contrib/fuzz/containerd_import_fuzzer.go | 4 +- contrib/fuzz/content_fuzzer.go | 6 +- contrib/fuzz/cri_fuzzer.go | 8 +- contrib/fuzz/cri_sbserver_fuzzer.go | 6 +- contrib/fuzz/cri_server_fuzzer.go | 6 +- contrib/fuzz/daemon.go | 8 +- contrib/fuzz/diff_fuzzer.go | 8 +- contrib/fuzz/exchange_fuzzer.go | 8 +- contrib/fuzz/fuzz_images.go | 6 +- contrib/fuzz/metadata_fuzzer.go | 18 +- contrib/fuzz/oss_fuzz_build.sh | 2 +- contrib/nvidia/nvidia.go | 4 +- contrib/seccomp/seccomp.go | 4 +- contrib/seccomp/seccomp_default.go | 2 +- contrib/snapshotservice/service.go | 10 +- diff.go | 6 +- diff/apply/apply.go | 6 +- diff/apply/apply_darwin.go | 4 +- diff/apply/apply_linux.go | 8 +- diff/apply/apply_other.go | 4 +- diff/diff.go | 2 +- diff/lcow/lcow.go | 16 +- diff/proxy/differ.go | 16 +- diff/stream.go | 4 +- diff/stream_unix.go | 4 +- diff/stream_windows.go | 4 +- diff/walking/differ.go | 16 +- diff/walking/plugin/plugin.go | 16 +- diff/windows/windows.go | 26 +-- events.go | 8 +- events/exchange/exchange.go | 10 +- events/exchange/exchange_test.go | 10 +- events/plugin/plugin.go | 8 +- export.go | 2 +- filters/parser.go | 2 +- gc/scheduler/scheduler.go | 8 +- gc/scheduler/scheduler_test.go | 2 +- go.mod | 3 +- go.sum | 2 + grpc.go | 2 +- identifiers/validate.go | 2 +- identifiers/validate_test.go | 2 +- image.go | 20 +- image_store.go | 14 +- images/archive/exporter.go | 8 +- images/archive/importer.go | 12 +- images/archive/reference.go | 2 +- images/converter/converter.go | 8 +- images/converter/default.go | 6 +- images/converter/uncompress/uncompress.go | 12 +- images/diffid.go | 6 +- images/handlers.go | 6 +- images/image.go | 6 +- images/imagetest/content.go | 6 +- images/importexport.go | 2 +- images/mediatypes.go | 2 +- images/usage/calculator.go | 10 +- images/usage/calculator_test.go | 6 +- import.go | 8 +- install.go | 8 +- integration/addition_gids_test.go | 2 +- .../build_local_containerd_helper_test.go | 50 ++--- ...uild_local_containerd_helper_test_linux.go | 6 +- integration/client/benchmark_test.go | 6 +- integration/client/client.go | 6 +- integration/client/client_test.go | 18 +- integration/client/client_ttrpc_test.go | 10 +- integration/client/client_unix_test.go | 6 +- .../client/container_checkpoint_test.go | 6 +- integration/client/container_fuzzer.go | 4 +- .../client/container_idmapped_linux_test.go | 6 +- integration/client/container_linux_test.go | 16 +- integration/client/container_test.go | 26 +-- integration/client/content_test.go | 10 +- integration/client/convert_test.go | 10 +- integration/client/daemon.go | 2 +- .../client/daemon_config_linux_test.go | 8 +- integration/client/export_test.go | 10 +- integration/client/helpers_unix_test.go | 6 +- integration/client/helpers_windows_test.go | 6 +- integration/client/image_test.go | 12 +- integration/client/import_test.go | 22 +- integration/client/lease_test.go | 10 +- integration/client/restart_monitor_test.go | 12 +- integration/client/signals_test.go | 2 +- integration/client/snapshot_test.go | 6 +- integration/client/transfer_test.go | 4 +- integration/container_event_test.go | 2 +- integration/container_exec_test.go | 2 +- integration/container_log_test.go | 2 +- integration/container_restart_test.go | 2 +- integration/container_stats_test.go | 2 +- integration/container_stop_test.go | 2 +- .../container_update_resources_test.go | 6 +- integration/container_volume_test.go | 2 +- .../container_without_image_ref_test.go | 2 +- integration/containerd_image_test.go | 10 +- integration/duplicate_name_test.go | 2 +- .../failpoint/cmd/cni-bridge-fp/main_linux.go | 2 +- .../containerd-shim-runc-fp-v1/main_linux.go | 6 +- .../plugin_linux.go | 18 +- integration/failpoint/cmd/runc-fp/main.go | 2 +- integration/image_load_test.go | 2 +- integration/image_pull_timeout_test.go | 12 +- integration/imagefs_info_test.go | 2 +- integration/issue7496_linux_test.go | 8 +- integration/issue7496_shutdown_linux_test.go | 4 +- integration/main_test.go | 20 +- integration/nri_test.go | 4 +- integration/pod_dualstack_test.go | 2 +- integration/pod_hostname_test.go | 2 +- integration/pod_userns_linux_test.go | 2 +- integration/remote/remote_image.go | 4 +- integration/remote/remote_runtime.go | 4 +- integration/restart_test.go | 4 +- integration/sandbox_run_rollback_test.go | 4 +- integration/shim_dial_unix_test.go | 2 +- integration/truncindex_test.go | 2 +- integration/volume_copy_up_test.go | 2 +- integration/windows_device_test.go | 2 +- integration/windows_hostprocess_test.go | 2 +- integration/windows_rootfs_size_test.go | 2 +- labels/validate.go | 2 +- labels/validate_test.go | 2 +- lease.go | 2 +- leases/plugin/local.go | 12 +- leases/proxy/manager.go | 8 +- metadata/adaptors.go | 14 +- metadata/boltutil/helpers.go | 6 +- metadata/containers.go | 18 +- metadata/containers_test.go | 12 +- metadata/content.go | 12 +- metadata/content_test.go | 14 +- metadata/db.go | 14 +- metadata/db_test.go | 22 +- metadata/gc.go | 4 +- metadata/gc_test.go | 4 +- metadata/images.go | 14 +- metadata/images_test.go | 6 +- metadata/leases.go | 10 +- metadata/leases_test.go | 4 +- metadata/namespaces.go | 8 +- metadata/namespaces_test.go | 6 +- metadata/plugin/plugin.go | 18 +- metadata/sandbox.go | 12 +- metadata/sandbox_test.go | 6 +- metadata/snapshot.go | 16 +- metadata/snapshot_test.go | 16 +- metrics/cgroups/cgroups.go | 16 +- metrics/cgroups/common/type.go | 2 +- metrics/cgroups/metrics_test.go | 14 +- metrics/cgroups/v1/blkio.go | 2 +- metrics/cgroups/v1/cgroups.go | 10 +- metrics/cgroups/v1/cpu.go | 2 +- metrics/cgroups/v1/hugetlb.go | 2 +- metrics/cgroups/v1/memory.go | 2 +- metrics/cgroups/v1/metric.go | 2 +- metrics/cgroups/v1/metrics.go | 10 +- metrics/cgroups/v1/pids.go | 2 +- metrics/cgroups/v2/cgroups.go | 4 +- metrics/cgroups/v2/cpu.go | 2 +- metrics/cgroups/v2/io.go | 2 +- metrics/cgroups/v2/memory.go | 2 +- metrics/cgroups/v2/metric.go | 2 +- metrics/cgroups/v2/metrics.go | 10 +- metrics/cgroups/v2/pids.go | 2 +- metrics/metrics.go | 4 +- mount/losetup_linux.go | 4 +- mount/mount.go | 2 +- mount/mount_idmapped_linux.go | 2 +- namespaces.go | 8 +- namespaces/context.go | 4 +- oci/client.go | 4 +- oci/spec.go | 8 +- oci/spec_opts.go | 12 +- oci/spec_opts_linux.go | 4 +- oci/spec_opts_linux_test.go | 6 +- oci/spec_opts_nonlinux.go | 2 +- oci/spec_opts_nonwindows.go | 2 +- oci/spec_opts_nonwindows_test.go | 2 +- oci/spec_opts_test.go | 8 +- oci/spec_opts_unix.go | 2 +- oci/spec_opts_unix_test.go | 4 +- oci/spec_opts_windows.go | 2 +- oci/spec_opts_windows_test.go | 4 +- oci/spec_test.go | 6 +- oci/utils_unix.go | 2 +- oci/utils_unix_test.go | 2 +- pkg/cri/annotations/annotations.go | 4 +- pkg/cri/bandwidth/fake_shaper.go | 2 +- pkg/cri/bandwidth/unsupported.go | 2 +- pkg/cri/config/config_unix.go | 2 +- pkg/cri/config/config_windows.go | 2 +- pkg/cri/cri.go | 20 +- pkg/cri/instrument/instrumented_service.go | 6 +- pkg/cri/io/container_io.go | 6 +- pkg/cri/io/exec_io.go | 4 +- pkg/cri/io/helpers.go | 2 +- pkg/cri/io/logger.go | 2 +- pkg/cri/io/logger_test.go | 2 +- pkg/cri/nri/nri_api.go | 6 +- pkg/cri/nri/nri_api_linux.go | 20 +- pkg/cri/nri/nri_api_other.go | 12 +- pkg/cri/opts/container.go | 10 +- pkg/cri/opts/spec_darwin_opts.go | 6 +- pkg/cri/opts/spec_linux.go | 4 +- pkg/cri/opts/spec_linux_opts.go | 8 +- pkg/cri/opts/spec_nonlinux.go | 4 +- pkg/cri/opts/spec_nonwindows.go | 6 +- pkg/cri/opts/spec_opts.go | 6 +- pkg/cri/opts/spec_windows.go | 4 +- pkg/cri/opts/spec_windows_opts.go | 6 +- pkg/cri/opts/spec_windows_test.go | 8 +- pkg/cri/server/blockio_linux.go | 2 +- pkg/cri/server/container_attach.go | 4 +- pkg/cri/server/container_create.go | 22 +- pkg/cri/server/container_create_linux.go | 10 +- pkg/cri/server/container_create_linux_test.go | 28 +-- pkg/cri/server/container_create_other.go | 4 +- pkg/cri/server/container_create_other_test.go | 2 +- pkg/cri/server/container_create_test.go | 12 +- pkg/cri/server/container_create_windows.go | 4 +- .../server/container_create_windows_test.go | 4 +- pkg/cri/server/container_execsync.go | 14 +- pkg/cri/server/container_execsync_test.go | 6 +- pkg/cri/server/container_list.go | 2 +- pkg/cri/server/container_list_test.go | 4 +- pkg/cri/server/container_remove.go | 6 +- pkg/cri/server/container_remove_test.go | 2 +- pkg/cri/server/container_start.go | 16 +- pkg/cri/server/container_start_test.go | 2 +- pkg/cri/server/container_stats.go | 2 +- pkg/cri/server/container_stats_list.go | 12 +- pkg/cri/server/container_stats_list_test.go | 6 +- pkg/cri/server/container_status.go | 6 +- pkg/cri/server/container_status_test.go | 8 +- pkg/cri/server/container_stop.go | 10 +- pkg/cri/server/container_stop_test.go | 2 +- pkg/cri/server/container_update_resources.go | 10 +- .../container_update_resources_linux.go | 6 +- .../container_update_resources_linux_test.go | 4 +- .../container_update_resources_other.go | 2 +- .../container_update_resources_windows.go | 6 +- pkg/cri/server/events.go | 22 +- pkg/cri/server/events_test.go | 4 +- pkg/cri/server/fuzz.go | 2 +- pkg/cri/server/helpers.go | 20 +- pkg/cri/server/helpers_linux.go | 12 +- pkg/cri/server/helpers_test.go | 14 +- pkg/cri/server/images/image_list_test.go | 2 +- pkg/cri/server/images/image_pull.go | 20 +- pkg/cri/server/images/image_pull_test.go | 6 +- pkg/cri/server/images/image_remove.go | 6 +- pkg/cri/server/images/image_status.go | 6 +- pkg/cri/server/images/image_status_test.go | 2 +- pkg/cri/server/images/imagefs_info.go | 2 +- pkg/cri/server/images/imagefs_info_test.go | 4 +- pkg/cri/server/images/service.go | 16 +- pkg/cri/server/images/service_test.go | 10 +- pkg/cri/server/images/snapshots.go | 8 +- pkg/cri/server/nri.go | 6 +- pkg/cri/server/nri_linux.go | 2 +- pkg/cri/server/nri_other.go | 2 +- pkg/cri/server/podsandbox/container_linux.go | 4 +- pkg/cri/server/podsandbox/controller.go | 30 +-- pkg/cri/server/podsandbox/controller_test.go | 8 +- pkg/cri/server/podsandbox/helpers.go | 14 +- pkg/cri/server/podsandbox/helpers_linux.go | 10 +- pkg/cri/server/podsandbox/helpers_test.go | 2 +- pkg/cri/server/podsandbox/opts.go | 2 +- pkg/cri/server/podsandbox/recover.go | 10 +- pkg/cri/server/podsandbox/sandbox_delete.go | 6 +- pkg/cri/server/podsandbox/sandbox_run.go | 22 +- .../server/podsandbox/sandbox_run_linux.go | 10 +- .../podsandbox/sandbox_run_linux_test.go | 6 +- .../server/podsandbox/sandbox_run_other.go | 6 +- pkg/cri/server/podsandbox/sandbox_run_test.go | 2 +- .../server/podsandbox/sandbox_run_windows.go | 8 +- .../podsandbox/sandbox_run_windows_test.go | 4 +- pkg/cri/server/podsandbox/sandbox_stats.go | 4 +- pkg/cri/server/podsandbox/sandbox_status.go | 10 +- pkg/cri/server/podsandbox/sandbox_stop.go | 12 +- pkg/cri/server/podsandbox/store.go | 2 +- pkg/cri/server/rdt.go | 2 +- pkg/cri/server/restart.go | 24 +-- pkg/cri/server/runtime_config_linux.go | 4 +- pkg/cri/server/runtime_config_linux_test.go | 6 +- pkg/cri/server/sandbox_list.go | 2 +- pkg/cri/server/sandbox_list_test.go | 2 +- pkg/cri/server/sandbox_portforward.go | 2 +- pkg/cri/server/sandbox_portforward_other.go | 2 +- pkg/cri/server/sandbox_portforward_windows.go | 4 +- pkg/cri/server/sandbox_remove.go | 2 +- pkg/cri/server/sandbox_run.go | 18 +- pkg/cri/server/sandbox_stats_linux.go | 4 +- pkg/cri/server/sandbox_stats_list.go | 4 +- pkg/cri/server/sandbox_stats_other.go | 4 +- pkg/cri/server/sandbox_stats_windows.go | 16 +- pkg/cri/server/sandbox_stats_windows_test.go | 8 +- pkg/cri/server/sandbox_status.go | 4 +- pkg/cri/server/sandbox_status_test.go | 2 +- pkg/cri/server/sandbox_stop.go | 2 +- pkg/cri/server/sandbox_stop_test.go | 2 +- pkg/cri/server/service.go | 34 ++-- pkg/cri/server/service_linux.go | 4 +- pkg/cri/server/service_test.go | 16 +- pkg/cri/server/streaming.go | 2 +- pkg/cri/server/streaming_test.go | 2 +- pkg/cri/server/test_config.go | 2 +- pkg/cri/server/update_runtime_config.go | 2 +- pkg/cri/server/update_runtime_config_test.go | 4 +- pkg/cri/server/version.go | 4 +- pkg/cri/store/container/container.go | 14 +- pkg/cri/store/container/container_test.go | 8 +- pkg/cri/store/image/fake_image.go | 2 +- pkg/cri/store/image/image.go | 14 +- pkg/cri/store/image/image_test.go | 2 +- pkg/cri/store/sandbox/sandbox.go | 14 +- pkg/cri/store/sandbox/sandbox_test.go | 6 +- pkg/cri/store/snapshot/snapshot.go | 4 +- pkg/cri/store/snapshot/snapshot_test.go | 4 +- pkg/cri/util/util.go | 4 +- pkg/display/manifest_printer.go | 4 +- pkg/imageverifier/bindir/bindir.go | 4 +- pkg/imageverifier/bindir/bindir_test.go | 2 +- pkg/kmutex/kmutex_test.go | 2 +- pkg/netns/netns_linux.go | 2 +- pkg/nri/config.go | 2 +- pkg/nri/domain.go | 4 +- pkg/nri/nri.go | 2 +- pkg/nri/plugin/plugin.go | 8 +- pkg/oom/v1/v1.go | 8 +- pkg/oom/v2/v2.go | 8 +- pkg/os/mount_linux.go | 2 +- pkg/os/mount_other.go | 2 +- pkg/os/mount_unix.go | 2 +- pkg/os/mount_windows.go | 2 +- pkg/os/os.go | 2 +- pkg/os/testing/fake_os.go | 4 +- pkg/process/deleted_state.go | 4 +- pkg/process/exec.go | 4 +- pkg/process/init.go | 6 +- pkg/process/init_state.go | 2 +- pkg/process/io.go | 4 +- pkg/process/io_test.go | 2 +- pkg/process/process.go | 2 +- pkg/process/types.go | 2 +- pkg/process/utils.go | 2 +- pkg/runtimeoptions/v1/api.pb.go | 12 +- pkg/runtimeoptions/v1/api.proto | 2 +- pkg/snapshotters/annotations.go | 4 +- pkg/testutil/helpers.go | 2 +- pkg/transfer/archive/exporter.go | 18 +- pkg/transfer/archive/importer.go | 10 +- pkg/transfer/image/imagestore.go | 22 +- pkg/transfer/image/imagestore_test.go | 4 +- pkg/transfer/local/export.go | 4 +- pkg/transfer/local/import.go | 10 +- pkg/transfer/local/progress.go | 6 +- pkg/transfer/local/pull.go | 16 +- pkg/transfer/local/pull_test.go | 8 +- pkg/transfer/local/push.go | 12 +- pkg/transfer/local/tag.go | 2 +- pkg/transfer/local/transfer.go | 16 +- pkg/transfer/plugins/plugins.go | 2 +- pkg/transfer/proxy/transfer.go | 10 +- pkg/transfer/registry/registry.go | 14 +- pkg/transfer/streaming/stream.go | 4 +- pkg/transfer/streaming/stream_test.go | 2 +- pkg/transfer/streaming/writer.go | 4 +- pkg/transfer/transfer.go | 4 +- pkg/ttrpcutil/client.go | 4 +- pkg/unpack/unpacker.go | 22 +- plugin/plugin_test.go | 2 +- plugin/registry/register.go | 2 +- plugins/imageverifier/path_windows.go | 2 +- plugins/imageverifier/plugin.go | 10 +- plugins/sandbox/controller.go | 26 +-- plugins/sandbox/store.go | 8 +- plugins/streaming/manager.go | 18 +- plugins/transfer/plugin.go | 30 +-- plugins/types.go | 2 +- process.go | 8 +- protobuf/plugin/fieldpath.pb.go | 8 +- protobuf/plugin/fieldpath.proto | 2 +- pull.go | 16 +- remotes/docker/auth/fetch.go | 4 +- remotes/docker/authorizer.go | 6 +- remotes/docker/config/hosts.go | 4 +- remotes/docker/config/hosts_test.go | 2 +- remotes/docker/converter.go | 6 +- remotes/docker/converter_fuzz.go | 2 +- remotes/docker/fetcher.go | 6 +- remotes/docker/handler.go | 8 +- remotes/docker/handler_test.go | 4 +- remotes/docker/httpreadseeker.go | 2 +- remotes/docker/pusher.go | 10 +- remotes/docker/pusher_test.go | 8 +- remotes/docker/resolver.go | 16 +- remotes/docker/resolver_test.go | 8 +- remotes/docker/schema1/converter.go | 12 +- remotes/docker/scope.go | 2 +- remotes/docker/scope_test.go | 2 +- remotes/docker/status.go | 4 +- remotes/handlers.go | 10 +- remotes/handlers_test.go | 6 +- remotes/resolver.go | 2 +- rootfs/apply.go | 8 +- rootfs/diff.go | 8 +- rootfs/init.go | 4 +- runtime/events.go | 2 +- runtime/nsmap.go | 4 +- runtime/opts/opts_linux.go | 2 +- runtime/restart/monitor/change.go | 6 +- runtime/restart/monitor/monitor.go | 12 +- runtime/restart/restart.go | 6 +- runtime/restart/restart_test.go | 2 +- runtime/runtime.go | 2 +- runtime/task.go | 2 +- runtime/v2/binary.go | 14 +- runtime/v2/bridge.go | 6 +- runtime/v2/bundle.go | 8 +- runtime/v2/bundle_linux_test.go | 6 +- runtime/v2/bundle_test.go | 2 +- runtime/v2/example/cmd/main.go | 4 +- runtime/v2/example/example.go | 16 +- runtime/v2/manager.go | 30 +-- runtime/v2/manager_unix.go | 2 +- runtime/v2/manager_windows.go | 2 +- runtime/v2/process.go | 10 +- runtime/v2/runc/container.go | 14 +- runtime/v2/runc/manager/manager_linux.go | 16 +- runtime/v2/runc/options/next.pb.txt | 2 +- runtime/v2/runc/options/oci.pb.go | 10 +- runtime/v2/runc/options/oci.proto | 2 +- runtime/v2/runc/pause/sandbox.go | 14 +- runtime/v2/runc/platform.go | 6 +- runtime/v2/runc/task/plugin/plugin_linux.go | 12 +- runtime/v2/runc/task/service.go | 38 ++-- runtime/v2/runc/util.go | 2 +- runtime/v2/shim.go | 26 +-- runtime/v2/shim/publisher.go | 10 +- runtime/v2/shim/shim.go | 20 +- runtime/v2/shim/shim_linux.go | 2 +- runtime/v2/shim/shim_unix.go | 2 +- runtime/v2/shim/shim_windows.go | 2 +- runtime/v2/shim/util.go | 10 +- runtime/v2/shim/util_unix.go | 6 +- runtime/v2/shim_load.go | 10 +- runtime/v2/shim_test.go | 4 +- runtime/v2/shim_windows.go | 2 +- sandbox.go | 10 +- sandbox/bridge.go | 2 +- sandbox/controller.go | 6 +- sandbox/helpers.go | 6 +- sandbox/proxy/controller.go | 12 +- sandbox/proxy/store.go | 6 +- sandbox/store.go | 2 +- services.go | 34 ++-- services/containers/helpers.go | 8 +- services/containers/local.go | 22 +- services/containers/service.go | 12 +- .../content/contentserver/contentserver.go | 10 +- services/content/service.go | 12 +- services/content/store.go | 16 +- services/diff/local.go | 18 +- services/diff/service.go | 10 +- services/events/service.go | 20 +- services/events/ttrpc.go | 12 +- services/healthcheck/service.go | 6 +- services/images/helpers.go | 8 +- services/images/local.go | 30 +-- services/images/service.go | 12 +- services/introspection/introspection.go | 6 +- services/introspection/local.go | 22 +- services/introspection/service.go | 12 +- services/leases/service.go | 16 +- services/namespaces/local.go | 22 +- services/namespaces/service.go | 12 +- services/opt/path_windows.go | 2 +- services/opt/service.go | 6 +- services/sandbox/controller_service.go | 20 +- services/sandbox/sandboxers.go | 10 +- services/sandbox/store_service.go | 14 +- services/server/config/config.go | 4 +- services/server/namespace.go | 2 +- services/server/server.go | 44 ++-- services/server/server_linux.go | 4 +- services/server/server_solaris.go | 2 +- services/server/server_test.go | 6 +- services/server/server_unsupported.go | 2 +- services/server/server_windows.go | 2 +- services/snapshots/service.go | 18 +- services/snapshots/snapshotters.go | 10 +- services/streaming/service.go | 16 +- services/tasks/local.go | 48 ++--- services/tasks/local_darwin.go | 4 +- services/tasks/local_freebsd.go | 4 +- services/tasks/local_unix.go | 4 +- services/tasks/local_windows.go | 4 +- services/tasks/service.go | 12 +- services/transfer/service.go | 20 +- services/version/service.go | 12 +- services/warning/service.go | 8 +- signals.go | 4 +- snapshots/benchsuite/benchmark_test.go | 10 +- snapshots/blockfile/blockfile.go | 8 +- .../blockfile/blockfile_loopsetup_test.go | 2 +- snapshots/blockfile/blockfile_test.go | 6 +- snapshots/blockfile/plugin/plugin.go | 10 +- snapshots/btrfs/btrfs.go | 8 +- snapshots/btrfs/btrfs_test.go | 10 +- snapshots/btrfs/plugin/plugin.go | 10 +- snapshots/devmapper/dmsetup/dmsetup.go | 2 +- snapshots/devmapper/dmsetup/dmsetup_test.go | 4 +- snapshots/devmapper/metadata.go | 2 +- snapshots/devmapper/plugin/plugin.go | 10 +- snapshots/devmapper/pool_device.go | 4 +- snapshots/devmapper/pool_device_test.go | 6 +- snapshots/devmapper/snapshotter.go | 10 +- snapshots/devmapper/snapshotter_test.go | 12 +- snapshots/lcow/lcow.go | 14 +- snapshots/native/native.go | 6 +- snapshots/native/native_test.go | 6 +- snapshots/native/plugin/plugin.go | 10 +- snapshots/overlay/overlay.go | 8 +- snapshots/overlay/overlay_test.go | 14 +- snapshots/overlay/overlayutils/check.go | 6 +- snapshots/overlay/overlayutils/check_test.go | 2 +- snapshots/overlay/plugin/plugin.go | 12 +- snapshots/proxy/proxy.go | 10 +- snapshots/snapshotter.go | 6 +- snapshots/storage/bolt.go | 8 +- snapshots/storage/bolt_test.go | 2 +- snapshots/storage/metastore.go | 2 +- snapshots/storage/metastore_bench_test.go | 2 +- snapshots/storage/metastore_test.go | 4 +- snapshots/testsuite/helpers.go | 6 +- snapshots/testsuite/issues.go | 2 +- snapshots/testsuite/testsuite.go | 12 +- snapshots/windows/windows.go | 16 +- snapshots/windows/windows_test.go | 6 +- snapshotter_opts_unix.go | 2 +- snapshotter_opts_windows.go | 2 +- sys/oom_linux.go | 2 +- sys/oom_linux_test.go | 2 +- task.go | 28 +-- task_opts.go | 10 +- task_opts_unix.go | 2 +- tracing/plugin/otlp.go | 10 +- tracing/plugin/otlp_test.go | 2 +- transfer.go | 14 +- .../github.com/containerd/containerd/LICENSE | 191 ++++++++++++++++++ .../github.com/containerd/containerd/NOTICE | 16 ++ .../containerd/containerd/errdefs/errors.go | 92 +++++++++ .../containerd/containerd/errdefs/grpc.go | 147 ++++++++++++++ .../containerd/log/context_deprecated.go | 149 ++++++++++++++ vendor/modules.txt | 4 + version/version.go | 2 +- 748 files changed, 3443 insertions(+), 2839 deletions(-) create mode 100644 vendor/github.com/containerd/containerd/LICENSE create mode 100644 vendor/github.com/containerd/containerd/NOTICE create mode 100644 vendor/github.com/containerd/containerd/errdefs/errors.go create mode 100644 vendor/github.com/containerd/containerd/errdefs/grpc.go create mode 100644 vendor/github.com/containerd/containerd/log/context_deprecated.go diff --git a/api/events/container.pb.go b/api/events/container.pb.go index d7d40258c31c..4024f758550f 100644 --- a/api/events/container.pb.go +++ b/api/events/container.pb.go @@ -22,7 +22,7 @@ package events import ( - _ "github.com/containerd/containerd/protobuf/plugin" + _ "github.com/containerd/containerd/v2/protobuf/plugin" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -316,11 +316,11 @@ var file_github_com_containerd_containerd_api_events_container_proto_rawDesc = [ 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x21, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, - 0x38, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, + 0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, - 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, - 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, + 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/events/container.proto b/api/events/container.proto index 29fd18f88dde..c1e82daad23c 100644 --- a/api/events/container.proto +++ b/api/events/container.proto @@ -21,7 +21,7 @@ package containerd.events; import "google/protobuf/any.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/events;events"; +option go_package = "github.com/containerd/containerd/v2/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message ContainerCreate { diff --git a/api/events/content.pb.go b/api/events/content.pb.go index 9e3f843e2bff..b9b1e984f226 100644 --- a/api/events/content.pb.go +++ b/api/events/content.pb.go @@ -22,7 +22,7 @@ package events import ( - _ "github.com/containerd/containerd/protobuf/plugin" + _ "github.com/containerd/containerd/v2/protobuf/plugin" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -97,11 +97,11 @@ var file_github_com_containerd_containerd_api_events_content_proto_rawDesc = []b 0x2f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x70, 0x61, 0x74, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x42, 0x38, 0x5a, 0x32, 0x67, 0x69, 0x74, + 0x09, 0x52, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x42, 0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, - 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, - 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, + 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/events/content.proto b/api/events/content.proto index 97d424139147..e807e746e0f2 100644 --- a/api/events/content.proto +++ b/api/events/content.proto @@ -20,7 +20,7 @@ package containerd.events; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/events;events"; +option go_package = "github.com/containerd/containerd/v2/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message ContentDelete { diff --git a/api/events/image.pb.go b/api/events/image.pb.go index 111af29e6c70..3c9bb11fb983 100644 --- a/api/events/image.pb.go +++ b/api/events/image.pb.go @@ -22,7 +22,7 @@ package events import ( - _ "github.com/containerd/containerd/protobuf/plugin" + _ "github.com/containerd/containerd/v2/protobuf/plugin" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -229,11 +229,11 @@ var file_github_com_containerd_containerd_api_events_image_proto_rawDesc = []byt 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x21, 0x0a, 0x0b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x38, 0x5a, 0x32, 0x67, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, - 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, + 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/events/image.proto b/api/events/image.proto index c09c7384f3af..3e8aa05c6052 100644 --- a/api/events/image.proto +++ b/api/events/image.proto @@ -20,7 +20,7 @@ package containerd.services.images.v1; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/events;events"; +option go_package = "github.com/containerd/containerd/v2/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message ImageCreate { diff --git a/api/events/namespace.pb.go b/api/events/namespace.pb.go index 801c1219e8a9..b85d3f2f5e79 100644 --- a/api/events/namespace.pb.go +++ b/api/events/namespace.pb.go @@ -22,7 +22,7 @@ package events import ( - _ "github.com/containerd/containerd/protobuf/plugin" + _ "github.com/containerd/containerd/v2/protobuf/plugin" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -229,11 +229,11 @@ var file_github_com_containerd_containerd_api_events_namespace_proto_rawDesc = [ 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x25, 0x0a, 0x0f, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, - 0x38, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, + 0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, - 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, - 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, + 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/events/namespace.proto b/api/events/namespace.proto index 9bae531d7fe5..8aea0aeb2ecf 100644 --- a/api/events/namespace.proto +++ b/api/events/namespace.proto @@ -20,7 +20,7 @@ package containerd.events; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/events;events"; +option go_package = "github.com/containerd/containerd/v2/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message NamespaceCreate { diff --git a/api/events/sandbox.pb.go b/api/events/sandbox.pb.go index 08f5e70e48a6..0567025a26d6 100644 --- a/api/events/sandbox.pb.go +++ b/api/events/sandbox.pb.go @@ -217,11 +217,11 @@ var file_github_com_containerd_containerd_api_events_sandbox_proto_rawDesc = []b 0x0a, 0x09, 0x65, 0x78, 0x69, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x65, - 0x78, 0x69, 0x74, 0x65, 0x64, 0x41, 0x74, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x78, 0x69, 0x74, 0x65, 0x64, 0x41, 0x74, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/events/sandbox.proto b/api/events/sandbox.proto index f1c5195e5a72..43fbee702f00 100644 --- a/api/events/sandbox.proto +++ b/api/events/sandbox.proto @@ -20,7 +20,7 @@ package containerd.events; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/events;events"; +option go_package = "github.com/containerd/containerd/v2/api/events;events"; message SandboxCreate { string sandbox_id = 1; diff --git a/api/events/snapshot.pb.go b/api/events/snapshot.pb.go index e074f9df21c3..4438a51e7dee 100644 --- a/api/events/snapshot.pb.go +++ b/api/events/snapshot.pb.go @@ -22,7 +22,7 @@ package events import ( - _ "github.com/containerd/containerd/protobuf/plugin" + _ "github.com/containerd/containerd/v2/protobuf/plugin" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -245,11 +245,11 @@ var file_github_com_containerd_containerd_api_events_snapshot_proto_rawDesc = [] 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x74, 0x65, 0x72, - 0x42, 0x38, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, + 0x42, 0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, - 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, - 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, + 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/events/snapshot.proto b/api/events/snapshot.proto index effd86913679..81842a49f2b9 100644 --- a/api/events/snapshot.proto +++ b/api/events/snapshot.proto @@ -20,7 +20,7 @@ package containerd.events; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/events;events"; +option go_package = "github.com/containerd/containerd/v2/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message SnapshotPrepare { diff --git a/api/events/task.pb.go b/api/events/task.pb.go index 33fd521b6c87..952990a32ebf 100644 --- a/api/events/task.pb.go +++ b/api/events/task.pb.go @@ -22,8 +22,8 @@ package events import ( - types "github.com/containerd/containerd/api/types" - _ "github.com/containerd/containerd/protobuf/plugin" + types "github.com/containerd/containerd/v2/api/types" + _ "github.com/containerd/containerd/v2/protobuf/plugin" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" @@ -813,11 +813,12 @@ var file_github_com_containerd_containerd_api_events_task_proto_rawDesc = []byte 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x38, 0x5a, 0x32, + 0x52, 0x0a, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, - 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/api/events/task.proto b/api/events/task.proto index 238564dfe2d0..3e82b415b377 100644 --- a/api/events/task.proto +++ b/api/events/task.proto @@ -22,7 +22,7 @@ import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -option go_package = "github.com/containerd/containerd/api/events;events"; +option go_package = "github.com/containerd/containerd/v2/api/events;events"; option (containerd.plugin.fieldpath_all) = true; message TaskCreate { diff --git a/api/next.pb.txt b/api/next.pb.txt index c68107a5f406..26715ff08fa1 100644 --- a/api/next.pb.txt +++ b/api/next.pb.txt @@ -49,7 +49,7 @@ file { json_name: "fieldpath" } options { - go_package: "github.com/containerd/containerd/protobuf/plugin" + go_package: "github.com/containerd/containerd/v2/protobuf/plugin" } } file { @@ -163,7 +163,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/events;events" + go_package: "github.com/containerd/containerd/v2/api/events;events" 63300: 1 } syntax: "proto3" @@ -183,7 +183,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/events;events" + go_package: "github.com/containerd/containerd/v2/api/events;events" 63300: 1 } syntax: "proto3" @@ -279,7 +279,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/events;events" + go_package: "github.com/containerd/containerd/v2/api/events;events" 63300: 1 } syntax: "proto3" @@ -375,7 +375,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/events;events" + go_package: "github.com/containerd/containerd/v2/api/events;events" 63300: 1 } syntax: "proto3" @@ -461,7 +461,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/events;events" + go_package: "github.com/containerd/containerd/v2/api/events;events" } syntax: "proto3" } @@ -535,7 +535,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/events;events" + go_package: "github.com/containerd/containerd/v2/api/events;events" 63300: 1 } syntax: "proto3" @@ -575,7 +575,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types;types" + go_package: "github.com/containerd/containerd/v2/api/types;types" } syntax: "proto3" } @@ -847,7 +847,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/events;events" + go_package: "github.com/containerd/containerd/v2/api/events;events" 63300: 1 } syntax: "proto3" @@ -880,7 +880,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types;types" + go_package: "github.com/containerd/containerd/v2/api/types;types" } syntax: "proto3" } @@ -916,7 +916,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types;types" + go_package: "github.com/containerd/containerd/v2/api/types;types" } syntax: "proto3" } @@ -1334,7 +1334,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/runtime/sandbox/v1;sandbox" + go_package: "github.com/containerd/containerd/v2/api/runtime/sandbox/v1;sandbox" } syntax: "proto3" } @@ -1481,7 +1481,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types/task" + go_package: "github.com/containerd/containerd/v2/api/types/task" } syntax: "proto3" } @@ -2196,7 +2196,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/runtime/task/v2;task" + go_package: "github.com/containerd/containerd/v2/api/runtime/task/v2;task" } syntax: "proto3" } @@ -2911,7 +2911,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/runtime/task/v3;task" + go_package: "github.com/containerd/containerd/v2/api/runtime/task/v3;task" } syntax: "proto3" } @@ -3241,7 +3241,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/containers/v1;containers" + go_package: "github.com/containerd/containerd/v2/api/services/containers/v1;containers" } syntax: "proto3" } @@ -3724,7 +3724,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/content/v1;content" + go_package: "github.com/containerd/containerd/v2/api/services/content/v1;content" } syntax: "proto3" } @@ -3784,7 +3784,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types;types" + go_package: "github.com/containerd/containerd/v2/api/types;types" } syntax: "proto3" } @@ -3948,7 +3948,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/diff/v1;diff" + go_package: "github.com/containerd/containerd/v2/api/services/diff/v1;diff" } syntax: "proto3" } @@ -4054,7 +4054,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/events/v1;events" + go_package: "github.com/containerd/containerd/v2/api/services/events/v1;events" } syntax: "proto3" } @@ -4296,7 +4296,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/images/v1;images" + go_package: "github.com/containerd/containerd/v2/api/services/images/v1;images" } syntax: "proto3" } @@ -4512,7 +4512,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/introspection/v1;introspection" + go_package: "github.com/containerd/containerd/v2/api/services/introspection/v1;introspection" } syntax: "proto3" } @@ -4762,7 +4762,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/leases/v1;leases" + go_package: "github.com/containerd/containerd/v2/api/services/leases/v1;leases" } syntax: "proto3" } @@ -4942,7 +4942,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/namespaces/v1;namespaces" + go_package: "github.com/containerd/containerd/v2/api/services/namespaces/v1;namespaces" } syntax: "proto3" } @@ -5076,7 +5076,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types;types" + go_package: "github.com/containerd/containerd/v2/api/types;types" } syntax: "proto3" } @@ -5653,7 +5653,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/sandbox/v1;sandbox" + go_package: "github.com/containerd/containerd/v2/api/services/sandbox/v1;sandbox" } syntax: "proto3" } @@ -6167,7 +6167,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/snapshots/v1;snapshots" + go_package: "github.com/containerd/containerd/v2/api/services/snapshots/v1;snapshots" } syntax: "proto3" } @@ -6196,7 +6196,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/streaming/v1;streaming" + go_package: "github.com/containerd/containerd/v2/api/services/streaming/v1;streaming" } syntax: "proto3" } @@ -6841,7 +6841,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/tasks/v1;tasks" + go_package: "github.com/containerd/containerd/v2/api/services/tasks/v1;tasks" } syntax: "proto3" } @@ -6896,7 +6896,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/transfer/v1;transfer" + go_package: "github.com/containerd/containerd/v2/api/services/transfer/v1;transfer" } syntax: "proto3" } @@ -6963,7 +6963,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/ttrpc/events/v1;events" + go_package: "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1;events" } syntax: "proto3" } @@ -6997,7 +6997,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/services/version/v1;version" + go_package: "github.com/containerd/containerd/v2/api/services/version/v1;version" } syntax: "proto3" } @@ -7138,7 +7138,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types/transfer" + go_package: "github.com/containerd/containerd/v2/api/types/transfer" } syntax: "proto3" } @@ -7217,7 +7217,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types/transfer" + go_package: "github.com/containerd/containerd/v2/api/types/transfer" } syntax: "proto3" } @@ -7263,7 +7263,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types/transfer" + go_package: "github.com/containerd/containerd/v2/api/types/transfer" } syntax: "proto3" } @@ -7404,7 +7404,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types/transfer" + go_package: "github.com/containerd/containerd/v2/api/types/transfer" } syntax: "proto3" } @@ -7432,7 +7432,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/api/types/transfer" + go_package: "github.com/containerd/containerd/v2/api/types/transfer" } syntax: "proto3" } diff --git a/api/runtime/sandbox/v1/sandbox.pb.go b/api/runtime/sandbox/v1/sandbox.pb.go index 8701fbae5ce2..c4a04c2fe9d8 100644 --- a/api/runtime/sandbox/v1/sandbox.pb.go +++ b/api/runtime/sandbox/v1/sandbox.pb.go @@ -22,7 +22,7 @@ package sandbox import ( - types "github.com/containerd/containerd/api/types" + types "github.com/containerd/containerd/v2/api/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -1287,12 +1287,12 @@ var file_github_com_containerd_containerd_api_runtime_sandbox_v1_sandbox_proto_r 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x4d, 0x65, 0x74, 0x72, - 0x69, 0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x41, 0x5a, 0x3f, 0x67, + 0x69, 0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x73, 0x61, 0x6e, 0x64, - 0x62, 0x6f, 0x78, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x73, + 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, + 0x78, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/runtime/sandbox/v1/sandbox.proto b/api/runtime/sandbox/v1/sandbox.proto index 0cf801c909c2..e08a60be8384 100644 --- a/api/runtime/sandbox/v1/sandbox.proto +++ b/api/runtime/sandbox/v1/sandbox.proto @@ -25,7 +25,7 @@ import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/platform.proto"; import "github.com/containerd/containerd/api/types/metrics.proto"; -option go_package = "github.com/containerd/containerd/api/runtime/sandbox/v1;sandbox"; +option go_package = "github.com/containerd/containerd/v2/api/runtime/sandbox/v1;sandbox"; // Sandbox is an optional interface that shim may implement to support sandboxes environments. // A typical example of sandbox is microVM or pause container - an entity that groups containers and/or diff --git a/api/runtime/task/v2/shim.pb.go b/api/runtime/task/v2/shim.pb.go index 383e29db4012..d5d7bafd6bdd 100644 --- a/api/runtime/task/v2/shim.pb.go +++ b/api/runtime/task/v2/shim.pb.go @@ -22,8 +22,8 @@ package task import ( - types "github.com/containerd/containerd/api/types" - task "github.com/containerd/containerd/api/types/task" + types "github.com/containerd/containerd/v2/api/types" + task "github.com/containerd/containerd/v2/api/types/task" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -1889,11 +1889,11 @@ var file_github_com_containerd_containerd_api_runtime_task_v2_shim_proto_rawDesc 0x65, 0x72, 0x64, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x68, 0x75, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x70, 0x74, 0x79, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x75, 0x6e, 0x74, - 0x69, 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x76, 0x32, 0x3b, 0x74, 0x61, 0x73, 0x6b, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, + 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x76, 0x32, 0x3b, 0x74, + 0x61, 0x73, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/runtime/task/v2/shim.proto b/api/runtime/task/v2/shim.proto index aad1bd66fdf7..a7a5245b82b2 100644 --- a/api/runtime/task/v2/shim.proto +++ b/api/runtime/task/v2/shim.proto @@ -24,7 +24,7 @@ import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/task/task.proto"; -option go_package = "github.com/containerd/containerd/api/runtime/task/v2;task"; +option go_package = "github.com/containerd/containerd/v2/api/runtime/task/v2;task"; // Shim service is launched for each container and is responsible for owning the IO // for the container and its additional processes. The shim is also the parent of diff --git a/api/runtime/task/v3/shim.pb.go b/api/runtime/task/v3/shim.pb.go index 288b97b3ff30..a3d4f9ac1bae 100644 --- a/api/runtime/task/v3/shim.pb.go +++ b/api/runtime/task/v3/shim.pb.go @@ -22,8 +22,8 @@ package task import ( - types "github.com/containerd/containerd/api/types" - task "github.com/containerd/containerd/api/types/task" + types "github.com/containerd/containerd/v2/api/types" + task "github.com/containerd/containerd/v2/api/types/task" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -1889,11 +1889,11 @@ var file_github_com_containerd_containerd_api_runtime_task_v3_shim_proto_rawDesc 0x65, 0x72, 0x64, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x68, 0x75, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x70, 0x74, 0x79, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x75, 0x6e, 0x74, - 0x69, 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x61, 0x73, 0x6b, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, + 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x76, 0x33, 0x3b, 0x74, + 0x61, 0x73, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/runtime/task/v3/shim.proto b/api/runtime/task/v3/shim.proto index ca2c716998fa..b634ee566327 100644 --- a/api/runtime/task/v3/shim.proto +++ b/api/runtime/task/v3/shim.proto @@ -24,7 +24,7 @@ import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/task/task.proto"; -option go_package = "github.com/containerd/containerd/api/runtime/task/v3;task"; +option go_package = "github.com/containerd/containerd/v2/api/runtime/task/v3;task"; // Shim service is launched for each container and is responsible for owning the IO // for the container and its additional processes. The shim is also the parent of diff --git a/api/services/containers/v1/containers.pb.go b/api/services/containers/v1/containers.pb.go index aab9e45b1264..119bb13f603f 100644 --- a/api/services/containers/v1/containers.pb.go +++ b/api/services/containers/v1/containers.pb.go @@ -929,12 +929,12 @@ var file_github_com_containerd_containerd_api_services_containers_v1_containers_ 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x79, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x2f, 0x76, 0x31, - 0x3b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, + 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/containers/v1/containers.proto b/api/services/containers/v1/containers.proto index 3de07ffbd6e6..83a65d90610b 100644 --- a/api/services/containers/v1/containers.proto +++ b/api/services/containers/v1/containers.proto @@ -23,7 +23,7 @@ import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/services/containers/v1;containers"; +option go_package = "github.com/containerd/containerd/v2/api/services/containers/v1;containers"; // Containers provides metadata storage for containers used in the execution // service. diff --git a/api/services/content/v1/content.pb.go b/api/services/content/v1/content.pb.go index 28366466288e..be4c84f47487 100644 --- a/api/services/content/v1/content.pb.go +++ b/api/services/content/v1/content.pb.go @@ -1452,12 +1452,12 @@ var file_github_com_containerd_containerd_api_services_content_v1_content_proto_ 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x62, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, - 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/content/v1/content.proto b/api/services/content/v1/content.proto index 8aea0636b84f..20bab263167a 100644 --- a/api/services/content/v1/content.proto +++ b/api/services/content/v1/content.proto @@ -22,7 +22,7 @@ import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/empty.proto"; -option go_package = "github.com/containerd/containerd/api/services/content/v1;content"; +option go_package = "github.com/containerd/containerd/v2/api/services/content/v1;content"; // Content provides access to a content addressable storage system. service Content { diff --git a/api/services/diff/v1/diff.pb.go b/api/services/diff/v1/diff.pb.go index 4552734ab510..7c0b8e63a559 100644 --- a/api/services/diff/v1/diff.pb.go +++ b/api/services/diff/v1/diff.pb.go @@ -22,7 +22,7 @@ package diff import ( - types "github.com/containerd/containerd/api/types" + types "github.com/containerd/containerd/v2/api/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -383,12 +383,12 @@ var file_github_com_containerd_containerd_api_services_diff_v1_diff_proto_rawDes 0x66, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x64, 0x69, 0x66, 0x66, 0x2e, 0x76, 0x31, 0x2e, 0x44, - 0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3c, 0x5a, 0x3a, 0x67, + 0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x64, 0x69, 0x66, - 0x66, 0x2f, 0x76, 0x31, 0x3b, 0x64, 0x69, 0x66, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, + 0x64, 0x69, 0x66, 0x66, 0x2f, 0x76, 0x31, 0x3b, 0x64, 0x69, 0x66, 0x66, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/diff/v1/diff.proto b/api/services/diff/v1/diff.proto index 17a26211c601..62b308cd902e 100644 --- a/api/services/diff/v1/diff.proto +++ b/api/services/diff/v1/diff.proto @@ -23,7 +23,7 @@ import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto"; -option go_package = "github.com/containerd/containerd/api/services/diff/v1;diff"; +option go_package = "github.com/containerd/containerd/v2/api/services/diff/v1;diff"; // Diff service creates and applies diffs service Diff { diff --git a/api/services/events/v1/events.pb.go b/api/services/events/v1/events.pb.go index f083d9fce29c..a2005c0b12a1 100644 --- a/api/services/events/v1/events.pb.go +++ b/api/services/events/v1/events.pb.go @@ -22,7 +22,7 @@ package events import ( - _ "github.com/containerd/containerd/protobuf/plugin" + _ "github.com/containerd/containerd/v2/protobuf/plugin" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -319,12 +319,12 @@ var file_github_com_containerd_containerd_api_services_events_v1_events_proto_ra 0x76, 0x31, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, - 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x30, 0x01, 0x42, 0x40, - 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, + 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x30, 0x01, 0x42, 0x43, + 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, - 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, - 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x76, 0x65, + 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/events/v1/events.proto b/api/services/events/v1/events.proto index 3e0f11ffb840..fcc16a38659a 100644 --- a/api/services/events/v1/events.proto +++ b/api/services/events/v1/events.proto @@ -23,7 +23,7 @@ import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; +option go_package = "github.com/containerd/containerd/v2/api/services/events/v1;events"; service Events { // Publish an event to a topic. diff --git a/api/services/images/v1/images.pb.go b/api/services/images/v1/images.pb.go index ef5b7faa2c29..0866da6919d7 100644 --- a/api/services/images/v1/images.pb.go +++ b/api/services/images/v1/images.pb.go @@ -22,7 +22,7 @@ package images import ( - types "github.com/containerd/containerd/api/types" + types "github.com/containerd/containerd/v2/api/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" @@ -746,11 +746,11 @@ var file_github_com_containerd_containerd_api_services_images_v1_images_proto_ra 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, - 0x42, 0x40, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, + 0x42, 0x43, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, - 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x73, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x73, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/images/v1/images.proto b/api/services/images/v1/images.proto index 2f47ab284de9..7e86feadaf43 100644 --- a/api/services/images/v1/images.proto +++ b/api/services/images/v1/images.proto @@ -23,7 +23,7 @@ import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto"; -option go_package = "github.com/containerd/containerd/api/services/images/v1;images"; +option go_package = "github.com/containerd/containerd/v2/api/services/images/v1;images"; // Images is a service that allows one to register images with containerd. // diff --git a/api/services/introspection/v1/introspection.pb.go b/api/services/introspection/v1/introspection.pb.go index 7768f81313ec..869459c93588 100644 --- a/api/services/introspection/v1/introspection.pb.go +++ b/api/services/introspection/v1/introspection.pb.go @@ -22,7 +22,7 @@ package introspection import ( - types "github.com/containerd/containerd/api/types" + types "github.com/containerd/containerd/v2/api/types" status "google.golang.org/genproto/googleapis/rpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -486,12 +486,12 @@ var file_github_com_containerd_containerd_api_services_introspection_v1_introspe 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x42, 0x4e, 0x5a, 0x4c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x65, 0x42, 0x51, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x73, 0x2f, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/introspection/v1/introspection.proto b/api/services/introspection/v1/introspection.proto index f27f1912e79d..7ec1961eb321 100644 --- a/api/services/introspection/v1/introspection.proto +++ b/api/services/introspection/v1/introspection.proto @@ -23,7 +23,7 @@ import "google/rpc/status.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/services/introspection/v1;introspection"; +option go_package = "github.com/containerd/containerd/v2/api/services/introspection/v1;introspection"; service Introspection { // Plugins returns a list of plugins in containerd. diff --git a/api/services/leases/v1/leases.pb.go b/api/services/leases/v1/leases.pb.go index 2a66f0f8b86b..4f0edbb76b08 100644 --- a/api/services/leases/v1/leases.pb.go +++ b/api/services/leases/v1/leases.pb.go @@ -736,11 +736,11 @@ var file_github_com_containerd_containerd_api_services_leases_v1_leases_proto_ra 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x42, 0x40, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, + 0x42, 0x43, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, - 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x73, 0x2f, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x6c, 0x65, 0x61, 0x73, - 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x73, 0x2f, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x6c, + 0x65, 0x61, 0x73, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/leases/v1/leases.proto b/api/services/leases/v1/leases.proto index 8551fcea7f64..45b8c94863a8 100644 --- a/api/services/leases/v1/leases.proto +++ b/api/services/leases/v1/leases.proto @@ -20,7 +20,7 @@ package containerd.services.leases.v1; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/services/leases/v1;leases"; +option go_package = "github.com/containerd/containerd/v2/api/services/leases/v1;leases"; // Leases service manages resources leases within the metadata store. service Leases { diff --git a/api/services/namespaces/v1/namespace.pb.go b/api/services/namespaces/v1/namespace.pb.go index a75a315c43c4..4a98228569bb 100644 --- a/api/services/namespaces/v1/namespace.pb.go +++ b/api/services/namespaces/v1/namespace.pb.go @@ -657,12 +657,12 @@ var file_github_com_containerd_containerd_api_services_namespaces_v1_namespace_p 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, - 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, + 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, - 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, - 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x6e, - 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x73, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x76, + 0x31, 0x3b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/namespaces/v1/namespace.proto b/api/services/namespaces/v1/namespace.proto index 910bcd6c7208..2958f726af2a 100644 --- a/api/services/namespaces/v1/namespace.proto +++ b/api/services/namespaces/v1/namespace.proto @@ -21,7 +21,7 @@ package containerd.services.namespaces.v1; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; -option go_package = "github.com/containerd/containerd/api/services/namespaces/v1;namespaces"; +option go_package = "github.com/containerd/containerd/v2/api/services/namespaces/v1;namespaces"; // Namespaces provides the ability to manipulate containerd namespaces. // diff --git a/api/services/sandbox/v1/sandbox.pb.go b/api/services/sandbox/v1/sandbox.pb.go index 8e74928dc894..64af04b9cc93 100644 --- a/api/services/sandbox/v1/sandbox.pb.go +++ b/api/services/sandbox/v1/sandbox.pb.go @@ -30,7 +30,7 @@ package sandbox import ( - types "github.com/containerd/containerd/api/types" + types "github.com/containerd/containerd/v2/api/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -1742,12 +1742,12 @@ var file_github_com_containerd_containerd_api_services_sandbox_v1_sandbox_proto_ 0x39, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x72, 0x69, - 0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, + 0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, - 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x61, 0x6e, 0x64, - 0x62, 0x6f, 0x78, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, + 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, + 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, + 0x78, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/sandbox/v1/sandbox.proto b/api/services/sandbox/v1/sandbox.proto index 8b384be4cbb0..fb57e775b236 100755 --- a/api/services/sandbox/v1/sandbox.proto +++ b/api/services/sandbox/v1/sandbox.proto @@ -33,7 +33,7 @@ import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/platform.proto"; import "github.com/containerd/containerd/api/types/metrics.proto"; -option go_package = "github.com/containerd/containerd/api/services/sandbox/v1;sandbox"; +option go_package = "github.com/containerd/containerd/v2/api/services/sandbox/v1;sandbox"; // Store provides a metadata storage interface for sandboxes. Similarly to `Containers`, // sandbox object includes info required to start a new instance, but no runtime state. diff --git a/api/services/snapshots/v1/snapshots.pb.go b/api/services/snapshots/v1/snapshots.pb.go index b7cec8048bb3..007c46ec02e7 100644 --- a/api/services/snapshots/v1/snapshots.pb.go +++ b/api/services/snapshots/v1/snapshots.pb.go @@ -22,7 +22,7 @@ package snapshots import ( - types "github.com/containerd/containerd/api/types" + types "github.com/containerd/containerd/v2/api/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" @@ -1376,12 +1376,12 @@ var file_github_com_containerd_containerd_api_services_snapshots_v1_snapshots_pr 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, - 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x6e, 0x61, 0x70, - 0x73, 0x68, 0x6f, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, - 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, + 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, + 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x6e, 0x61, 0x70, + 0x73, 0x68, 0x6f, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/snapshots/v1/snapshots.proto b/api/services/snapshots/v1/snapshots.proto index 170ff473e2a3..6e4d73497468 100644 --- a/api/services/snapshots/v1/snapshots.proto +++ b/api/services/snapshots/v1/snapshots.proto @@ -23,7 +23,7 @@ import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; -option go_package = "github.com/containerd/containerd/api/services/snapshots/v1;snapshots"; +option go_package = "github.com/containerd/containerd/v2/api/services/snapshots/v1;snapshots"; // Snapshot service manages snapshots service Snapshots { diff --git a/api/services/streaming/v1/streaming.pb.go b/api/services/streaming/v1/streaming.pb.go index 08fb6392ecb9..57c7bef5cec0 100644 --- a/api/services/streaming/v1/streaming.pb.go +++ b/api/services/streaming/v1/streaming.pb.go @@ -100,12 +100,13 @@ var file_github_com_containerd_containerd_api_services_streaming_v1_streaming_pr 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x38, 0x0a, 0x06, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x1a, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x28, 0x01, 0x30, 0x01, 0x42, 0x46, - 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x28, 0x01, 0x30, 0x01, 0x42, 0x49, + 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, - 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, - 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x74, 0x72, - 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x2f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x3b, + 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/api/services/streaming/v1/streaming.proto b/api/services/streaming/v1/streaming.proto index 4c14f2ecfa09..f9a73b01d911 100644 --- a/api/services/streaming/v1/streaming.proto +++ b/api/services/streaming/v1/streaming.proto @@ -20,7 +20,7 @@ package containerd.services.streaming.v1; import "google/protobuf/any.proto"; -option go_package = "github.com/containerd/containerd/api/services/streaming/v1;streaming"; +option go_package = "github.com/containerd/containerd/v2/api/services/streaming/v1;streaming"; service Streaming { rpc Stream(stream google.protobuf.Any) returns (stream google.protobuf.Any); diff --git a/api/services/tasks/v1/tasks.pb.go b/api/services/tasks/v1/tasks.pb.go index 1a55d696dd59..87ce5f21e989 100644 --- a/api/services/tasks/v1/tasks.pb.go +++ b/api/services/tasks/v1/tasks.pb.go @@ -22,8 +22,8 @@ package tasks import ( - types "github.com/containerd/containerd/api/types" - task "github.com/containerd/containerd/api/types/task" + types "github.com/containerd/containerd/v2/api/types" + task "github.com/containerd/containerd/v2/api/types/task" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -1893,11 +1893,11 @@ var file_github_com_containerd_containerd_api_services_tasks_v1_tasks_proto_rawD 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, + 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, - 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x61, 0x73, 0x6b, 0x73, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x61, + 0x73, 0x6b, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/tasks/v1/tasks.proto b/api/services/tasks/v1/tasks.proto index 8ddd31926029..89fa69a0e7b1 100644 --- a/api/services/tasks/v1/tasks.proto +++ b/api/services/tasks/v1/tasks.proto @@ -26,7 +26,7 @@ import "github.com/containerd/containerd/api/types/descriptor.proto"; import "github.com/containerd/containerd/api/types/task/task.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/services/tasks/v1;tasks"; +option go_package = "github.com/containerd/containerd/v2/api/services/tasks/v1;tasks"; service Tasks { // Create a task. diff --git a/api/services/transfer/v1/transfer.pb.go b/api/services/transfer/v1/transfer.pb.go index b6e959babd56..39b5052c5ca2 100644 --- a/api/services/transfer/v1/transfer.pb.go +++ b/api/services/transfer/v1/transfer.pb.go @@ -182,12 +182,12 @@ var file_github_com_containerd_containerd_api_services_transfer_v1_transfer_prot 0x63, 0x65, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x47, 0x5a, 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, - 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x66, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/transfer/v1/transfer.proto b/api/services/transfer/v1/transfer.proto index a8f25ee593ef..b01d13f87a33 100644 --- a/api/services/transfer/v1/transfer.proto +++ b/api/services/transfer/v1/transfer.proto @@ -21,7 +21,7 @@ package containerd.services.transfer.v1; import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; -option go_package = "github.com/containerd/containerd/api/services/transfer/v1;transfer"; +option go_package = "github.com/containerd/containerd/v2/api/services/transfer/v1;transfer"; service Transfer { rpc Transfer(TransferRequest) returns (google.protobuf.Empty); diff --git a/api/services/ttrpc/events/v1/events.pb.go b/api/services/ttrpc/events/v1/events.pb.go index 221b183f7cef..d8c9af268fc6 100644 --- a/api/services/ttrpc/events/v1/events.pb.go +++ b/api/services/ttrpc/events/v1/events.pb.go @@ -22,7 +22,7 @@ package events import ( - _ "github.com/containerd/containerd/protobuf/plugin" + _ "github.com/containerd/containerd/v2/protobuf/plugin" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -199,12 +199,12 @@ var file_github_com_containerd_containerd_api_services_ttrpc_events_v1_events_pr 0x73, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x74, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, - 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, - 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x74, 0x72, 0x70, 0x63, 0x2f, - 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x74, 0x72, + 0x70, 0x63, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x76, 0x65, + 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/ttrpc/events/v1/events.proto b/api/services/ttrpc/events/v1/events.proto index e0c2f232d364..153f7bc46031 100644 --- a/api/services/ttrpc/events/v1/events.proto +++ b/api/services/ttrpc/events/v1/events.proto @@ -23,7 +23,7 @@ import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/services/ttrpc/events/v1;events"; +option go_package = "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1;events"; service Events { // Forward sends an event that has already been packaged into an envelope diff --git a/api/services/version/v1/version.pb.go b/api/services/version/v1/version.pb.go index c087d3e26be1..3516c294d53b 100644 --- a/api/services/version/v1/version.pb.go +++ b/api/services/version/v1/version.pb.go @@ -112,12 +112,12 @@ var file_github_com_containerd_containerd_api_services_version_v1_version_proto_ 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2f, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x42, 0x5a, - 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x45, 0x5a, + 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, - 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x76, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/version/v1/version.proto b/api/services/version/v1/version.proto index bd948ff343b3..eec0a5714c4c 100644 --- a/api/services/version/v1/version.proto +++ b/api/services/version/v1/version.proto @@ -21,7 +21,7 @@ package containerd.services.version.v1; import "google/protobuf/empty.proto"; // TODO(stevvooe): Should version service actually be versioned? -option go_package = "github.com/containerd/containerd/api/services/version/v1;version"; +option go_package = "github.com/containerd/containerd/v2/api/services/version/v1;version"; service Version { rpc Version(google.protobuf.Empty) returns (VersionResponse); diff --git a/api/types/descriptor.pb.go b/api/types/descriptor.pb.go index f3db1c52d960..22ca902c1ec7 100644 --- a/api/types/descriptor.pb.go +++ b/api/types/descriptor.pb.go @@ -133,11 +133,11 @@ var file_github_com_containerd_containerd_api_types_descriptor_proto_rawDesc = [ 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, - 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, + 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/descriptor.proto b/api/types/descriptor.proto index faaf416dd10c..7a564138ab4b 100644 --- a/api/types/descriptor.proto +++ b/api/types/descriptor.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package containerd.types; -option go_package = "github.com/containerd/containerd/api/types;types"; +option go_package = "github.com/containerd/containerd/v2/api/types;types"; // Descriptor describes a blob in a content store. // diff --git a/api/types/metrics.pb.go b/api/types/metrics.pb.go index b18ce1c5b609..44db41eafe20 100644 --- a/api/types/metrics.pb.go +++ b/api/types/metrics.pb.go @@ -119,11 +119,11 @@ var file_github_com_containerd_containerd_api_types_metrics_proto_rawDesc = []by 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, - 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/metrics.proto b/api/types/metrics.proto index 3e6a7751e37c..4f603eeb9912 100644 --- a/api/types/metrics.proto +++ b/api/types/metrics.proto @@ -21,7 +21,7 @@ package containerd.types; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/types;types"; +option go_package = "github.com/containerd/containerd/v2/api/types;types"; message Metric { google.protobuf.Timestamp timestamp = 1; diff --git a/api/types/mount.pb.go b/api/types/mount.pb.go index ff77a7d7bd22..ba622165f74b 100644 --- a/api/types/mount.pb.go +++ b/api/types/mount.pb.go @@ -132,10 +132,10 @@ var file_github_com_containerd_containerd_api_types_mount_proto_rawDesc = []byte 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x73, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/mount.proto b/api/types/mount.proto index 54e0a0cddfa4..cd0187de5fe6 100644 --- a/api/types/mount.proto +++ b/api/types/mount.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package containerd.types; -option go_package = "github.com/containerd/containerd/api/types;types"; +option go_package = "github.com/containerd/containerd/v2/api/types;types"; // Mount describes mounts for a container. // diff --git a/api/types/platform.pb.go b/api/types/platform.pb.go index 3e206cbafbda..5162fe689ef1 100644 --- a/api/types/platform.pb.go +++ b/api/types/platform.pb.go @@ -113,11 +113,11 @@ var file_github_com_containerd_containerd_api_types_platform_proto_rawDesc = []b 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/platform.proto b/api/types/platform.proto index b6088251f007..85e2ecb4583d 100644 --- a/api/types/platform.proto +++ b/api/types/platform.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package containerd.types; -option go_package = "github.com/containerd/containerd/api/types;types"; +option go_package = "github.com/containerd/containerd/v2/api/types;types"; // Platform follows the structure of the OCI platform specification, from // descriptors. diff --git a/api/types/sandbox.pb.go b/api/types/sandbox.pb.go index 77888bf33208..5c363032a7f7 100644 --- a/api/types/sandbox.pb.go +++ b/api/types/sandbox.pb.go @@ -261,11 +261,11 @@ var file_github_com_containerd_containerd_api_types_sandbox_proto_rawDesc = []by 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/sandbox.proto b/api/types/sandbox.proto index b0bf233b954b..47b0bc70b215 100644 --- a/api/types/sandbox.proto +++ b/api/types/sandbox.proto @@ -21,7 +21,7 @@ package containerd.types; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/types;types"; +option go_package = "github.com/containerd/containerd/v2/api/types;types"; // Sandbox represents a sandbox metadata object that keeps all info required by controller to // work with a particular instance. diff --git a/api/types/task/task.pb.go b/api/types/task/task.pb.go index 5c58d1ef1870..baab1f7679bd 100644 --- a/api/types/task/task.pb.go +++ b/api/types/task/task.pb.go @@ -315,10 +315,10 @@ var file_github_com_containerd_containerd_api_types_task_task_proto_rawDesc = [] 0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x54, 0x4f, 0x50, 0x50, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x55, 0x53, 0x45, 0x44, 0x10, 0x04, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x41, 0x55, 0x53, 0x49, 0x4e, 0x47, 0x10, - 0x05, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x05, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, - 0x74, 0x61, 0x73, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/task/task.proto b/api/types/task/task.proto index afc8e94bb477..09a9857a7ef8 100644 --- a/api/types/task/task.proto +++ b/api/types/task/task.proto @@ -21,7 +21,7 @@ package containerd.v1.types; import "google/protobuf/timestamp.proto"; import "google/protobuf/any.proto"; -option go_package = "github.com/containerd/containerd/api/types/task"; +option go_package = "github.com/containerd/containerd/v2/api/types/task"; enum Status { UNKNOWN = 0; diff --git a/api/types/transfer/imagestore.pb.go b/api/types/transfer/imagestore.pb.go index b3c9830411c5..8143fb3ac29c 100644 --- a/api/types/transfer/imagestore.pb.go +++ b/api/types/transfer/imagestore.pb.go @@ -22,7 +22,7 @@ package transfer import ( - types "github.com/containerd/containerd/api/types" + types "github.com/containerd/containerd/v2/api/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -347,11 +347,11 @@ var file_github_com_containerd_containerd_api_types_transfer_imagestore_proto_ra 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12, 0x2a, 0x0a, 0x11, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x64, 0x5f, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x73, 0x6b, 0x69, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x44, 0x69, 0x67, 0x65, - 0x73, 0x74, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x73, 0x74, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, - 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, + 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/transfer/imagestore.proto b/api/types/transfer/imagestore.proto index 57ac2ebde5da..07c02158517d 100644 --- a/api/types/transfer/imagestore.proto +++ b/api/types/transfer/imagestore.proto @@ -20,7 +20,7 @@ package containerd.types.transfer; import "github.com/containerd/containerd/api/types/platform.proto"; -option go_package = "github.com/containerd/containerd/api/types/transfer"; +option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; message ImageStore { string name = 1; diff --git a/api/types/transfer/importexport.pb.go b/api/types/transfer/importexport.pb.go index a2a48ac152aa..432aff631917 100644 --- a/api/types/transfer/importexport.pb.go +++ b/api/types/transfer/importexport.pb.go @@ -22,7 +22,7 @@ package transfer import ( - types "github.com/containerd/containerd/api/types" + types "github.com/containerd/containerd/v2/api/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -234,11 +234,11 @@ var file_github_com_containerd_containerd_api_types_transfer_importexport_proto_ 0x16, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x6e, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x73, 0x6b, 0x69, 0x70, 0x4e, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x62, 0x6c, 0x65, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/transfer/importexport.proto b/api/types/transfer/importexport.proto index c18bae1c6405..a6eefacb06c6 100644 --- a/api/types/transfer/importexport.proto +++ b/api/types/transfer/importexport.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package containerd.types.transfer; -option go_package = "github.com/containerd/containerd/api/types/transfer"; +option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; import "github.com/containerd/containerd/api/types/platform.proto"; diff --git a/api/types/transfer/progress.pb.go b/api/types/transfer/progress.pb.go index 62d12b34db37..78922ebe0ed8 100644 --- a/api/types/transfer/progress.pb.go +++ b/api/types/transfer/progress.pb.go @@ -131,11 +131,11 @@ var file_github_com_containerd_containerd_api_types_transfer_progress_proto_rawD 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, - 0x61, 0x6c, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x61, 0x6c, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, - 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, + 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/transfer/progress.proto b/api/types/transfer/progress.proto index 3059bcbb12a4..7c256f8bcae5 100644 --- a/api/types/transfer/progress.proto +++ b/api/types/transfer/progress.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package containerd.types.transfer; -option go_package = "github.com/containerd/containerd/api/types/transfer"; +option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; message Progress { string event = 1; diff --git a/api/types/transfer/registry.pb.go b/api/types/transfer/registry.pb.go index 57bb80bae9e5..891839a13e86 100644 --- a/api/types/transfer/registry.pb.go +++ b/api/types/transfer/registry.pb.go @@ -399,11 +399,11 @@ var file_github_com_containerd_containerd_api_types_transfer_registry_proto_rawD 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x43, 0x52, 0x45, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x41, 0x4c, 0x53, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x45, 0x46, 0x52, 0x45, 0x53, 0x48, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x48, 0x45, - 0x41, 0x44, 0x45, 0x52, 0x10, 0x03, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x41, 0x44, 0x45, 0x52, 0x10, 0x03, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, - 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/transfer/registry.proto b/api/types/transfer/registry.proto index 0b3ce68b4c4b..f83fa168957e 100644 --- a/api/types/transfer/registry.proto +++ b/api/types/transfer/registry.proto @@ -20,7 +20,7 @@ package containerd.types.transfer; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/containerd/containerd/api/types/transfer"; +option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; message OCIRegistry { string reference = 1; diff --git a/api/types/transfer/streaming.pb.go b/api/types/transfer/streaming.pb.go index bdfa8d5d2412..4f31c57e1ed5 100644 --- a/api/types/transfer/streaming.pb.go +++ b/api/types/transfer/streaming.pb.go @@ -142,11 +142,11 @@ var file_github_com_containerd_containerd_api_types_transfer_streaming_proto_raw 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x0c, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x64, 0x61, 0x74, 0x65, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/transfer/streaming.proto b/api/types/transfer/streaming.proto index 234956c2c2c2..0d7e223a534b 100644 --- a/api/types/transfer/streaming.proto +++ b/api/types/transfer/streaming.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package containerd.types.transfer; -option go_package = "github.com/containerd/containerd/api/types/transfer"; +option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; message Data { bytes data = 1; diff --git a/archive/issues_test.go b/archive/issues_test.go index 7c4729aad4b1..59f950e57087 100644 --- a/archive/issues_test.go +++ b/archive/issues_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/pkg/testutil" ) // TestPrefixHeaderReadable tests that files that could be created with the diff --git a/archive/tar.go b/archive/tar.go index bf189f53c2f0..3d5b6bb013fb 100644 --- a/archive/tar.go +++ b/archive/tar.go @@ -29,9 +29,9 @@ import ( "syscall" "time" - "github.com/containerd/containerd/archive/tarheader" - "github.com/containerd/containerd/pkg/epoch" - "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/containerd/v2/archive/tarheader" + "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/continuity/fs" "github.com/containerd/log" ) diff --git a/archive/tar_linux_test.go b/archive/tar_linux_test.go index ffe83653903b..3433a3edc1f7 100644 --- a/archive/tar_linux_test.go +++ b/archive/tar_linux_test.go @@ -25,9 +25,9 @@ import ( "strings" "testing" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" "github.com/containerd/log/logtest" diff --git a/archive/tar_test.go b/archive/tar_test.go index d1bc839bc461..302db1485f93 100644 --- a/archive/tar_test.go +++ b/archive/tar_test.go @@ -32,8 +32,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/archive/tartest" - "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/containerd/v2/archive/tartest" + "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" "github.com/opencontainers/go-digest" diff --git a/archive/tar_unix.go b/archive/tar_unix.go index 8e883eee6275..fa74ef468358 100644 --- a/archive/tar_unix.go +++ b/archive/tar_unix.go @@ -27,7 +27,7 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/sysx" "golang.org/x/sys/unix" diff --git a/cio/io.go b/cio/io.go index 9c9b991fc074..64267d0e9c8a 100644 --- a/cio/io.go +++ b/cio/io.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/defaults" + "github.com/containerd/containerd/v2/defaults" ) var bufPool = sync.Pool{ diff --git a/client.go b/client.go index b15f4e20c659..7f44ca11e5e3 100644 --- a/client.go +++ b/client.go @@ -26,40 +26,40 @@ import ( "sync" "time" - containersapi "github.com/containerd/containerd/api/services/containers/v1" - contentapi "github.com/containerd/containerd/api/services/content/v1" - diffapi "github.com/containerd/containerd/api/services/diff/v1" - eventsapi "github.com/containerd/containerd/api/services/events/v1" - imagesapi "github.com/containerd/containerd/api/services/images/v1" - introspectionapi "github.com/containerd/containerd/api/services/introspection/v1" - leasesapi "github.com/containerd/containerd/api/services/leases/v1" - namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1" - sandboxsapi "github.com/containerd/containerd/api/services/sandbox/v1" - snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" - "github.com/containerd/containerd/api/services/tasks/v1" - versionservice "github.com/containerd/containerd/api/services/version/v1" - apitypes "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/content" - contentproxy "github.com/containerd/containerd/content/proxy" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/leases" - leasesproxy "github.com/containerd/containerd/leases/proxy" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/dialer" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker" - "github.com/containerd/containerd/sandbox" - sandboxproxy "github.com/containerd/containerd/sandbox/proxy" - "github.com/containerd/containerd/services/introspection" - "github.com/containerd/containerd/snapshots" - snproxy "github.com/containerd/containerd/snapshots/proxy" + containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" + contentapi "github.com/containerd/containerd/v2/api/services/content/v1" + diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" + eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" + imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" + introspectionapi "github.com/containerd/containerd/v2/api/services/introspection/v1" + leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1" + namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1" + sandboxsapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" + snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + "github.com/containerd/containerd/v2/api/services/tasks/v1" + versionservice "github.com/containerd/containerd/v2/api/services/version/v1" + apitypes "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/content" + contentproxy "github.com/containerd/containerd/v2/content/proxy" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/leases" + leasesproxy "github.com/containerd/containerd/v2/leases/proxy" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/remotes" + "github.com/containerd/containerd/v2/remotes/docker" + "github.com/containerd/containerd/v2/sandbox" + sandboxproxy "github.com/containerd/containerd/v2/sandbox/proxy" + "github.com/containerd/containerd/v2/services/introspection" + "github.com/containerd/containerd/v2/snapshots" + snproxy "github.com/containerd/containerd/v2/snapshots/proxy" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/client_opts.go b/client_opts.go index 4e0a78a8a31d..6a2f998f0168 100644 --- a/client_opts.go +++ b/client_opts.go @@ -19,10 +19,10 @@ package containerd import ( "time" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/remotes" + "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/grpc" diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go index 7b80310f05e8..2382ee1bb29a 100644 --- a/cmd/containerd-shim-runc-v2/main.go +++ b/cmd/containerd-shim-runc-v2/main.go @@ -21,10 +21,10 @@ package main import ( "context" - "github.com/containerd/containerd/runtime/v2/runc/manager" - _ "github.com/containerd/containerd/runtime/v2/runc/pause" - _ "github.com/containerd/containerd/runtime/v2/runc/task/plugin" - "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/v2/runtime/v2/runc/manager" + _ "github.com/containerd/containerd/v2/runtime/v2/runc/pause" + _ "github.com/containerd/containerd/v2/runtime/v2/runc/task/plugin" + "github.com/containerd/containerd/v2/runtime/v2/shim" ) func main() { diff --git a/cmd/containerd-stress/cri_worker.go b/cmd/containerd-stress/cri_worker.go index bf8cb73b70c6..72f358f58d28 100644 --- a/cmd/containerd-stress/cri_worker.go +++ b/cmd/containerd-stress/cri_worker.go @@ -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" ) diff --git a/cmd/containerd-stress/density.go b/cmd/containerd-stress/density.go index 1dc877891e80..940c4069cd7a 100644 --- a/cmd/containerd-stress/density.go +++ b/cmd/containerd-stress/density.go @@ -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" ) diff --git a/cmd/containerd-stress/exec_worker.go b/cmd/containerd-stress/exec_worker.go index 4acda4dd593d..f8990b1d1435 100644 --- a/cmd/containerd-stress/exec_worker.go +++ b/cmd/containerd-stress/exec_worker.go @@ -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" ) diff --git a/cmd/containerd-stress/main.go b/cmd/containerd-stress/main.go index af36c1850df4..cd19211beac7 100644 --- a/cmd/containerd-stress/main.go +++ b/cmd/containerd-stress/main.go @@ -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" diff --git a/cmd/containerd-stress/worker.go b/cmd/containerd-stress/worker.go index d6c5613de8fd..448b160de131 100644 --- a/cmd/containerd-stress/worker.go +++ b/cmd/containerd-stress/worker.go @@ -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" ) diff --git a/cmd/containerd/builtins/btrfs_linux.go b/cmd/containerd/builtins/btrfs_linux.go index 17bf8dfe95a0..6d9a084eb420 100644 --- a/cmd/containerd/builtins/btrfs_linux.go +++ b/cmd/containerd/builtins/btrfs_linux.go @@ -18,4 +18,4 @@ package builtins -import _ "github.com/containerd/containerd/snapshots/btrfs/plugin" +import _ "github.com/containerd/containerd/v2/snapshots/btrfs/plugin" diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 0a0e09d7f692..de2bd693edeb 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -18,33 +18,33 @@ package builtins // register containerd builtins here import ( - _ "github.com/containerd/containerd/diff/walking/plugin" - _ "github.com/containerd/containerd/events/plugin" - _ "github.com/containerd/containerd/gc/scheduler" - _ "github.com/containerd/containerd/leases/plugin" - _ "github.com/containerd/containerd/metadata/plugin" - _ "github.com/containerd/containerd/pkg/nri/plugin" - _ "github.com/containerd/containerd/plugins/imageverifier" - _ "github.com/containerd/containerd/plugins/sandbox" - _ "github.com/containerd/containerd/plugins/streaming" - _ "github.com/containerd/containerd/plugins/transfer" - _ "github.com/containerd/containerd/runtime/restart/monitor" - _ "github.com/containerd/containerd/runtime/v2" - _ "github.com/containerd/containerd/services/containers" - _ "github.com/containerd/containerd/services/content" - _ "github.com/containerd/containerd/services/diff" - _ "github.com/containerd/containerd/services/events" - _ "github.com/containerd/containerd/services/healthcheck" - _ "github.com/containerd/containerd/services/images" - _ "github.com/containerd/containerd/services/introspection" - _ "github.com/containerd/containerd/services/leases" - _ "github.com/containerd/containerd/services/namespaces" - _ "github.com/containerd/containerd/services/opt" - _ "github.com/containerd/containerd/services/sandbox" - _ "github.com/containerd/containerd/services/snapshots" - _ "github.com/containerd/containerd/services/streaming" - _ "github.com/containerd/containerd/services/tasks" - _ "github.com/containerd/containerd/services/transfer" - _ "github.com/containerd/containerd/services/version" - _ "github.com/containerd/containerd/services/warning" + _ "github.com/containerd/containerd/v2/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/events/plugin" + _ "github.com/containerd/containerd/v2/gc/scheduler" + _ "github.com/containerd/containerd/v2/leases/plugin" + _ "github.com/containerd/containerd/v2/metadata/plugin" + _ "github.com/containerd/containerd/v2/pkg/nri/plugin" + _ "github.com/containerd/containerd/v2/plugins/imageverifier" + _ "github.com/containerd/containerd/v2/plugins/sandbox" + _ "github.com/containerd/containerd/v2/plugins/streaming" + _ "github.com/containerd/containerd/v2/plugins/transfer" + _ "github.com/containerd/containerd/v2/runtime/restart/monitor" + _ "github.com/containerd/containerd/v2/runtime/v2" + _ "github.com/containerd/containerd/v2/services/containers" + _ "github.com/containerd/containerd/v2/services/content" + _ "github.com/containerd/containerd/v2/services/diff" + _ "github.com/containerd/containerd/v2/services/events" + _ "github.com/containerd/containerd/v2/services/healthcheck" + _ "github.com/containerd/containerd/v2/services/images" + _ "github.com/containerd/containerd/v2/services/introspection" + _ "github.com/containerd/containerd/v2/services/leases" + _ "github.com/containerd/containerd/v2/services/namespaces" + _ "github.com/containerd/containerd/v2/services/opt" + _ "github.com/containerd/containerd/v2/services/sandbox" + _ "github.com/containerd/containerd/v2/services/snapshots" + _ "github.com/containerd/containerd/v2/services/streaming" + _ "github.com/containerd/containerd/v2/services/tasks" + _ "github.com/containerd/containerd/v2/services/transfer" + _ "github.com/containerd/containerd/v2/services/version" + _ "github.com/containerd/containerd/v2/services/warning" ) diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index fead87916ba5..a2f86d057651 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -17,10 +17,10 @@ package builtins import ( - _ "github.com/containerd/containerd/metrics/cgroups" - _ "github.com/containerd/containerd/metrics/cgroups/v2" - _ "github.com/containerd/containerd/runtime/v2/runc/options" - _ "github.com/containerd/containerd/snapshots/blockfile/plugin" - _ "github.com/containerd/containerd/snapshots/native/plugin" - _ "github.com/containerd/containerd/snapshots/overlay/plugin" + _ "github.com/containerd/containerd/v2/metrics/cgroups" + _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" + _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/cmd/containerd/builtins/builtins_unix.go b/cmd/containerd/builtins/builtins_unix.go index 348e2ccbbc4c..b6d98c1624a6 100644 --- a/cmd/containerd/builtins/builtins_unix.go +++ b/cmd/containerd/builtins/builtins_unix.go @@ -19,6 +19,6 @@ package builtins import ( - _ "github.com/containerd/containerd/snapshots/blockfile/plugin" - _ "github.com/containerd/containerd/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/snapshots/native/plugin" ) diff --git a/cmd/containerd/builtins/builtins_windows.go b/cmd/containerd/builtins/builtins_windows.go index 3ba975a1ac2d..a9cd08574e6c 100644 --- a/cmd/containerd/builtins/builtins_windows.go +++ b/cmd/containerd/builtins/builtins_windows.go @@ -17,8 +17,8 @@ package builtins import ( - _ "github.com/containerd/containerd/diff/lcow" - _ "github.com/containerd/containerd/diff/windows" - _ "github.com/containerd/containerd/snapshots/lcow" - _ "github.com/containerd/containerd/snapshots/windows" + _ "github.com/containerd/containerd/v2/diff/lcow" + _ "github.com/containerd/containerd/v2/diff/windows" + _ "github.com/containerd/containerd/v2/snapshots/lcow" + _ "github.com/containerd/containerd/v2/snapshots/windows" ) diff --git a/cmd/containerd/builtins/cri.go b/cmd/containerd/builtins/cri.go index b7b31384de19..8e8526869b94 100644 --- a/cmd/containerd/builtins/cri.go +++ b/cmd/containerd/builtins/cri.go @@ -19,5 +19,5 @@ package builtins import ( - _ "github.com/containerd/containerd/pkg/cri" + _ "github.com/containerd/containerd/v2/pkg/cri" ) diff --git a/cmd/containerd/builtins/devmapper_linux.go b/cmd/containerd/builtins/devmapper_linux.go index 818ae1282786..0c95c82f8166 100644 --- a/cmd/containerd/builtins/devmapper_linux.go +++ b/cmd/containerd/builtins/devmapper_linux.go @@ -18,4 +18,4 @@ package builtins -import _ "github.com/containerd/containerd/snapshots/devmapper/plugin" +import _ "github.com/containerd/containerd/v2/snapshots/devmapper/plugin" diff --git a/cmd/containerd/builtins/tracing.go b/cmd/containerd/builtins/tracing.go index 9354bc7a7909..23ecdfb5ecbe 100644 --- a/cmd/containerd/builtins/tracing.go +++ b/cmd/containerd/builtins/tracing.go @@ -19,5 +19,5 @@ package builtins import ( - _ "github.com/containerd/containerd/tracing/plugin" + _ "github.com/containerd/containerd/v2/tracing/plugin" ) diff --git a/cmd/containerd/command/config.go b/cmd/containerd/command/config.go index db51830859e8..7af5473d9572 100644 --- a/cmd/containerd/command/config.go +++ b/cmd/containerd/command/config.go @@ -21,12 +21,12 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/timeout" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/services/server" - srvconfig "github.com/containerd/containerd/services/server/config" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/timeout" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/services/server" + srvconfig "github.com/containerd/containerd/v2/services/server/config" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pelletier/go-toml/v2" "github.com/urfave/cli" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index 88aa233e8a80..a99326d1c2e1 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -27,14 +27,14 @@ import ( "runtime" "time" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/errdefs" - _ "github.com/containerd/containerd/metrics" // import containerd build info - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/services/server" - srvconfig "github.com/containerd/containerd/services/server/config" - "github.com/containerd/containerd/sys" - "github.com/containerd/containerd/version" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/errdefs" + _ "github.com/containerd/containerd/v2/metrics" // import containerd build info + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/services/server" + srvconfig "github.com/containerd/containerd/v2/services/server/config" + "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/version" "github.com/containerd/log" "github.com/urfave/cli" "google.golang.org/grpc/grpclog" diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go index ba52f837388b..f41538a56a7f 100644 --- a/cmd/containerd/command/main_unix.go +++ b/cmd/containerd/command/main_unix.go @@ -23,7 +23,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/services/server" + "github.com/containerd/containerd/v2/services/server" "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/cmd/containerd/command/main_windows.go b/cmd/containerd/command/main_windows.go index 94e33b5bcbd0..a36cc73be0fb 100644 --- a/cmd/containerd/command/main_windows.go +++ b/cmd/containerd/command/main_windows.go @@ -26,7 +26,7 @@ import ( "github.com/Microsoft/go-winio/pkg/etw" "github.com/Microsoft/go-winio/pkg/etwlogrus" "github.com/Microsoft/go-winio/pkg/guid" - "github.com/containerd/containerd/services/server" + "github.com/containerd/containerd/v2/services/server" "github.com/containerd/log" "github.com/sirupsen/logrus" "golang.org/x/sys/windows" diff --git a/cmd/containerd/command/oci-hook.go b/cmd/containerd/command/oci-hook.go index 361ecacfcc1b..2399ecb9ede6 100644 --- a/cmd/containerd/command/oci-hook.go +++ b/cmd/containerd/command/oci-hook.go @@ -25,7 +25,7 @@ import ( "syscall" "text/template" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/oci" "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" ) diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go index 27ae9a3076b9..16f55a3a011d 100644 --- a/cmd/containerd/command/publish.go +++ b/cmd/containerd/command/publish.go @@ -24,12 +24,12 @@ import ( "os" "time" - eventsapi "github.com/containerd/containerd/api/services/events/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/dialer" - "github.com/containerd/containerd/protobuf/proto" - "github.com/containerd/containerd/protobuf/types" + eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/containerd/v2/protobuf/types" "github.com/urfave/cli" "google.golang.org/grpc" "google.golang.org/grpc/backoff" diff --git a/cmd/containerd/command/service_unsupported.go b/cmd/containerd/command/service_unsupported.go index 9cd0114681b1..a5bab3d0ede8 100644 --- a/cmd/containerd/command/service_unsupported.go +++ b/cmd/containerd/command/service_unsupported.go @@ -19,7 +19,7 @@ package command import ( - "github.com/containerd/containerd/services/server" + "github.com/containerd/containerd/v2/services/server" "github.com/urfave/cli" ) diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go index e5a830586f6b..f3e18683c8f4 100644 --- a/cmd/containerd/command/service_windows.go +++ b/cmd/containerd/command/service_windows.go @@ -23,8 +23,8 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/services/server" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/services/server" "github.com/sirupsen/logrus" "github.com/urfave/cli" exec "golang.org/x/sys/execabs" diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go index ccd41c3c0999..48c91947fb0d 100644 --- a/cmd/containerd/main.go +++ b/cmd/containerd/main.go @@ -21,11 +21,11 @@ import ( "fmt" "os" - "github.com/containerd/containerd/cmd/containerd/command" - "github.com/containerd/containerd/pkg/hasher" - "github.com/containerd/containerd/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies + "github.com/containerd/containerd/v2/cmd/containerd/command" + "github.com/containerd/containerd/v2/pkg/hasher" + "github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies - _ "github.com/containerd/containerd/cmd/containerd/builtins" + _ "github.com/containerd/containerd/v2/cmd/containerd/builtins" ) func init() { diff --git a/cmd/ctr/app/main.go b/cmd/ctr/app/main.go index 6def240474be..b17b070e5cbf 100644 --- a/cmd/ctr/app/main.go +++ b/cmd/ctr/app/main.go @@ -24,26 +24,26 @@ import ( "github.com/urfave/cli" "google.golang.org/grpc/grpclog" - "github.com/containerd/containerd/cmd/ctr/commands/containers" - "github.com/containerd/containerd/cmd/ctr/commands/content" - "github.com/containerd/containerd/cmd/ctr/commands/deprecations" - "github.com/containerd/containerd/cmd/ctr/commands/events" - "github.com/containerd/containerd/cmd/ctr/commands/images" - "github.com/containerd/containerd/cmd/ctr/commands/info" - "github.com/containerd/containerd/cmd/ctr/commands/install" - "github.com/containerd/containerd/cmd/ctr/commands/leases" - namespacesCmd "github.com/containerd/containerd/cmd/ctr/commands/namespaces" - ociCmd "github.com/containerd/containerd/cmd/ctr/commands/oci" - "github.com/containerd/containerd/cmd/ctr/commands/plugins" - "github.com/containerd/containerd/cmd/ctr/commands/pprof" - "github.com/containerd/containerd/cmd/ctr/commands/run" - "github.com/containerd/containerd/cmd/ctr/commands/sandboxes" - "github.com/containerd/containerd/cmd/ctr/commands/snapshots" - "github.com/containerd/containerd/cmd/ctr/commands/tasks" - versionCmd "github.com/containerd/containerd/cmd/ctr/commands/version" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/version" + "github.com/containerd/containerd/v2/cmd/ctr/commands/containers" + "github.com/containerd/containerd/v2/cmd/ctr/commands/content" + "github.com/containerd/containerd/v2/cmd/ctr/commands/deprecations" + "github.com/containerd/containerd/v2/cmd/ctr/commands/events" + "github.com/containerd/containerd/v2/cmd/ctr/commands/images" + "github.com/containerd/containerd/v2/cmd/ctr/commands/info" + "github.com/containerd/containerd/v2/cmd/ctr/commands/install" + "github.com/containerd/containerd/v2/cmd/ctr/commands/leases" + namespacesCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/namespaces" + ociCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/oci" + "github.com/containerd/containerd/v2/cmd/ctr/commands/plugins" + "github.com/containerd/containerd/v2/cmd/ctr/commands/pprof" + "github.com/containerd/containerd/v2/cmd/ctr/commands/run" + "github.com/containerd/containerd/v2/cmd/ctr/commands/sandboxes" + "github.com/containerd/containerd/v2/cmd/ctr/commands/snapshots" + "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" + versionCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/version" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/version" ) var extraCmds = []cli.Command{} diff --git a/cmd/ctr/app/main_unix.go b/cmd/ctr/app/main_unix.go index d80726325561..ab004e9e3b7e 100644 --- a/cmd/ctr/app/main_unix.go +++ b/cmd/ctr/app/main_unix.go @@ -18,7 +18,7 @@ package app -import "github.com/containerd/containerd/cmd/ctr/commands/shim" +import "github.com/containerd/containerd/v2/cmd/ctr/commands/shim" func init() { extraCmds = append(extraCmds, shim.Command) diff --git a/cmd/ctr/commands/client.go b/cmd/ctr/commands/client.go index 4e944dc875d4..6ada7e225f0a 100644 --- a/cmd/ctr/commands/client.go +++ b/cmd/ctr/commands/client.go @@ -19,9 +19,9 @@ package commands import ( gocontext "context" - "github.com/containerd/containerd" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/epoch" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/cni.go b/cmd/ctr/commands/cni.go index c1620cea3b5a..ecd4dd1ecead 100644 --- a/cmd/ctr/commands/cni.go +++ b/cmd/ctr/commands/cni.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/typeurl/v2" ) func init() { typeurl.Register(&NetworkMetaData{}, - "github.com/containerd/containerd/cmd/ctr/commands", "NetworkMetaData") + "github.com/containerd/containerd/v2/cmd/ctr/commands", "NetworkMetaData") } const ( diff --git a/cmd/ctr/commands/commands.go b/cmd/ctr/commands/commands.go index 521e037395e2..8157acaccb10 100644 --- a/cmd/ctr/commands/commands.go +++ b/cmd/ctr/commands/commands.go @@ -23,8 +23,8 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/pkg/atomicfile" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/pkg/atomicfile" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/containers/checkpoint.go b/cmd/ctr/commands/containers/checkpoint.go index 3d616c13773e..b3f595c9f2b2 100644 --- a/cmd/ctr/commands/containers/checkpoint.go +++ b/cmd/ctr/commands/containers/checkpoint.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 5ad88840dabe..6be01be5cf4f 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -23,12 +23,12 @@ import ( "strings" "text/tabwriter" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/cmd/ctr/commands/run" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cmd/ctr/commands/run" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/containers/restore.go b/cmd/ctr/commands/containers/restore.go index a1943f5646c0..721a47849f61 100644 --- a/cmd/ctr/commands/containers/restore.go +++ b/cmd/ctr/commands/containers/restore.go @@ -20,11 +20,11 @@ import ( "errors" "github.com/containerd/console" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/cmd/ctr/commands/tasks" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go index d6ce35b0ef0b..e5e0bc428be2 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -26,10 +26,10 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" units "github.com/docker/go-units" digest "github.com/opencontainers/go-digest" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index 90246361ffc1..8e0952b26e5b 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -26,14 +26,14 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/progress" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/progress" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/commands/content/prune.go b/cmd/ctr/commands/content/prune.go index f585330bc42a..bae3698e0e90 100644 --- a/cmd/ctr/commands/content/prune.go +++ b/cmd/ctr/commands/content/prune.go @@ -21,9 +21,9 @@ import ( "time" "unicode" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/leases" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/leases" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/deprecations/deprecations.go b/cmd/ctr/commands/deprecations/deprecations.go index bd35349261ec..63256f781839 100644 --- a/cmd/ctr/commands/deprecations/deprecations.go +++ b/cmd/ctr/commands/deprecations/deprecations.go @@ -24,10 +24,10 @@ import ( "github.com/urfave/cli" - api "github.com/containerd/containerd/api/services/introspection/v1" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/introspection/v1" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" ) // Command is the parent for all commands under "deprecations" diff --git a/cmd/ctr/commands/events/events.go b/cmd/ctr/commands/events/events.go index c2ca925f5aaf..30b09aa6f143 100644 --- a/cmd/ctr/commands/events/events.go +++ b/cmd/ctr/commands/events/events.go @@ -20,14 +20,14 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/events" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/events" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" // Register grpc event types - _ "github.com/containerd/containerd/api/events" + _ "github.com/containerd/containerd/v2/api/events" ) // Command is the cli command for displaying containerd events diff --git a/cmd/ctr/commands/images/convert.go b/cmd/ctr/commands/images/convert.go index fdfd06ddd541..071a1d065c20 100644 --- a/cmd/ctr/commands/images/convert.go +++ b/cmd/ctr/commands/images/convert.go @@ -20,10 +20,10 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/images/converter" - "github.com/containerd/containerd/images/converter/uncompress" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/images/converter" + "github.com/containerd/containerd/v2/images/converter/uncompress" + "github.com/containerd/containerd/v2/platforms" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/export.go b/cmd/ctr/commands/images/export.go index 5957e6f8268e..95031e54eede 100644 --- a/cmd/ctr/commands/images/export.go +++ b/cmd/ctr/commands/images/export.go @@ -24,12 +24,12 @@ import ( "github.com/urfave/cli" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/images/archive" - "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/cmd/ctr/commands" + "github.com/containerd/containerd/v2/images/archive" + "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" ) var exportCommand = cli.Command{ diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go index 3722bf470b8c..21787d21a9d8 100644 --- a/cmd/ctr/commands/images/images.go +++ b/cmd/ctr/commands/images/images.go @@ -24,11 +24,11 @@ import ( "strings" "text/tabwriter" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/progress" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/progress" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/import.go b/cmd/ctr/commands/images/import.go index 1bfd3d9a840e..4f96ef7b6c64 100644 --- a/cmd/ctr/commands/images/import.go +++ b/cmd/ctr/commands/images/import.go @@ -25,13 +25,13 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/images/archive" - "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/cmd/ctr/commands" + "github.com/containerd/containerd/v2/images/archive" + "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" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/images/inspect.go b/cmd/ctr/commands/images/inspect.go index 7dff057d1dd2..b56472f86ae7 100644 --- a/cmd/ctr/commands/images/inspect.go +++ b/cmd/ctr/commands/images/inspect.go @@ -19,8 +19,8 @@ package images import ( "os" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/pkg/display" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/pkg/display" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index 37a342da072a..35a2bc0b38ac 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -20,12 +20,12 @@ import ( "fmt" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/platforms" "github.com/opencontainers/image-spec/identity" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/pull.go b/cmd/ctr/commands/images/pull.go index c77549764cbc..814b6434a1da 100644 --- a/cmd/ctr/commands/images/pull.go +++ b/cmd/ctr/commands/images/pull.go @@ -24,15 +24,15 @@ import ( "strings" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/cmd/ctr/commands/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/progress" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/transfer/image" - "github.com/containerd/containerd/pkg/transfer/registry" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cmd/ctr/commands/content" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/progress" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/transfer/image" + "github.com/containerd/containerd/v2/pkg/transfer/registry" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/commands/images/push.go b/cmd/ctr/commands/images/push.go index 464a33527b14..8dcd76b7bc7b 100644 --- a/cmd/ctr/commands/images/push.go +++ b/cmd/ctr/commands/images/push.go @@ -26,17 +26,17 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/cmd/ctr/commands/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/progress" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/transfer/image" - "github.com/containerd/containerd/pkg/transfer/registry" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cmd/ctr/commands/content" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/progress" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/transfer/image" + "github.com/containerd/containerd/v2/pkg/transfer/registry" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/remotes" + "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/commands/images/tag.go b/cmd/ctr/commands/images/tag.go index fbd1c5aa0904..07d5aa425e1a 100644 --- a/cmd/ctr/commands/images/tag.go +++ b/cmd/ctr/commands/images/tag.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/transfer/image" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/distribution/reference" ) diff --git a/cmd/ctr/commands/images/unmount.go b/cmd/ctr/commands/images/unmount.go index 2fd23e5a67c9..722e68a3a89d 100644 --- a/cmd/ctr/commands/images/unmount.go +++ b/cmd/ctr/commands/images/unmount.go @@ -19,10 +19,10 @@ package images import ( "fmt" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/mount" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/usage.go b/cmd/ctr/commands/images/usage.go index 2227dcbe4eb2..3c4911a4eddf 100644 --- a/cmd/ctr/commands/images/usage.go +++ b/cmd/ctr/commands/images/usage.go @@ -21,9 +21,9 @@ import ( "os" "text/tabwriter" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/pkg/progress" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/pkg/progress" "github.com/opencontainers/image-spec/identity" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/info/info.go b/cmd/ctr/commands/info/info.go index 564b902353ca..ea98ae8b6448 100644 --- a/cmd/ctr/commands/info/info.go +++ b/cmd/ctr/commands/info/info.go @@ -17,9 +17,9 @@ package info import ( - api "github.com/containerd/containerd/api/services/introspection/v1" - "github.com/containerd/containerd/cmd/ctr/commands" - ptypes "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/introspection/v1" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/install/install.go b/cmd/ctr/commands/install/install.go index a74f78e49869..1609a7b5f359 100644 --- a/cmd/ctr/commands/install/install.go +++ b/cmd/ctr/commands/install/install.go @@ -17,8 +17,8 @@ package install import ( - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/leases/leases.go b/cmd/ctr/commands/leases/leases.go index 96a745a5516f..23c1e4c43b1e 100644 --- a/cmd/ctr/commands/leases/leases.go +++ b/cmd/ctr/commands/leases/leases.go @@ -24,8 +24,8 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/leases" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/leases" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/namespaces/namespaces.go b/cmd/ctr/commands/namespaces/namespaces.go index d2bb3b0a9565..1b87e4b056a9 100644 --- a/cmd/ctr/commands/namespaces/namespaces.go +++ b/cmd/ctr/commands/namespaces/namespaces.go @@ -24,8 +24,8 @@ import ( "strings" "text/tabwriter" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/namespaces/namespaces_linux.go b/cmd/ctr/commands/namespaces/namespaces_linux.go index 8562822a1ba7..e40d893b414e 100644 --- a/cmd/ctr/commands/namespaces/namespaces_linux.go +++ b/cmd/ctr/commands/namespaces/namespaces_linux.go @@ -17,8 +17,8 @@ package namespaces import ( - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/runtime/opts" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/runtime/opts" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/namespaces/namespaces_other.go b/cmd/ctr/commands/namespaces/namespaces_other.go index c4c342d5eae2..0f82e12042d9 100644 --- a/cmd/ctr/commands/namespaces/namespaces_other.go +++ b/cmd/ctr/commands/namespaces/namespaces_other.go @@ -19,7 +19,7 @@ package namespaces import ( - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/namespaces" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/oci/oci.go b/cmd/ctr/commands/oci/oci.go index a8eb76a87c22..f1effe9c2811 100644 --- a/cmd/ctr/commands/oci/oci.go +++ b/cmd/ctr/commands/oci/oci.go @@ -21,10 +21,10 @@ import ( "github.com/urfave/cli" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/platforms" ) // Command is the parent for all OCI related tools under 'oci' diff --git a/cmd/ctr/commands/plugins/plugins.go b/cmd/ctr/commands/plugins/plugins.go index 4cdd0b1e65c2..42788c473f38 100644 --- a/cmd/ctr/commands/plugins/plugins.go +++ b/cmd/ctr/commands/plugins/plugins.go @@ -23,10 +23,10 @@ import ( "strings" "text/tabwriter" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/platforms" - pluginutils "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/platforms" + pluginutils "github.com/containerd/containerd/v2/plugin" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" "google.golang.org/grpc/codes" diff --git a/cmd/ctr/commands/pprof/pprof.go b/cmd/ctr/commands/pprof/pprof.go index 7aec9be0c4ce..3f688d525a0a 100644 --- a/cmd/ctr/commands/pprof/pprof.go +++ b/cmd/ctr/commands/pprof/pprof.go @@ -23,7 +23,7 @@ import ( "os" "time" - "github.com/containerd/containerd/defaults" + "github.com/containerd/containerd/v2/defaults" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/resolver.go b/cmd/ctr/commands/resolver.go index c2bae2d2e0f6..d34594aeece3 100644 --- a/cmd/ctr/commands/resolver.go +++ b/cmd/ctr/commands/resolver.go @@ -31,10 +31,10 @@ import ( "strings" "github.com/containerd/console" - "github.com/containerd/containerd/pkg/transfer/registry" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker" - "github.com/containerd/containerd/remotes/docker/config" + "github.com/containerd/containerd/v2/pkg/transfer/registry" + "github.com/containerd/containerd/v2/remotes" + "github.com/containerd/containerd/v2/remotes/docker" + "github.com/containerd/containerd/v2/remotes/docker/config" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index 77c07bce414a..3f2eaa62e9b5 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -28,14 +28,14 @@ import ( specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/cmd/ctr/commands/tasks" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - clabels "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + clabels "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index c24acc1cd7f4..ed5895687fdc 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -30,17 +30,17 @@ 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" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/contrib/apparmor" - "github.com/containerd/containerd/contrib/nvidia" - "github.com/containerd/containerd/contrib/seccomp" - "github.com/containerd/containerd/oci" - runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/contrib/apparmor" + "github.com/containerd/containerd/v2/contrib/nvidia" + "github.com/containerd/containerd/v2/contrib/seccomp" + "github.com/containerd/containerd/v2/oci" + runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/intel/goresctrl/pkg/blockio" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/cmd/ctr/commands/run/run_windows.go b/cmd/ctr/commands/run/run_windows.go index fc3b939d6e47..d1e4849b60c2 100644 --- a/cmd/ctr/commands/run/run_windows.go +++ b/cmd/ctr/commands/run/run_windows.go @@ -23,11 +23,11 @@ import ( "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" "github.com/containerd/console" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/netns" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/netns" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/sandboxes/sandboxes.go b/cmd/ctr/commands/sandboxes/sandboxes.go index 5d710ecad4ae..9cb90dda8989 100644 --- a/cmd/ctr/commands/sandboxes/sandboxes.go +++ b/cmd/ctr/commands/sandboxes/sandboxes.go @@ -22,10 +22,10 @@ import ( "os" "text/tabwriter" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index 56a6496ec227..af9ac27efce4 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -28,11 +28,11 @@ import ( "strings" "github.com/containerd/console" - "github.com/containerd/containerd/api/runtime/task/v2" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/namespaces" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/v2/api/runtime/task/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/namespaces" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" diff --git a/cmd/ctr/commands/signals.go b/cmd/ctr/commands/signals.go index 28d976ff6435..c53e5763d172 100644 --- a/cmd/ctr/commands/signals.go +++ b/cmd/ctr/commands/signals.go @@ -22,8 +22,8 @@ import ( "os/signal" "syscall" - "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index 58bddaeac930..b10c7c8417cc 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.go @@ -28,13 +28,13 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/progress" - "github.com/containerd/containerd/rootfs" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/progress" + "github.com/containerd/containerd/v2/rootfs" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/commands/tasks/attach.go b/cmd/ctr/commands/tasks/attach.go index 20fdf0512082..44cec46c8ac8 100644 --- a/cmd/ctr/commands/tasks/attach.go +++ b/cmd/ctr/commands/tasks/attach.go @@ -18,8 +18,8 @@ package tasks import ( "github.com/containerd/console" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/checkpoint.go b/cmd/ctr/commands/tasks/checkpoint.go index 172d1bdf1423..142ca209b12d 100644 --- a/cmd/ctr/commands/tasks/checkpoint.go +++ b/cmd/ctr/commands/tasks/checkpoint.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/delete.go b/cmd/ctr/commands/tasks/delete.go index 5369f621758c..ba16ebfc87bc 100644 --- a/cmd/ctr/commands/tasks/delete.go +++ b/cmd/ctr/commands/tasks/delete.go @@ -19,9 +19,9 @@ package tasks import ( gocontext "context" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/exec.go b/cmd/ctr/commands/tasks/exec.go index 5ed9c3c17a14..d67020e89154 100644 --- a/cmd/ctr/commands/tasks/exec.go +++ b/cmd/ctr/commands/tasks/exec.go @@ -23,10 +23,10 @@ import ( "os" "github.com/containerd/console" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/kill.go b/cmd/ctr/commands/tasks/kill.go index e22b7ca646b3..a8015d815903 100644 --- a/cmd/ctr/commands/tasks/kill.go +++ b/cmd/ctr/commands/tasks/kill.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cmd/ctr/commands" gocni "github.com/containerd/go-cni" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/cmd/ctr/commands/tasks/list.go b/cmd/ctr/commands/tasks/list.go index 385d6433d71c..747298ea8168 100644 --- a/cmd/ctr/commands/tasks/list.go +++ b/cmd/ctr/commands/tasks/list.go @@ -21,8 +21,8 @@ import ( "os" "text/tabwriter" - tasks "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/cmd/ctr/commands" + tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics.go index ac6a0e45b7e8..345a1362b374 100644 --- a/cmd/ctr/commands/tasks/metrics.go +++ b/cmd/ctr/commands/tasks/metrics.go @@ -26,7 +26,7 @@ import ( wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats" v1 "github.com/containerd/cgroups/v3/cgroup1/stats" v2 "github.com/containerd/cgroups/v3/cgroup2/stats" - "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/pause.go b/cmd/ctr/commands/tasks/pause.go index 630450768845..82db6f1f7f2f 100644 --- a/cmd/ctr/commands/tasks/pause.go +++ b/cmd/ctr/commands/tasks/pause.go @@ -17,7 +17,7 @@ package tasks import ( - "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/ps.go b/cmd/ctr/commands/tasks/ps.go index a015ff9607a9..76c6967c5890 100644 --- a/cmd/ctr/commands/tasks/ps.go +++ b/cmd/ctr/commands/tasks/ps.go @@ -22,7 +22,7 @@ import ( "os" "text/tabwriter" - "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/resume.go b/cmd/ctr/commands/tasks/resume.go index d29ffbcb4755..19502f0634b5 100644 --- a/cmd/ctr/commands/tasks/resume.go +++ b/cmd/ctr/commands/tasks/resume.go @@ -17,7 +17,7 @@ package tasks import ( - "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/start.go b/cmd/ctr/commands/tasks/start.go index bedeb473b574..81365a8fa36c 100644 --- a/cmd/ctr/commands/tasks/start.go +++ b/cmd/ctr/commands/tasks/start.go @@ -20,10 +20,10 @@ import ( "errors" "github.com/containerd/console" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go index a46f878fd9a6..4b9da2c4fb47 100644 --- a/cmd/ctr/commands/tasks/tasks_unix.go +++ b/cmd/ctr/commands/tasks/tasks_unix.go @@ -26,8 +26,8 @@ import ( "os/signal" "github.com/containerd/console" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" "github.com/containerd/log" "github.com/urfave/cli" "golang.org/x/sys/unix" diff --git a/cmd/ctr/commands/tasks/tasks_windows.go b/cmd/ctr/commands/tasks/tasks_windows.go index 4a804d86929b..432a3fbc969c 100644 --- a/cmd/ctr/commands/tasks/tasks_windows.go +++ b/cmd/ctr/commands/tasks/tasks_windows.go @@ -23,8 +23,8 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/version/version.go b/cmd/ctr/commands/version/version.go index 677bb574d182..03a895207495 100644 --- a/cmd/ctr/commands/version/version.go +++ b/cmd/ctr/commands/version/version.go @@ -20,8 +20,8 @@ import ( "fmt" "os" - "github.com/containerd/containerd/cmd/ctr/commands" - "github.com/containerd/containerd/version" + "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/version" "github.com/urfave/cli" ) diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go index 1845a73ed0eb..4063cfb28782 100644 --- a/cmd/ctr/main.go +++ b/cmd/ctr/main.go @@ -21,9 +21,9 @@ import ( "fmt" "os" - "github.com/containerd/containerd/cmd/ctr/app" - "github.com/containerd/containerd/pkg/hasher" - "github.com/containerd/containerd/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies + "github.com/containerd/containerd/v2/cmd/ctr/app" + "github.com/containerd/containerd/v2/pkg/hasher" + "github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies "github.com/urfave/cli" ) diff --git a/cmd/gen-manpages/main.go b/cmd/gen-manpages/main.go index 4c87c1c0b637..2c9de2b5d9f3 100644 --- a/cmd/gen-manpages/main.go +++ b/cmd/gen-manpages/main.go @@ -23,8 +23,8 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/cmd/containerd/command" - "github.com/containerd/containerd/cmd/ctr/app" + "github.com/containerd/containerd/v2/cmd/containerd/command" + "github.com/containerd/containerd/v2/cmd/ctr/app" "github.com/urfave/cli" ) diff --git a/container.go b/container.go index 0088a2ebdfef..563f8acbbf50 100644 --- a/container.go +++ b/container.go @@ -24,16 +24,16 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/api/types" - tasktypes "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/api/types" + tasktypes "github.com/containerd/containerd/v2/api/types/task" + "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/oci" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/fifo" "github.com/containerd/typeurl/v2" ver "github.com/opencontainers/image-spec/specs-go" diff --git a/container_checkpoint_opts.go b/container_checkpoint_opts.go index c1d9fb8bd68a..50494e14ddd0 100644 --- a/container_checkpoint_opts.go +++ b/container_checkpoint_opts.go @@ -23,15 +23,15 @@ import ( "fmt" "runtime" - tasks "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/proto" - "github.com/containerd/containerd/rootfs" - "github.com/containerd/containerd/runtime/v2/runc/options" + tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/containerd/v2/rootfs" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/go-digest" imagespec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/container_opts.go b/container_opts.go index d71c022a1776..0af31b4b53f6 100644 --- a/container_opts.go +++ b/container_opts.go @@ -22,14 +22,14 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/content" + "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/protobuf" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/typeurl/v2" "github.com/opencontainers/image-spec/identity" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/container_opts_unix.go b/container_opts_unix.go index 016c1a9258d9..b26c1bc82034 100644 --- a/container_opts_unix.go +++ b/container_opts_unix.go @@ -25,9 +25,9 @@ import ( "path/filepath" "syscall" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" "github.com/opencontainers/image-spec/identity" ) diff --git a/container_restore_opts.go b/container_restore_opts.go index 2afc18701386..9c205b4cdd78 100644 --- a/container_restore_opts.go +++ b/container_restore_opts.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/protobuf/proto" - ptypes "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/protobuf/proto" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/opencontainers/image-spec/identity" imagespec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/containerstore.go b/containerstore.go index 331a6f41de04..fad660fabe05 100644 --- a/containerstore.go +++ b/containerstore.go @@ -21,11 +21,11 @@ import ( "errors" "io" - containersapi "github.com/containerd/containerd/api/services/containers/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" + containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/content/adaptor.go b/content/adaptor.go index 88bad2610e8a..4f4c76013d5a 100644 --- a/content/adaptor.go +++ b/content/adaptor.go @@ -19,7 +19,7 @@ package content import ( "strings" - "github.com/containerd/containerd/filters" + "github.com/containerd/containerd/v2/filters" ) // AdaptInfo returns `filters.Adaptor` that handles `content.Info`. diff --git a/content/helpers.go b/content/helpers.go index b5f25e1a7fa0..180ff48482a8 100644 --- a/content/helpers.go +++ b/content/helpers.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/randutil" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/content/helpers_test.go b/content/helpers_test.go index d221d39f27f5..72a7eee03466 100644 --- a/content/helpers_test.go +++ b/content/helpers_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" ) diff --git a/content/local/content_local_fuzzer.go b/content/local/content_local_fuzzer.go index a523f28d9114..fb1a15393e0b 100644 --- a/content/local/content_local_fuzzer.go +++ b/content/local/content_local_fuzzer.go @@ -28,7 +28,7 @@ import ( "github.com/opencontainers/go-digest" - "github.com/containerd/containerd/content" + "github.com/containerd/containerd/v2/content" ) func FuzzContentStoreWriter(data []byte) int { diff --git a/content/local/locks.go b/content/local/locks.go index 1e59f39b30dd..c526541864e5 100644 --- a/content/local/locks.go +++ b/content/local/locks.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" ) // Handles locking references diff --git a/content/local/readerat.go b/content/local/readerat.go index 899e85c0ba87..692630b27070 100644 --- a/content/local/readerat.go +++ b/content/local/readerat.go @@ -21,8 +21,8 @@ import ( "io" "os" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" ) // readerat implements io.ReaderAt in a completely stateless manner by opening diff --git a/content/local/store.go b/content/local/store.go index 62a3c7ec1b68..7af3d2ae9230 100644 --- a/content/local/store.go +++ b/content/local/store.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/content/local/store_test.go b/content/local/store_test.go index 48ad54a0b706..4abceb6ebc12 100644 --- a/content/local/store_test.go +++ b/content/local/store_test.go @@ -32,11 +32,11 @@ import ( "testing" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/content/testsuite" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/randutil" - "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/content/testsuite" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/randutil" + "github.com/containerd/containerd/v2/pkg/testutil" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/content/local/test_helper.go b/content/local/test_helper.go index 42de01cae8f2..b3a8f860b20a 100644 --- a/content/local/test_helper.go +++ b/content/local/test_helper.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/content" + "github.com/containerd/containerd/v2/content" ) func contentStoreEnv(t testing.TB) (context.Context, string, content.Store, func()) { diff --git a/content/local/writer.go b/content/local/writer.go index f4ac2064b989..d22c3365cd67 100644 --- a/content/local/writer.go +++ b/content/local/writer.go @@ -26,8 +26,8 @@ import ( "runtime" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" ) diff --git a/content/proxy/content_reader.go b/content/proxy/content_reader.go index 893e3b0f23df..f983e4288150 100644 --- a/content/proxy/content_reader.go +++ b/content/proxy/content_reader.go @@ -19,7 +19,7 @@ package proxy import ( "context" - contentapi "github.com/containerd/containerd/api/services/content/v1" + contentapi "github.com/containerd/containerd/v2/api/services/content/v1" digest "github.com/opencontainers/go-digest" ) diff --git a/content/proxy/content_store.go b/content/proxy/content_store.go index 8e7fb42cf0a5..609dad4dfd3b 100644 --- a/content/proxy/content_store.go +++ b/content/proxy/content_store.go @@ -20,11 +20,11 @@ import ( "context" "io" - contentapi "github.com/containerd/containerd/api/services/content/v1" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/protobuf" - protobuftypes "github.com/containerd/containerd/protobuf/types" + contentapi "github.com/containerd/containerd/v2/api/services/content/v1" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/protobuf" + protobuftypes "github.com/containerd/containerd/v2/protobuf/types" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/content/proxy/content_writer.go b/content/proxy/content_writer.go index 185115b0a43e..30f7592915ad 100644 --- a/content/proxy/content_writer.go +++ b/content/proxy/content_writer.go @@ -21,10 +21,10 @@ import ( "fmt" "io" - contentapi "github.com/containerd/containerd/api/services/content/v1" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/protobuf" + contentapi "github.com/containerd/containerd/v2/api/services/content/v1" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/protobuf" digest "github.com/opencontainers/go-digest" ) diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go index 4c4f6b2e5ea7..d673c8cf0da2 100644 --- a/content/testsuite/testsuite.go +++ b/content/testsuite/testsuite.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go index 12ff0c472048..53d2ac6e6d67 100644 --- a/contrib/apparmor/apparmor.go +++ b/contrib/apparmor/apparmor.go @@ -24,8 +24,8 @@ import ( "fmt" "os" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/apparmor/apparmor_unsupported.go b/contrib/apparmor/apparmor_unsupported.go index beb7b7c706c8..6d368cd1b86e 100644 --- a/contrib/apparmor/apparmor_unsupported.go +++ b/contrib/apparmor/apparmor_unsupported.go @@ -22,8 +22,8 @@ import ( "context" "errors" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/diffservice/service.go b/contrib/diffservice/service.go index fc509267048d..b9840594be11 100644 --- a/contrib/diffservice/service.go +++ b/contrib/diffservice/service.go @@ -19,11 +19,11 @@ package diffservice import ( "context" - diffapi "github.com/containerd/containerd/api/services/diff/v1" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/oci" + diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/oci" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go index 5af314584872..c49990835405 100644 --- a/contrib/fuzz/archive_fuzzer.go +++ b/contrib/fuzz/archive_fuzzer.go @@ -25,9 +25,9 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/content/local" - imageArchive "github.com/containerd/containerd/images/archive" + "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/content/local" + imageArchive "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 175ebc7913ed..149ca66f46a2 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -18,33 +18,33 @@ package fuzz import ( // base containerd imports - _ "github.com/containerd/containerd/diff/walking/plugin" - _ "github.com/containerd/containerd/events/plugin" - _ "github.com/containerd/containerd/gc/scheduler" - _ "github.com/containerd/containerd/leases/plugin" - _ "github.com/containerd/containerd/metadata/plugin" - _ "github.com/containerd/containerd/pkg/cri" - _ "github.com/containerd/containerd/pkg/nri/plugin" - _ "github.com/containerd/containerd/plugins/imageverifier" - _ "github.com/containerd/containerd/plugins/sandbox" - _ "github.com/containerd/containerd/plugins/streaming" - _ "github.com/containerd/containerd/plugins/transfer" - _ "github.com/containerd/containerd/runtime/restart/monitor" - _ "github.com/containerd/containerd/runtime/v2" - _ "github.com/containerd/containerd/services/containers" - _ "github.com/containerd/containerd/services/content" - _ "github.com/containerd/containerd/services/diff" - _ "github.com/containerd/containerd/services/events" - _ "github.com/containerd/containerd/services/healthcheck" - _ "github.com/containerd/containerd/services/images" - _ "github.com/containerd/containerd/services/introspection" - _ "github.com/containerd/containerd/services/leases" - _ "github.com/containerd/containerd/services/namespaces" - _ "github.com/containerd/containerd/services/opt" - _ "github.com/containerd/containerd/services/sandbox" - _ "github.com/containerd/containerd/services/snapshots" - _ "github.com/containerd/containerd/services/streaming" - _ "github.com/containerd/containerd/services/tasks" - _ "github.com/containerd/containerd/services/transfer" - _ "github.com/containerd/containerd/services/version" + _ "github.com/containerd/containerd/v2/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/events/plugin" + _ "github.com/containerd/containerd/v2/gc/scheduler" + _ "github.com/containerd/containerd/v2/leases/plugin" + _ "github.com/containerd/containerd/v2/metadata/plugin" + _ "github.com/containerd/containerd/v2/pkg/cri" + _ "github.com/containerd/containerd/v2/pkg/nri/plugin" + _ "github.com/containerd/containerd/v2/plugins/imageverifier" + _ "github.com/containerd/containerd/v2/plugins/sandbox" + _ "github.com/containerd/containerd/v2/plugins/streaming" + _ "github.com/containerd/containerd/v2/plugins/transfer" + _ "github.com/containerd/containerd/v2/runtime/restart/monitor" + _ "github.com/containerd/containerd/v2/runtime/v2" + _ "github.com/containerd/containerd/v2/services/containers" + _ "github.com/containerd/containerd/v2/services/content" + _ "github.com/containerd/containerd/v2/services/diff" + _ "github.com/containerd/containerd/v2/services/events" + _ "github.com/containerd/containerd/v2/services/healthcheck" + _ "github.com/containerd/containerd/v2/services/images" + _ "github.com/containerd/containerd/v2/services/introspection" + _ "github.com/containerd/containerd/v2/services/leases" + _ "github.com/containerd/containerd/v2/services/namespaces" + _ "github.com/containerd/containerd/v2/services/opt" + _ "github.com/containerd/containerd/v2/services/sandbox" + _ "github.com/containerd/containerd/v2/services/snapshots" + _ "github.com/containerd/containerd/v2/services/streaming" + _ "github.com/containerd/containerd/v2/services/tasks" + _ "github.com/containerd/containerd/v2/services/transfer" + _ "github.com/containerd/containerd/v2/services/version" ) diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index 0be7b4929ca6..33b05cd2063a 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -18,10 +18,10 @@ package fuzz import ( // Linux specific imports - _ "github.com/containerd/containerd/metrics/cgroups" - _ "github.com/containerd/containerd/metrics/cgroups/v2" - _ "github.com/containerd/containerd/runtime/v2/runc/options" - _ "github.com/containerd/containerd/snapshots/blockfile/plugin" - _ "github.com/containerd/containerd/snapshots/native/plugin" - _ "github.com/containerd/containerd/snapshots/overlay/plugin" + _ "github.com/containerd/containerd/v2/metrics/cgroups" + _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" + _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/contrib/fuzz/builtins_unix.go b/contrib/fuzz/builtins_unix.go index e7317c2f30e9..7b25afe01222 100644 --- a/contrib/fuzz/builtins_unix.go +++ b/contrib/fuzz/builtins_unix.go @@ -20,6 +20,6 @@ package fuzz import ( // Unix specific imports - _ "github.com/containerd/containerd/snapshots/blockfile/plugin" - _ "github.com/containerd/containerd/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/snapshots/native/plugin" ) diff --git a/contrib/fuzz/builtins_windows.go b/contrib/fuzz/builtins_windows.go index 0501f83806dc..d2377d5bc81c 100644 --- a/contrib/fuzz/builtins_windows.go +++ b/contrib/fuzz/builtins_windows.go @@ -18,8 +18,8 @@ package fuzz import ( // Windows specific imports - _ "github.com/containerd/containerd/diff/lcow" - _ "github.com/containerd/containerd/diff/windows" - _ "github.com/containerd/containerd/snapshots/lcow" - _ "github.com/containerd/containerd/snapshots/windows" + _ "github.com/containerd/containerd/v2/diff/lcow" + _ "github.com/containerd/containerd/v2/diff/windows" + _ "github.com/containerd/containerd/v2/snapshots/lcow" + _ "github.com/containerd/containerd/v2/snapshots/windows" ) diff --git a/contrib/fuzz/containerd_import_fuzzer.go b/contrib/fuzz/containerd_import_fuzzer.go index 83164a0ccda6..978611117648 100644 --- a/contrib/fuzz/containerd_import_fuzzer.go +++ b/contrib/fuzz/containerd_import_fuzzer.go @@ -21,8 +21,8 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/namespaces" ) func fuzzContext() (context.Context, context.CancelFunc) { diff --git a/contrib/fuzz/content_fuzzer.go b/contrib/fuzz/content_fuzzer.go index abf423b928a8..c3b493c8fba0 100644 --- a/contrib/fuzz/content_fuzzer.go +++ b/contrib/fuzz/content_fuzzer.go @@ -29,9 +29,9 @@ import ( digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/images/archive" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/images/archive" ) // checkBlobPath performs some basic validation diff --git a/contrib/fuzz/cri_fuzzer.go b/contrib/fuzz/cri_fuzzer.go index 5a6f210354cd..46a69063c858 100644 --- a/contrib/fuzz/cri_fuzzer.go +++ b/contrib/fuzz/cri_fuzzer.go @@ -24,10 +24,10 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/server" - "github.com/containerd/containerd/pkg/cri/server/images" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/cri/server" + "github.com/containerd/containerd/v2/pkg/cri/server/images" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) var ( diff --git a/contrib/fuzz/cri_sbserver_fuzzer.go b/contrib/fuzz/cri_sbserver_fuzzer.go index 1146c1326497..8b907bb7d62a 100644 --- a/contrib/fuzz/cri_sbserver_fuzzer.go +++ b/contrib/fuzz/cri_sbserver_fuzzer.go @@ -21,9 +21,9 @@ package fuzz import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/server" + "github.com/containerd/containerd/v2" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/server" ) func FuzzCRISandboxServer(data []byte) int { diff --git a/contrib/fuzz/cri_server_fuzzer.go b/contrib/fuzz/cri_server_fuzzer.go index 2b6622bf8fa5..039f4ea211cc 100644 --- a/contrib/fuzz/cri_server_fuzzer.go +++ b/contrib/fuzz/cri_server_fuzzer.go @@ -21,9 +21,9 @@ package fuzz import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/server" + "github.com/containerd/containerd/v2" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/server" ) func FuzzCRIServer(data []byte) int { diff --git a/contrib/fuzz/daemon.go b/contrib/fuzz/daemon.go index 37325a447823..3077414e819c 100644 --- a/contrib/fuzz/daemon.go +++ b/contrib/fuzz/daemon.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/services/server" - "github.com/containerd/containerd/services/server/config" - "github.com/containerd/containerd/sys" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/services/server" + "github.com/containerd/containerd/v2/services/server/config" + "github.com/containerd/containerd/v2/sys" "github.com/containerd/log" ) diff --git a/contrib/fuzz/diff_fuzzer.go b/contrib/fuzz/diff_fuzzer.go index 08dbf31acb0f..b49ba495ab11 100644 --- a/contrib/fuzz/diff_fuzzer.go +++ b/contrib/fuzz/diff_fuzzer.go @@ -21,10 +21,10 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/diff/apply" - "github.com/containerd/containerd/diff/walking" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/diff/apply" + "github.com/containerd/containerd/v2/diff/walking" + "github.com/containerd/containerd/v2/mount" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/exchange_fuzzer.go b/contrib/fuzz/exchange_fuzzer.go index 24954c7ad73e..52a95d5a2d41 100644 --- a/contrib/fuzz/exchange_fuzzer.go +++ b/contrib/fuzz/exchange_fuzzer.go @@ -19,10 +19,10 @@ import ( "context" fuzz "github.com/AdaLogics/go-fuzz-headers" - eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/events/exchange" - "github.com/containerd/containerd/namespaces" + eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/namespaces" ) func FuzzExchange(data []byte) int { diff --git a/contrib/fuzz/fuzz_images.go b/contrib/fuzz/fuzz_images.go index bf5a02a129f4..dc4c527d8086 100644 --- a/contrib/fuzz/fuzz_images.go +++ b/contrib/fuzz/fuzz_images.go @@ -20,9 +20,9 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index 45837a2d2679..a1a803590e86 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -26,15 +26,15 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/native" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/native" ) func testEnv() (context.Context, *bolt.DB, func(), error) { diff --git a/contrib/fuzz/oss_fuzz_build.sh b/contrib/fuzz/oss_fuzz_build.sh index c94a303e57c0..cffa1f193772 100755 --- a/contrib/fuzz/oss_fuzz_build.sh +++ b/contrib/fuzz/oss_fuzz_build.sh @@ -29,7 +29,7 @@ compile_fuzzers() { if [[ "$line" =~ (.*)/.*:.*(Fuzz[A-Za-z0-9]+) ]]; then local pkg=${BASH_REMATCH[1]} local func=${BASH_REMATCH[2]} - "$compile_fuzzer" "github.com/containerd/containerd/$pkg" "$func" "fuzz_$func" + "$compile_fuzzer" "github.com/containerd/containerd/v2/$pkg" "$func" "fuzz_$func" else echo "failed to parse: $line" exit 1 diff --git a/contrib/nvidia/nvidia.go b/contrib/nvidia/nvidia.go index a808dd166c94..33a6bc34a197 100644 --- a/contrib/nvidia/nvidia.go +++ b/contrib/nvidia/nvidia.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" exec "golang.org/x/sys/execabs" ) diff --git a/contrib/seccomp/seccomp.go b/contrib/seccomp/seccomp.go index becf089883e0..c7f91f51fd7d 100644 --- a/contrib/seccomp/seccomp.go +++ b/contrib/seccomp/seccomp.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/seccomp/seccomp_default.go b/contrib/seccomp/seccomp_default.go index 7df50c34aaa3..c5416a061600 100644 --- a/contrib/seccomp/seccomp_default.go +++ b/contrib/seccomp/seccomp_default.go @@ -23,7 +23,7 @@ import ( "golang.org/x/sys/unix" - "github.com/containerd/containerd/contrib/seccomp/kernelversion" + "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go index d4508971e729..114a1c18780b 100644 --- a/contrib/snapshotservice/service.go +++ b/contrib/snapshotservice/service.go @@ -19,11 +19,11 @@ package snapshotservice import ( "context" - snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/snapshots" + snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/snapshots" ) var empty = &ptypes.Empty{} diff --git a/diff.go b/diff.go index 0b1d44ed5bd6..0af7048f894e 100644 --- a/diff.go +++ b/diff.go @@ -17,9 +17,9 @@ package containerd import ( - diffapi "github.com/containerd/containerd/api/services/diff/v1" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/diff/proxy" + diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/diff/proxy" ) // DiffService handles the computation and application of diffs diff --git a/diff/apply/apply.go b/diff/apply/apply.go index 6f4754a31572..9167e3ee7552 100644 --- a/diff/apply/apply.go +++ b/diff/apply/apply.go @@ -22,9 +22,9 @@ import ( "io" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/mount" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/diff/apply/apply_darwin.go b/diff/apply/apply_darwin.go index dd93d3107d7a..9cc362e49367 100644 --- a/diff/apply/apply_darwin.go +++ b/diff/apply/apply_darwin.go @@ -21,8 +21,8 @@ import ( "io" "os" - "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/mount" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader) error { diff --git a/diff/apply/apply_linux.go b/diff/apply/apply_linux.go index dcd269067f4d..d00af68bc359 100644 --- a/diff/apply/apply_linux.go +++ b/diff/apply/apply_linux.go @@ -22,10 +22,10 @@ import ( "io" "strings" - "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/userns" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader) error { diff --git a/diff/apply/apply_other.go b/diff/apply/apply_other.go index 3bd79781d439..74902bf6a3b1 100644 --- a/diff/apply/apply_other.go +++ b/diff/apply/apply_other.go @@ -22,8 +22,8 @@ import ( "context" "io" - "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/mount" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader) error { diff --git a/diff/diff.go b/diff/diff.go index 40e63f798c7f..d4462faba045 100644 --- a/diff/diff.go +++ b/diff/diff.go @@ -21,7 +21,7 @@ import ( "io" "time" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/mount" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go index e4b7afe71acf..6deef33f7e44 100644 --- a/diff/lcow/lcow.go +++ b/diff/lcow/lcow.go @@ -30,14 +30,14 @@ import ( "github.com/Microsoft/go-winio/pkg/security" "github.com/Microsoft/hcsshim/ext4/tar2ext4" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/diff/proxy/differ.go b/diff/proxy/differ.go index 4e61bfdee00d..84e62145d7e4 100644 --- a/diff/proxy/differ.go +++ b/diff/proxy/differ.go @@ -19,14 +19,14 @@ package proxy import ( "context" - diffapi "github.com/containerd/containerd/api/services/diff/v1" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/epoch" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" + diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/diff/stream.go b/diff/stream.go index b80e6d1a5c7f..940f82a6bcf9 100644 --- a/diff/stream.go +++ b/diff/stream.go @@ -22,8 +22,8 @@ import ( "io" "os" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/images" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/diff/stream_unix.go b/diff/stream_unix.go index 82fc31b402d3..4ff795c2c6f5 100644 --- a/diff/stream_unix.go +++ b/diff/stream_unix.go @@ -27,8 +27,8 @@ import ( "os" "sync" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/proto" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/typeurl/v2" exec "golang.org/x/sys/execabs" ) diff --git a/diff/stream_windows.go b/diff/stream_windows.go index d43a9708dd84..f69ccf135026 100644 --- a/diff/stream_windows.go +++ b/diff/stream_windows.go @@ -29,8 +29,8 @@ import ( "github.com/Microsoft/go-winio" exec "golang.org/x/sys/execabs" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/proto" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/diff/walking/differ.go b/diff/walking/differ.go index 7dfb5d571314..2f94b3be20d1 100644 --- a/diff/walking/differ.go +++ b/diff/walking/differ.go @@ -25,14 +25,14 @@ import ( "io" "time" - "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/epoch" + "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/diff/walking/plugin/plugin.go b/diff/walking/plugin/plugin.go index 40456ee96031..2604ed7a7165 100644 --- a/diff/walking/plugin/plugin.go +++ b/diff/walking/plugin/plugin.go @@ -17,14 +17,14 @@ package plugin import ( - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/diff/apply" - "github.com/containerd/containerd/diff/walking" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/diff/apply" + "github.com/containerd/containerd/v2/diff/walking" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" ) func init() { diff --git a/diff/windows/windows.go b/diff/windows/windows.go index 2aeb2ededf20..798f0f077868 100644 --- a/diff/windows/windows.go +++ b/diff/windows/windows.go @@ -28,19 +28,19 @@ import ( "time" "github.com/Microsoft/go-winio" - "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/epoch" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/events.go b/events.go index ebf71472b227..d03cb392ef47 100644 --- a/events.go +++ b/events.go @@ -19,10 +19,10 @@ package containerd import ( "context" - eventsapi "github.com/containerd/containerd/api/services/events/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/protobuf" + eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" ) diff --git a/events/exchange/exchange.go b/events/exchange/exchange.go index e1a5a33fa914..e54707caad89 100644 --- a/events/exchange/exchange.go +++ b/events/exchange/exchange.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/identifiers" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/identifiers" + "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/log" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" diff --git a/events/exchange/exchange_test.go b/events/exchange/exchange_test.go index 422586cf3083..d419a4fa1836 100644 --- a/events/exchange/exchange_test.go +++ b/events/exchange/exchange_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/protobuf" + eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" ) diff --git a/events/plugin/plugin.go b/events/plugin/plugin.go index ed89fc68bf0c..33025cf77029 100644 --- a/events/plugin/plugin.go +++ b/events/plugin/plugin.go @@ -17,10 +17,10 @@ package plugin import ( - "github.com/containerd/containerd/events/exchange" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" ) func init() { diff --git a/export.go b/export.go index 81f199226d4a..806cb5815e2d 100644 --- a/export.go +++ b/export.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/containerd/containerd/images/archive" + "github.com/containerd/containerd/v2/images/archive" ) // Export exports images to a Tar stream. diff --git a/filters/parser.go b/filters/parser.go index 32767909b1c9..a8cb4b944201 100644 --- a/filters/parser.go +++ b/filters/parser.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" ) /* diff --git a/gc/scheduler/scheduler.go b/gc/scheduler/scheduler.go index 525f1dfe0f4a..6b15eb014c19 100644 --- a/gc/scheduler/scheduler.go +++ b/gc/scheduler/scheduler.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" ) diff --git a/gc/scheduler/scheduler_test.go b/gc/scheduler/scheduler_test.go index d6d9a61f7359..05df769732ce 100644 --- a/gc/scheduler/scheduler_test.go +++ b/gc/scheduler/scheduler_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/gc" + "github.com/containerd/containerd/v2/gc" "github.com/stretchr/testify/assert" ) diff --git a/go.mod b/go.mod index 7e1c94dc9b5f..f0c8d42a114d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/containerd/containerd +module github.com/containerd/containerd/v2 go 1.20 @@ -82,6 +82,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cilium/ebpf v0.9.1 // indirect + github.com/containerd/containerd v1.7.8 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/emicklei/go-restful/v3 v3.10.2 // indirect github.com/go-logr/logr v1.2.4 // indirect diff --git a/go.sum b/go.sum index 389db459875f..dd46d3ea0286 100644 --- a/go.sum +++ b/go.sum @@ -159,6 +159,8 @@ github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1: github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= +github.com/containerd/containerd v1.7.8 h1:RkwgOW3AVUT3H/dyT0W03Dc8AzlpMG65lX48KftOFSM= +github.com/containerd/containerd v1.7.8/go.mod h1:L/Hn9qylJtUFT7cPeM0Sr3fATj+WjHwRQ0lyrYk3OPY= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= diff --git a/grpc.go b/grpc.go index c3506d735758..bb6e3a3df4f4 100644 --- a/grpc.go +++ b/grpc.go @@ -19,7 +19,7 @@ package containerd import ( "context" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/namespaces" "google.golang.org/grpc" ) diff --git a/identifiers/validate.go b/identifiers/validate.go index cbd3a52ba9e2..7eb177430396 100644 --- a/identifiers/validate.go +++ b/identifiers/validate.go @@ -28,7 +28,7 @@ import ( "fmt" "regexp" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" ) const ( diff --git a/identifiers/validate_test.go b/identifiers/validate_test.go index 77f926c0c389..cd5ce5f23a6b 100644 --- a/identifiers/validate_test.go +++ b/identifiers/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" ) func TestValidIdentifiers(t *testing.T) { diff --git a/image.go b/image.go index 0b60eb719fb6..75d7d19be9f4 100644 --- a/image.go +++ b/image.go @@ -23,16 +23,16 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/usage" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/pkg/kmutex" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/rootfs" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/images/usage" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/kmutex" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/rootfs" + "github.com/containerd/containerd/v2/snapshots" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/image_store.go b/image_store.go index ff3f6ec35029..c82059e63ca9 100644 --- a/image_store.go +++ b/image_store.go @@ -19,13 +19,13 @@ package containerd import ( "context" - imagesapi "github.com/containerd/containerd/api/services/images/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/epoch" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" + imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/images/archive/exporter.go b/images/archive/exporter.go index 460939ce4c7e..af1121772870 100644 --- a/images/archive/exporter.go +++ b/images/archive/exporter.go @@ -25,10 +25,10 @@ import ( "path" "sort" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/platforms" digest "github.com/opencontainers/go-digest" ocispecs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/archive/importer.go b/images/archive/importer.go index 09480836510c..b9eb095eca5e 100644 --- a/images/archive/importer.go +++ b/images/archive/importer.go @@ -27,12 +27,12 @@ import ( "io" "path" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" diff --git a/images/archive/reference.go b/images/archive/reference.go index 8dc209905858..8d8b548cfe27 100644 --- a/images/archive/reference.go +++ b/images/archive/reference.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/reference" + "github.com/containerd/containerd/v2/reference" distref "github.com/distribution/reference" "github.com/opencontainers/go-digest" ) diff --git a/images/converter/converter.go b/images/converter/converter.go index 441e0169efc1..a978787bdbff 100644 --- a/images/converter/converter.go +++ b/images/converter/converter.go @@ -20,10 +20,10 @@ package converter import ( "context" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/platforms" ) type convertOpts struct { diff --git a/images/converter/default.go b/images/converter/default.go index 1b3a555839f2..f44a2247bcaa 100644 --- a/images/converter/default.go +++ b/images/converter/default.go @@ -24,9 +24,9 @@ import ( "strings" "sync" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/converter/uncompress/uncompress.go b/images/converter/uncompress/uncompress.go index ceb998fb8ff6..bf757fb1e18b 100644 --- a/images/converter/uncompress/uncompress.go +++ b/images/converter/uncompress/uncompress.go @@ -21,12 +21,12 @@ import ( "fmt" "io" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/converter" - "github.com/containerd/containerd/labels" + "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/images/converter" + "github.com/containerd/containerd/v2/labels" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/diffid.go b/images/diffid.go index 3f873e4933d1..95ba3df89e8d 100644 --- a/images/diffid.go +++ b/images/diffid.go @@ -23,9 +23,9 @@ import ( "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/labels" + "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/labels" "github.com/containerd/log" ) diff --git a/images/handlers.go b/images/handlers.go index cd3e708afff4..44a6a93f4b1f 100644 --- a/images/handlers.go +++ b/images/handlers.go @@ -22,9 +22,9 @@ import ( "fmt" "sort" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/images/image.go b/images/image.go index 6823c48c4099..68065a447ab1 100644 --- a/images/image.go +++ b/images/image.go @@ -23,9 +23,9 @@ import ( "sort" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/imagetest/content.go b/images/imagetest/content.go index edba543bb0a7..25db43f91f07 100644 --- a/images/imagetest/content.go +++ b/images/imagetest/content.go @@ -24,9 +24,9 @@ import ( "sync" "testing" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/images" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/importexport.go b/images/importexport.go index 843adcadc7ec..fe5d29f1f128 100644 --- a/images/importexport.go +++ b/images/importexport.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/containerd/containerd/content" + "github.com/containerd/containerd/v2/content" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/mediatypes.go b/images/mediatypes.go index d3b28d42dc61..790bc8a921bd 100644 --- a/images/mediatypes.go +++ b/images/mediatypes.go @@ -22,7 +22,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/usage/calculator.go b/images/usage/calculator.go index bf66c693dc22..519e71d8f641 100644 --- a/images/usage/calculator.go +++ b/images/usage/calculator.go @@ -21,11 +21,11 @@ import ( "strings" "sync/atomic" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" diff --git a/images/usage/calculator_test.go b/images/usage/calculator_test.go index a193ccbac953..ac8887114d57 100644 --- a/images/usage/calculator_test.go +++ b/images/usage/calculator_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/imagetest" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/images/imagetest" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log/logtest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/import.go b/import.go index f80a78712ea3..e1b7b6ff09cf 100644 --- a/import.go +++ b/import.go @@ -20,10 +20,10 @@ import ( "context" "io" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/archive" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/platforms" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/install.go b/install.go index a307960b8c35..59b422b3ac7f 100644 --- a/install.go +++ b/install.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" ) // Install a binary image into the opt service. diff --git a/integration/addition_gids_test.go b/integration/addition_gids_test.go index b3ddf9875df7..5dc0f58e3054 100644 --- a/integration/addition_gids_test.go +++ b/integration/addition_gids_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index c493b6df08b2..f95766d72281 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -22,33 +22,33 @@ import ( "sync" "testing" - "github.com/containerd/containerd" - "github.com/containerd/containerd/pkg/cri/constants" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugins" - ctrdsrv "github.com/containerd/containerd/services/server" - srvconfig "github.com/containerd/containerd/services/server/config" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/pkg/cri/constants" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugins" + ctrdsrv "github.com/containerd/containerd/v2/services/server" + srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/log/logtest" - _ "github.com/containerd/containerd/diff/walking/plugin" - _ "github.com/containerd/containerd/events/plugin" - _ "github.com/containerd/containerd/gc/scheduler" - _ "github.com/containerd/containerd/leases/plugin" - _ "github.com/containerd/containerd/metadata/plugin" - _ "github.com/containerd/containerd/runtime/v2" - _ "github.com/containerd/containerd/runtime/v2/runc/options" - _ "github.com/containerd/containerd/services/containers" - _ "github.com/containerd/containerd/services/content" - _ "github.com/containerd/containerd/services/diff" - _ "github.com/containerd/containerd/services/events" - _ "github.com/containerd/containerd/services/images" - _ "github.com/containerd/containerd/services/introspection" - _ "github.com/containerd/containerd/services/leases" - _ "github.com/containerd/containerd/services/namespaces" - _ "github.com/containerd/containerd/services/snapshots" - _ "github.com/containerd/containerd/services/tasks" - _ "github.com/containerd/containerd/services/version" + _ "github.com/containerd/containerd/v2/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/events/plugin" + _ "github.com/containerd/containerd/v2/gc/scheduler" + _ "github.com/containerd/containerd/v2/leases/plugin" + _ "github.com/containerd/containerd/v2/metadata/plugin" + _ "github.com/containerd/containerd/v2/runtime/v2" + _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" + _ "github.com/containerd/containerd/v2/services/containers" + _ "github.com/containerd/containerd/v2/services/content" + _ "github.com/containerd/containerd/v2/services/diff" + _ "github.com/containerd/containerd/v2/services/events" + _ "github.com/containerd/containerd/v2/services/images" + _ "github.com/containerd/containerd/v2/services/introspection" + _ "github.com/containerd/containerd/v2/services/leases" + _ "github.com/containerd/containerd/v2/services/namespaces" + _ "github.com/containerd/containerd/v2/services/snapshots" + _ "github.com/containerd/containerd/v2/services/tasks" + _ "github.com/containerd/containerd/v2/services/version" "github.com/stretchr/testify/assert" ) diff --git a/integration/build_local_containerd_helper_test_linux.go b/integration/build_local_containerd_helper_test_linux.go index dc366a51810d..1ce31d7ad79d 100644 --- a/integration/build_local_containerd_helper_test_linux.go +++ b/integration/build_local_containerd_helper_test_linux.go @@ -18,7 +18,7 @@ package integration import ( // Register for linux platforms - _ "github.com/containerd/containerd/plugins/sandbox" // WithInMemoryServices will fail otherwise - _ "github.com/containerd/containerd/services/sandbox" // WithInMemoryServices will fail otherwise - _ "github.com/containerd/containerd/snapshots/overlay/plugin" + _ "github.com/containerd/containerd/v2/plugins/sandbox" // WithInMemoryServices will fail otherwise + _ "github.com/containerd/containerd/v2/services/sandbox" // WithInMemoryServices will fail otherwise + _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/integration/client/benchmark_test.go b/integration/client/benchmark_test.go index d7c9f6b97b61..ed3257baca6f 100644 --- a/integration/client/benchmark_test.go +++ b/integration/client/benchmark_test.go @@ -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) { diff --git a/integration/client/client.go b/integration/client/client.go index 637270bdfb65..d0e5804f1cd8 100644 --- a/integration/client/client.go +++ b/integration/client/client.go @@ -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" ) diff --git a/integration/client/client_test.go b/integration/client/client_test.go index aec37b0ea723..9623718a3890 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -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" ) diff --git a/integration/client/client_ttrpc_test.go b/integration/client/client_ttrpc_test.go index 68714038c8a5..03ba8b46acaa 100644 --- a/integration/client/client_ttrpc_test.go +++ b/integration/client/client_ttrpc_test.go @@ -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" ) diff --git a/integration/client/client_unix_test.go b/integration/client/client_unix_test.go index 0d7b7d49f24a..f645976fea04 100644 --- a/integration/client/client_unix_test.go +++ b/integration/client/client_unix_test.go @@ -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 ( diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go index d7043b7ceb8a..48d177e804b2 100644 --- a/integration/client/container_checkpoint_test.go +++ b/integration/client/container_checkpoint_test.go @@ -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 ( diff --git a/integration/client/container_fuzzer.go b/integration/client/container_fuzzer.go index 7d2762113ed9..7691a5bf7ae0 100644 --- a/integration/client/container_fuzzer.go +++ b/integration/client/container_fuzzer.go @@ -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" ) diff --git a/integration/client/container_idmapped_linux_test.go b/integration/client/container_idmapped_linux_test.go index ff6bdbc84e9e..5f0ef4fdb43e 100644 --- a/integration/client/container_idmapped_linux_test.go +++ b/integration/client/container_idmapped_linux_test.go @@ -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" ) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 82a1c1fd769d..c2873a86be40 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -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" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index ac6929c1b67b..19075a46f907 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -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" diff --git a/integration/client/content_test.go b/integration/client/content_test.go index ffcb1b810031..4a10e61099b1 100644 --- a/integration/client/content_test.go +++ b/integration/client/content_test.go @@ -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) { diff --git a/integration/client/convert_test.go b/integration/client/convert_test.go index a9246fd8b909..07d524b77be1 100644 --- a/integration/client/convert_test.go +++ b/integration/client/convert_test.go @@ -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" ) diff --git a/integration/client/daemon.go b/integration/client/daemon.go index 7698577920aa..1bd80bef00b0 100644 --- a/integration/client/daemon.go +++ b/integration/client/daemon.go @@ -26,7 +26,7 @@ import ( "syscall" "time" - . "github.com/containerd/containerd" + . "github.com/containerd/containerd/v2" exec "golang.org/x/sys/execabs" ) diff --git a/integration/client/daemon_config_linux_test.go b/integration/client/daemon_config_linux_test.go index 611c9e61c0e6..bd8c2d022b40 100644 --- a/integration/client/daemon_config_linux_test.go +++ b/integration/client/daemon_config_linux_test.go @@ -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 diff --git a/integration/client/export_test.go b/integration/client/export_test.go index e8e6fca357ac..67c5ab840ce3 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -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" ) diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go index ae93e7abbd17..60d1bbac4434 100644 --- a/integration/client/helpers_unix_test.go +++ b/integration/client/helpers_unix_test.go @@ -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" ) diff --git a/integration/client/helpers_windows_test.go b/integration/client/helpers_windows_test.go index 3616c091d932..c5b105cb5540 100644 --- a/integration/client/helpers_windows_test.go +++ b/integration/client/helpers_windows_test.go @@ -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" ) diff --git a/integration/client/image_test.go b/integration/client/image_test.go index fd194163eced..edfa5ac28b04 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -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" ) diff --git a/integration/client/import_test.go b/integration/client/import_test.go index 718710e2bf21..9b0255687255 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -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" diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 455e128141e7..59eabc763c81 100644 --- a/integration/client/lease_test.go +++ b/integration/client/lease_test.go @@ -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" ) diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index dba590531c86..8a6f02821d2a 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -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" diff --git a/integration/client/signals_test.go b/integration/client/signals_test.go index 89a6c1298b6a..4d52945b297a 100644 --- a/integration/client/signals_test.go +++ b/integration/client/signals_test.go @@ -21,7 +21,7 @@ import ( "syscall" "testing" - . "github.com/containerd/containerd" + . "github.com/containerd/containerd/v2" ) func TestParseSignal(t *testing.T) { diff --git a/integration/client/snapshot_test.go b/integration/client/snapshot_test.go index 4086bd42d3d2..65e9dc586cc1 100644 --- a/integration/client/snapshot_test.go +++ b/integration/client/snapshot_test.go @@ -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) { diff --git a/integration/client/transfer_test.go b/integration/client/transfer_test.go index 86ffa2006c13..075d946959b4 100644 --- a/integration/client/transfer_test.go +++ b/integration/client/transfer_test.go @@ -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) { diff --git a/integration/container_event_test.go b/integration/container_event_test.go index ef13e44ba962..30f663bdf6a2 100644 --- a/integration/container_event_test.go +++ b/integration/container_event_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/container_exec_test.go b/integration/container_exec_test.go index be2635f68025..9c1538720406 100644 --- a/integration/container_exec_test.go +++ b/integration/container_exec_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/container_log_test.go b/integration/container_log_test.go index 7896ca4e60b6..983b4b380e6c 100644 --- a/integration/container_log_test.go +++ b/integration/container_log_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/container_restart_test.go b/integration/container_restart_test.go index 5fb6b69dc820..d8ff4b16c494 100644 --- a/integration/container_restart_test.go +++ b/integration/container_restart_test.go @@ -19,7 +19,7 @@ package integration import ( "testing" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/integration/container_stats_test.go b/integration/container_stats_test.go index 84f5dc536e9c..4374b06d3598 100644 --- a/integration/container_stats_test.go +++ b/integration/container_stats_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/container_stop_test.go b/integration/container_stop_test.go index 6c6ae9d45c45..616a940d6a75 100644 --- a/integration/container_stop_test.go +++ b/integration/container_stop_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/container_update_resources_test.go b/integration/container_update_resources_test.go index f969150f8f49..659e448671b3 100644 --- a/integration/container_update_resources_test.go +++ b/integration/container_update_resources_test.go @@ -28,9 +28,9 @@ 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/integration/images" - criopts "github.com/containerd/containerd/pkg/cri/opts" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/integration/images" + criopts "github.com/containerd/containerd/v2/pkg/cri/opts" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/container_volume_test.go b/integration/container_volume_test.go index 7a9f06e4b40d..71e09779b129 100644 --- a/integration/container_volume_test.go +++ b/integration/container_volume_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/container_without_image_ref_test.go b/integration/container_without_image_ref_test.go index a9d02f48f69d..1e613d27e886 100644 --- a/integration/container_without_image_ref_test.go +++ b/integration/container_without_image_ref_test.go @@ -19,7 +19,7 @@ package integration import ( "testing" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go index e4bf3eb27ff0..8e754423a939 100644 --- a/integration/containerd_image_test.go +++ b/integration/containerd_image_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/integration/images" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/cri/labels" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/integration/images" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/duplicate_name_test.go b/integration/duplicate_name_test.go index 1037d5fae613..bd39ad50c2fa 100644 --- a/integration/duplicate_name_test.go +++ b/integration/duplicate_name_test.go @@ -19,7 +19,7 @@ package integration import ( "testing" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/require" ) diff --git a/integration/failpoint/cmd/cni-bridge-fp/main_linux.go b/integration/failpoint/cmd/cni-bridge-fp/main_linux.go index 50c4b203bcf6..853a3b2d73f5 100644 --- a/integration/failpoint/cmd/cni-bridge-fp/main_linux.go +++ b/integration/failpoint/cmd/cni-bridge-fp/main_linux.go @@ -25,7 +25,7 @@ import ( "path/filepath" "syscall" - "github.com/containerd/containerd/pkg/failpoint" + "github.com/containerd/containerd/v2/pkg/failpoint" "github.com/containerd/continuity" "github.com/containernetworking/cni/pkg/invoke" "github.com/containernetworking/cni/pkg/skel" diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go index c55ffb77b60e..8fe5f02fa4b1 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go @@ -19,9 +19,9 @@ package main import ( "context" - "github.com/containerd/containerd/runtime/v2/runc/manager" - _ "github.com/containerd/containerd/runtime/v2/runc/pause" - "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/v2/runtime/v2/runc/manager" + _ "github.com/containerd/containerd/v2/runtime/v2/runc/pause" + "github.com/containerd/containerd/v2/runtime/v2/shim" ) func main() { diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go index c0b72681efbd..1f75e72b6d9e 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go @@ -23,15 +23,15 @@ import ( "path/filepath" "strings" - taskapi "github.com/containerd/containerd/api/runtime/task/v3" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/failpoint" - "github.com/containerd/containerd/pkg/shutdown" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/runtime/v2/runc/task" - "github.com/containerd/containerd/runtime/v2/shim" + taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/failpoint" + "github.com/containerd/containerd/v2/pkg/shutdown" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/runtime/v2/runc/task" + "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/ttrpc" ) diff --git a/integration/failpoint/cmd/runc-fp/main.go b/integration/failpoint/cmd/runc-fp/main.go index 7b6f8f6fc729..3141dedcbcfd 100644 --- a/integration/failpoint/cmd/runc-fp/main.go +++ b/integration/failpoint/cmd/runc-fp/main.go @@ -25,7 +25,7 @@ import ( "os/exec" "syscall" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/oci" "github.com/sirupsen/logrus" ) diff --git a/integration/image_load_test.go b/integration/image_load_test.go index 9a3f05c6033d..0894f24f2a59 100644 --- a/integration/image_load_test.go +++ b/integration/image_load_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/require" exec "golang.org/x/sys/execabs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index 683e1f8c4650..0bdfd510b4fa 100644 --- a/integration/image_pull_timeout_test.go +++ b/integration/image_pull_timeout_test.go @@ -33,12 +33,12 @@ import ( "testing" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/namespaces" - criconfig "github.com/containerd/containerd/pkg/cri/config" - criserver "github.com/containerd/containerd/pkg/cri/server" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/namespaces" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + criserver "github.com/containerd/containerd/v2/pkg/cri/server" "github.com/containerd/log" "github.com/containerd/log/logtest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/imagefs_info_test.go b/integration/imagefs_info_test.go index e2af553e545e..2f7d9c526cf1 100644 --- a/integration/imagefs_info_test.go +++ b/integration/imagefs_info_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/issue7496_linux_test.go b/integration/issue7496_linux_test.go index c77dbcfc1883..2573a2f72306 100644 --- a/integration/issue7496_linux_test.go +++ b/integration/issue7496_linux_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - apitask "github.com/containerd/containerd/api/runtime/task/v3" - "github.com/containerd/containerd/integration/images" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/runtime/v2/shim" + apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/integration/images" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/ttrpc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/issue7496_shutdown_linux_test.go b/integration/issue7496_shutdown_linux_test.go index 70ade7e41bf8..7af2327d5ac7 100644 --- a/integration/issue7496_shutdown_linux_test.go +++ b/integration/issue7496_shutdown_linux_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - apitask "github.com/containerd/containerd/api/runtime/task/v3" - "github.com/containerd/containerd/namespaces" + apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/namespaces" ) // TestIssue7496_ShouldRetryShutdown is based on https://github.com/containerd/containerd/issues/7496. diff --git a/integration/main_test.go b/integration/main_test.go index ffe1e29a9384..cacd24a71a44 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -33,16 +33,16 @@ import ( "testing" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - cri "github.com/containerd/containerd/integration/cri-api/pkg/apis" - _ "github.com/containerd/containerd/integration/images" // Keep this around to parse `imageListFile` command line var - "github.com/containerd/containerd/integration/remote" - dialer "github.com/containerd/containerd/integration/remote/util" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/constants" - "github.com/containerd/containerd/pkg/cri/server" - "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/containerd/v2" + "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 + "github.com/containerd/containerd/v2/integration/remote" + dialer "github.com/containerd/containerd/v2/integration/remote/util" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/constants" + "github.com/containerd/containerd/v2/pkg/cri/server" + "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/log" "github.com/opencontainers/selinux/go-selinux" "github.com/stretchr/testify/assert" diff --git a/integration/nri_test.go b/integration/nri_test.go index e1bd508c76bc..ca04c37db643 100644 --- a/integration/nri_test.go +++ b/integration/nri_test.go @@ -34,12 +34,12 @@ import ( "github.com/opencontainers/selinux/go-selinux" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - cri "github.com/containerd/containerd/integration/cri-api/pkg/apis" + cri "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" ) const ( diff --git a/integration/pod_dualstack_test.go b/integration/pod_dualstack_test.go index 89371a55ebd2..b30a84611bb6 100644 --- a/integration/pod_dualstack_test.go +++ b/integration/pod_dualstack_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/pod_hostname_test.go b/integration/pod_hostname_test.go index 3da545603fe8..661362b026d0 100644 --- a/integration/pod_hostname_test.go +++ b/integration/pod_hostname_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/pod_userns_linux_test.go b/integration/pod_userns_linux_test.go index 0980ec66448e..ffd756452254 100644 --- a/integration/pod_userns_linux_test.go +++ b/integration/pod_userns_linux_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" runc "github.com/containerd/go-runc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/remote/remote_image.go b/integration/remote/remote_image.go index ad2b04e78b4f..43c20aea6ebb 100644 --- a/integration/remote/remote_image.go +++ b/integration/remote/remote_image.go @@ -42,10 +42,10 @@ import ( "google.golang.org/grpc/credentials/insecure" "k8s.io/klog/v2" - internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis" + internalapi "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/integration/remote/util" + "github.com/containerd/containerd/v2/integration/remote/util" ) // ImageService is a gRPC implementation of internalapi.ImageManagerService. diff --git a/integration/remote/remote_runtime.go b/integration/remote/remote_runtime.go index 22d3d72bb36b..0474cfe3be6d 100644 --- a/integration/remote/remote_runtime.go +++ b/integration/remote/remote_runtime.go @@ -43,12 +43,12 @@ import ( "google.golang.org/grpc/credentials/insecure" "k8s.io/klog/v2" - internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis" + internalapi "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis" "k8s.io/component-base/logs/logreduction" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" utilexec "k8s.io/utils/exec" - "github.com/containerd/containerd/integration/remote/util" + "github.com/containerd/containerd/v2/integration/remote/util" ) // RuntimeService is a gRPC implementation of internalapi.RuntimeService. diff --git a/integration/restart_test.go b/integration/restart_test.go index 879ddcc669e4..0bc268262886 100644 --- a/integration/restart_test.go +++ b/integration/restart_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/sandbox_run_rollback_test.go b/integration/sandbox_run_rollback_test.go index c9ecf5c3f298..900d68a39b38 100644 --- a/integration/sandbox_run_rollback_test.go +++ b/integration/sandbox_run_rollback_test.go @@ -35,8 +35,8 @@ import ( "github.com/stretchr/testify/require" criapiv1 "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/server/podsandbox" - "github.com/containerd/containerd/pkg/failpoint" + "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" + "github.com/containerd/containerd/v2/pkg/failpoint" ) const ( diff --git a/integration/shim_dial_unix_test.go b/integration/shim_dial_unix_test.go index 4855f99201a8..6ce56557c759 100644 --- a/integration/shim_dial_unix_test.go +++ b/integration/shim_dial_unix_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - v2shimcli "github.com/containerd/containerd/runtime/v2/shim" + v2shimcli "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/ttrpc" ) diff --git a/integration/truncindex_test.go b/integration/truncindex_test.go index 5350ff6b4d27..a3264471cd3f 100644 --- a/integration/truncindex_test.go +++ b/integration/truncindex_test.go @@ -20,7 +20,7 @@ import ( goruntime "runtime" "testing" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/volume_copy_up_test.go b/integration/volume_copy_up_test.go index 086f2021d946..526a55ba0b1b 100644 --- a/integration/volume_copy_up_test.go +++ b/integration/volume_copy_up_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/windows_device_test.go b/integration/windows_device_test.go index 4186b4275c8b..7825432869a2 100644 --- a/integration/windows_device_test.go +++ b/integration/windows_device_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/windows_hostprocess_test.go b/integration/windows_hostprocess_test.go index 650126d64d56..4fc04738f6d8 100644 --- a/integration/windows_hostprocess_test.go +++ b/integration/windows_hostprocess_test.go @@ -26,7 +26,7 @@ import ( "time" "github.com/Microsoft/hcsshim/osversion" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/sys/windows/registry" diff --git a/integration/windows_rootfs_size_test.go b/integration/windows_rootfs_size_test.go index b36c929c17de..dd50659904ac 100644 --- a/integration/windows_rootfs_size_test.go +++ b/integration/windows_rootfs_size_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/integration/images" + "github.com/containerd/containerd/v2/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/labels/validate.go b/labels/validate.go index f83b5dde294d..c5422f7dbd0a 100644 --- a/labels/validate.go +++ b/labels/validate.go @@ -19,7 +19,7 @@ package labels import ( "fmt" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" ) const ( diff --git a/labels/validate_test.go b/labels/validate_test.go index 628f2fd7af50..b4f31d5bfef0 100644 --- a/labels/validate_test.go +++ b/labels/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "github.com/stretchr/testify/assert" ) diff --git a/lease.go b/lease.go index 07ea6d932419..7e407ed60df1 100644 --- a/lease.go +++ b/lease.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/leases" + "github.com/containerd/containerd/v2/leases" ) // WithLease attaches a lease on the context diff --git a/leases/plugin/local.go b/leases/plugin/local.go index dbb6fc127867..b496396ff34e 100644 --- a/leases/plugin/local.go +++ b/leases/plugin/local.go @@ -19,12 +19,12 @@ package plugin import ( "context" - "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" ) func init() { diff --git a/leases/proxy/manager.go b/leases/proxy/manager.go index ae42d8eb102c..a455258ebb95 100644 --- a/leases/proxy/manager.go +++ b/leases/proxy/manager.go @@ -19,10 +19,10 @@ package proxy import ( "context" - leasesapi "github.com/containerd/containerd/api/services/leases/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/protobuf" + leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/protobuf" ) type proxyManager struct { diff --git a/metadata/adaptors.go b/metadata/adaptors.go index dbff7bacd9a6..d40070958b17 100644 --- a/metadata/adaptors.go +++ b/metadata/adaptors.go @@ -19,13 +19,13 @@ package metadata import ( "strings" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/sandbox" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/sandbox" + "github.com/containerd/containerd/v2/snapshots" ) func adaptImage(o interface{}) filters.Adaptor { diff --git a/metadata/boltutil/helpers.go b/metadata/boltutil/helpers.go index 8f8df3361514..eef502e9680c 100644 --- a/metadata/boltutil/helpers.go +++ b/metadata/boltutil/helpers.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/proto" - "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/containers.go b/metadata/containers.go index 6c21869e3382..2841c4052bed 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -23,15 +23,15 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/identifiers" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/metadata/boltutil" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/protobuf/proto" - "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/identifiers" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/metadata/boltutil" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/containers_test.go b/metadata/containers_test.go index 56a88648bb21..b84c1c2ec02b 100644 --- a/metadata/containers_test.go +++ b/metadata/containers_test.go @@ -25,12 +25,12 @@ import ( "testing" "time" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log/logtest" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" diff --git a/metadata/content.go b/metadata/content.go index 2126feaa6fe2..5394e0740f5d 100644 --- a/metadata/content.go +++ b/metadata/content.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/metadata/boltutil" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/metadata/boltutil" + "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/metadata/content_test.go b/metadata/content_test.go index 8803150bc941..6b7344923cc4 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "testing" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/content/testsuite" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/content/testsuite" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/namespaces" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/metadata/db.go b/metadata/db.go index f11c5375427e..107ee3e78a07 100644 --- a/metadata/db.go +++ b/metadata/db.go @@ -26,13 +26,13 @@ import ( "sync/atomic" "time" - eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/cleanup" - "github.com/containerd/containerd/snapshots" + eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/db_test.go b/metadata/db_test.go index ad860841e2a2..234aecdba0d6 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -29,17 +29,17 @@ import ( "testing" "time" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/native" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/metadata/gc.go b/metadata/gc.go index da95b1c2daf2..35b48e469695 100644 --- a/metadata/gc.go +++ b/metadata/gc.go @@ -24,8 +24,8 @@ import ( "strings" "time" - eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/gc" + eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/gc" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/gc_test.go b/metadata/gc_test.go index 689f8481ed5f..e6edb0c2f837 100644 --- a/metadata/gc_test.go +++ b/metadata/gc_test.go @@ -28,8 +28,8 @@ import ( "text/tabwriter" "time" - "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/metadata/boltutil" + "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/metadata/images.go b/metadata/images.go index 1fcdbb3090ba..d8b3a92457a2 100644 --- a/metadata/images.go +++ b/metadata/images.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/metadata/boltutil" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/epoch" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/metadata/boltutil" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/epoch" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/metadata/images_test.go b/metadata/images_test.go index 424b20f77f5f..f78f3f95db88 100644 --- a/metadata/images_test.go +++ b/metadata/images_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/images" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/metadata/leases.go b/metadata/leases.go index 255de3f70b93..8d8b459596c0 100644 --- a/metadata/leases.go +++ b/metadata/leases.go @@ -24,11 +24,11 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/metadata/boltutil" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/metadata/boltutil" + "github.com/containerd/containerd/v2/namespaces" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/leases_test.go b/metadata/leases_test.go index 0cf3198b8122..c9d1f903aaeb 100644 --- a/metadata/leases_test.go +++ b/metadata/leases_test.go @@ -22,8 +22,8 @@ import ( "fmt" "testing" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/leases" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/leases" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/namespaces.go b/metadata/namespaces.go index 84eb83f2733e..90d210463ce1 100644 --- a/metadata/namespaces.go +++ b/metadata/namespaces.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/identifiers" - l "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/identifiers" + l "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/namespaces" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/namespaces_test.go b/metadata/namespaces_test.go index 83e620c45c57..50d022152535 100644 --- a/metadata/namespaces_test.go +++ b/metadata/namespaces_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" diff --git a/metadata/plugin/plugin.go b/metadata/plugin/plugin.go index 3871e9b98528..90f5d04661ed 100644 --- a/metadata/plugin/plugin.go +++ b/metadata/plugin/plugin.go @@ -22,15 +22,15 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/pkg/timeout" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/pkg/timeout" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" bolt "go.etcd.io/bbolt" diff --git a/metadata/sandbox.go b/metadata/sandbox.go index a682693d9ed9..451871bc26a4 100644 --- a/metadata/sandbox.go +++ b/metadata/sandbox.go @@ -23,12 +23,12 @@ import ( "strings" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/identifiers" - "github.com/containerd/containerd/metadata/boltutil" - "github.com/containerd/containerd/namespaces" - api "github.com/containerd/containerd/sandbox" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/identifiers" + "github.com/containerd/containerd/v2/metadata/boltutil" + "github.com/containerd/containerd/v2/namespaces" + api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/metadata/sandbox_test.go b/metadata/sandbox_test.go index 84870890819f..d3c51747657f 100644 --- a/metadata/sandbox_test.go +++ b/metadata/sandbox_test.go @@ -19,9 +19,9 @@ package metadata import ( "testing" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/protobuf/types" - api "github.com/containerd/containerd/sandbox" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/protobuf/types" + api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" ) diff --git a/metadata/snapshot.go b/metadata/snapshot.go index 3288040899ea..a55ff3373a72 100644 --- a/metadata/snapshot.go +++ b/metadata/snapshot.go @@ -24,14 +24,14 @@ import ( "sync/atomic" "time" - eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/metadata/boltutil" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/snapshots" + eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/metadata/boltutil" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/metadata/snapshot_test.go b/metadata/snapshot_test.go index 583794ed2e1a..ea7c27fb7430 100644 --- a/metadata/snapshot_test.go +++ b/metadata/snapshot_test.go @@ -27,14 +27,14 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/native" - "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/native" + "github.com/containerd/containerd/v2/snapshots/testsuite" bolt "go.etcd.io/bbolt" ) diff --git a/metrics/cgroups/cgroups.go b/metrics/cgroups/cgroups.go index d84ff5c1ad69..36483203e3cb 100644 --- a/metrics/cgroups/cgroups.go +++ b/metrics/cgroups/cgroups.go @@ -20,14 +20,14 @@ package cgroups import ( "github.com/containerd/cgroups/v3" - "github.com/containerd/containerd/events" - v1 "github.com/containerd/containerd/metrics/cgroups/v1" - v2 "github.com/containerd/containerd/metrics/cgroups/v2" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/runtime" + "github.com/containerd/containerd/v2/events" + v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1" + v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/runtime" metrics "github.com/docker/go-metrics" ) diff --git a/metrics/cgroups/common/type.go b/metrics/cgroups/common/type.go index e9699223f1a5..5c58ce19dae9 100644 --- a/metrics/cgroups/common/type.go +++ b/metrics/cgroups/common/type.go @@ -21,7 +21,7 @@ package common import ( "context" - "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/protobuf/types" ) // Statable type that returns cgroup metrics diff --git a/metrics/cgroups/metrics_test.go b/metrics/cgroups/metrics_test.go index b1345bee3b16..b0d10d5ecc9b 100644 --- a/metrics/cgroups/metrics_test.go +++ b/metrics/cgroups/metrics_test.go @@ -26,15 +26,15 @@ import ( "time" "github.com/containerd/cgroups/v3" - "github.com/containerd/containerd/metrics/cgroups/common" - v1 "github.com/containerd/containerd/metrics/cgroups/v1" - v2 "github.com/containerd/containerd/metrics/cgroups/v2" - v1types "github.com/containerd/containerd/metrics/types/v1" - v2types "github.com/containerd/containerd/metrics/types/v2" - "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/v2/metrics/cgroups/common" + v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1" + v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2" + v1types "github.com/containerd/containerd/v2/metrics/types/v1" + v2types "github.com/containerd/containerd/v2/metrics/types/v2" + "github.com/containerd/containerd/v2/protobuf" "github.com/prometheus/client_golang/prometheus" - "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/protobuf/types" metrics "github.com/docker/go-metrics" ) diff --git a/metrics/cgroups/v1/blkio.go b/metrics/cgroups/v1/blkio.go index e5c9e8976f1a..62e2d82017df 100644 --- a/metrics/cgroups/v1/blkio.go +++ b/metrics/cgroups/v1/blkio.go @@ -21,7 +21,7 @@ package v1 import ( "strconv" - v1 "github.com/containerd/containerd/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go index fa74e9a469bd..c04ea97c576a 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -22,11 +22,11 @@ import ( "context" cgroups "github.com/containerd/cgroups/v3/cgroup1" - eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/runtime" + eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/runtime" "github.com/containerd/log" "github.com/docker/go-metrics" ) diff --git a/metrics/cgroups/v1/cpu.go b/metrics/cgroups/v1/cpu.go index ff302e6887f6..c0a7f6b98b89 100644 --- a/metrics/cgroups/v1/cpu.go +++ b/metrics/cgroups/v1/cpu.go @@ -21,7 +21,7 @@ package v1 import ( "strconv" - v1 "github.com/containerd/containerd/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/hugetlb.go b/metrics/cgroups/v1/hugetlb.go index 6f267e4ba7c0..9442754bc3a3 100644 --- a/metrics/cgroups/v1/hugetlb.go +++ b/metrics/cgroups/v1/hugetlb.go @@ -19,7 +19,7 @@ package v1 import ( - v1 "github.com/containerd/containerd/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/memory.go b/metrics/cgroups/v1/memory.go index 78f53d965978..cec3a9163478 100644 --- a/metrics/cgroups/v1/memory.go +++ b/metrics/cgroups/v1/memory.go @@ -19,7 +19,7 @@ package v1 import ( - v1 "github.com/containerd/containerd/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/metric.go b/metrics/cgroups/v1/metric.go index d5fab6bf615e..b5819acd88c1 100644 --- a/metrics/cgroups/v1/metric.go +++ b/metrics/cgroups/v1/metric.go @@ -19,7 +19,7 @@ package v1 import ( - v1 "github.com/containerd/containerd/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/metrics.go b/metrics/cgroups/v1/metrics.go index 2da46f9db7d8..423d6af98929 100644 --- a/metrics/cgroups/v1/metrics.go +++ b/metrics/cgroups/v1/metrics.go @@ -24,11 +24,11 @@ import ( "sync" cgroups "github.com/containerd/cgroups/v3/cgroup1" - cmetrics "github.com/containerd/containerd/metrics" - "github.com/containerd/containerd/metrics/cgroups/common" - v1 "github.com/containerd/containerd/metrics/types/v1" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/timeout" + cmetrics "github.com/containerd/containerd/v2/metrics" + "github.com/containerd/containerd/v2/metrics/cgroups/common" + v1 "github.com/containerd/containerd/v2/metrics/types/v1" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/docker/go-metrics" diff --git a/metrics/cgroups/v1/pids.go b/metrics/cgroups/v1/pids.go index a50200c1bed2..880db3907c06 100644 --- a/metrics/cgroups/v1/pids.go +++ b/metrics/cgroups/v1/pids.go @@ -19,7 +19,7 @@ package v1 import ( - v1 "github.com/containerd/containerd/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/cgroups.go b/metrics/cgroups/v2/cgroups.go index 691cd14e712a..b9cc6c1bc493 100644 --- a/metrics/cgroups/v2/cgroups.go +++ b/metrics/cgroups/v2/cgroups.go @@ -21,8 +21,8 @@ package v2 import ( "context" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/runtime" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/runtime" "github.com/docker/go-metrics" ) diff --git a/metrics/cgroups/v2/cpu.go b/metrics/cgroups/v2/cpu.go index 66c4748f2cf3..1350c9920b84 100644 --- a/metrics/cgroups/v2/cpu.go +++ b/metrics/cgroups/v2/cpu.go @@ -19,7 +19,7 @@ package v2 import ( - v2 "github.com/containerd/containerd/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/io.go b/metrics/cgroups/v2/io.go index 0ad9a27feefb..dbd5508fe6c2 100644 --- a/metrics/cgroups/v2/io.go +++ b/metrics/cgroups/v2/io.go @@ -21,7 +21,7 @@ package v2 import ( "strconv" - v2 "github.com/containerd/containerd/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/memory.go b/metrics/cgroups/v2/memory.go index 3c6508a0644e..6f2c9a486fd9 100644 --- a/metrics/cgroups/v2/memory.go +++ b/metrics/cgroups/v2/memory.go @@ -19,7 +19,7 @@ package v2 import ( - v2 "github.com/containerd/containerd/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/metric.go b/metrics/cgroups/v2/metric.go index bcd4e72c6c22..c6e0d3753f9b 100644 --- a/metrics/cgroups/v2/metric.go +++ b/metrics/cgroups/v2/metric.go @@ -19,7 +19,7 @@ package v2 import ( - v2 "github.com/containerd/containerd/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/metrics.go b/metrics/cgroups/v2/metrics.go index 49a3c3b69d6a..bfd1b04436f9 100644 --- a/metrics/cgroups/v2/metrics.go +++ b/metrics/cgroups/v2/metrics.go @@ -23,11 +23,11 @@ import ( "fmt" "sync" - cmetrics "github.com/containerd/containerd/metrics" - "github.com/containerd/containerd/metrics/cgroups/common" - v2 "github.com/containerd/containerd/metrics/types/v2" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/timeout" + cmetrics "github.com/containerd/containerd/v2/metrics" + "github.com/containerd/containerd/v2/metrics/cgroups/common" + v2 "github.com/containerd/containerd/v2/metrics/types/v2" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/docker/go-metrics" diff --git a/metrics/cgroups/v2/pids.go b/metrics/cgroups/v2/pids.go index 1e1651ffaaeb..6ae7aa92a1f0 100644 --- a/metrics/cgroups/v2/pids.go +++ b/metrics/cgroups/v2/pids.go @@ -19,7 +19,7 @@ package v2 import ( - v2 "github.com/containerd/containerd/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/metrics.go b/metrics/metrics.go index 86ee4d59b0d3..680db473e835 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -19,8 +19,8 @@ package metrics import ( "time" - "github.com/containerd/containerd/pkg/timeout" - "github.com/containerd/containerd/version" + "github.com/containerd/containerd/v2/pkg/timeout" + "github.com/containerd/containerd/v2/version" goMetrics "github.com/docker/go-metrics" ) diff --git a/mount/losetup_linux.go b/mount/losetup_linux.go index 99cc1dce2045..5c8c6a60960b 100644 --- a/mount/losetup_linux.go +++ b/mount/losetup_linux.go @@ -25,8 +25,8 @@ import ( "time" "unsafe" - kernel "github.com/containerd/containerd/contrib/seccomp/kernelversion" - "github.com/containerd/containerd/pkg/randutil" + kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" + "github.com/containerd/containerd/v2/pkg/randutil" "golang.org/x/sys/unix" ) diff --git a/mount/mount.go b/mount/mount.go index 16865b4f443b..393cdb4ba918 100644 --- a/mount/mount.go +++ b/mount/mount.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/api/types" + "github.com/containerd/containerd/v2/api/types" "github.com/containerd/continuity/fs" ) diff --git a/mount/mount_idmapped_linux.go b/mount/mount_idmapped_linux.go index 930070e7fef8..39f296b127c8 100644 --- a/mount/mount_idmapped_linux.go +++ b/mount/mount_idmapped_linux.go @@ -27,7 +27,7 @@ import ( "golang.org/x/sys/unix" - "github.com/containerd/containerd/sys" + "github.com/containerd/containerd/v2/sys" ) // TODO: Support multiple mappings in future diff --git a/namespaces.go b/namespaces.go index 83ee828dd0e3..8e0ef2358273 100644 --- a/namespaces.go +++ b/namespaces.go @@ -20,10 +20,10 @@ import ( "context" "strings" - api "github.com/containerd/containerd/api/services/namespaces/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/namespaces/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/protobuf/types" ) // NewNamespaceStoreFromClient returns a new namespace store diff --git a/namespaces/context.go b/namespaces/context.go index e5e23fe43014..5b0134ae1cae 100644 --- a/namespaces/context.go +++ b/namespaces/context.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/identifiers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/identifiers" ) const ( diff --git a/oci/client.go b/oci/client.go index 9923101bfa67..3d28832cf1cb 100644 --- a/oci/client.go +++ b/oci/client.go @@ -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" ) diff --git a/oci/spec.go b/oci/spec.go index a28abaf91d0e..dd94e65c7aac 100644 --- a/oci/spec.go +++ b/oci/spec.go @@ -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 ( diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 24b18e662edb..9790f0964164 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -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" diff --git a/oci/spec_opts_linux.go b/oci/spec_opts_linux.go index bccea766aa18..610587c39b1d 100644 --- a/oci/spec_opts_linux.go +++ b/oci/spec_opts_linux.go @@ -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" ) diff --git a/oci/spec_opts_linux_test.go b/oci/spec_opts_linux_test.go index 6e2bfc848ed9..6ca16b2e9dc3 100644 --- a/oci/spec_opts_linux_test.go +++ b/oci/spec_opts_linux_test.go @@ -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" diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go index b2f796f3613d..d3195c36befe 100644 --- a/oci/spec_opts_nonlinux.go +++ b/oci/spec_opts_nonlinux.go @@ -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. diff --git a/oci/spec_opts_nonwindows.go b/oci/spec_opts_nonwindows.go index 06bcc3041cba..b3f603ee3d39 100644 --- a/oci/spec_opts_nonwindows.go +++ b/oci/spec_opts_nonwindows.go @@ -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 diff --git a/oci/spec_opts_nonwindows_test.go b/oci/spec_opts_nonwindows_test.go index 393617fe06e5..cf5620c49224 100644 --- a/oci/spec_opts_nonwindows_test.go +++ b/oci/spec_opts_nonwindows_test.go @@ -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" ) diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go index 3839887a4ba5..0a31eb38912d 100644 --- a/oci/spec_opts_test.go +++ b/oci/spec_opts_test.go @@ -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 diff --git a/oci/spec_opts_unix.go b/oci/spec_opts_unix.go index f4135285ccb6..e12a80742123 100644 --- a/oci/spec_opts_unix.go +++ b/oci/spec_opts_unix.go @@ -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 diff --git a/oci/spec_opts_unix_test.go b/oci/spec_opts_unix_test.go index cf7f768bffa0..e67bf1575dd9 100644 --- a/oci/spec_opts_unix_test.go +++ b/oci/spec_opts_unix_test.go @@ -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" ) diff --git a/oci/spec_opts_windows.go b/oci/spec_opts_windows.go index 7d49d274079a..99176a8825d6 100644 --- a/oci/spec_opts_windows.go +++ b/oci/spec_opts_windows.go @@ -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 { diff --git a/oci/spec_opts_windows_test.go b/oci/spec_opts_windows_test.go index 200e0b096512..f2dea8c2eb52 100644 --- a/oci/spec_opts_windows_test.go +++ b/oci/spec_opts_windows_test.go @@ -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" diff --git a/oci/spec_test.go b/oci/spec_test.go index ef85391f88a1..31c4789e74e2 100644 --- a/oci/spec_test.go +++ b/oci/spec_test.go @@ -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) { diff --git a/oci/utils_unix.go b/oci/utils_unix.go index b3cb8a600d90..7606ec8e3973 100644 --- a/oci/utils_unix.go +++ b/oci/utils_unix.go @@ -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" ) diff --git a/oci/utils_unix_test.go b/oci/utils_unix_test.go index 18d4e944ec7a..bf751216f3c0 100644 --- a/oci/utils_unix_test.go +++ b/oci/utils_unix_test.go @@ -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() { diff --git a/pkg/cri/annotations/annotations.go b/pkg/cri/annotations/annotations.go index d8477486a470..2ca6bc1ede6c 100644 --- a/pkg/cri/annotations/annotations.go +++ b/pkg/cri/annotations/annotations.go @@ -17,8 +17,8 @@ package annotations import ( - "github.com/containerd/containerd/oci" - customopts "github.com/containerd/containerd/pkg/cri/opts" + "github.com/containerd/containerd/v2/oci" + customopts "github.com/containerd/containerd/v2/pkg/cri/opts" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/bandwidth/fake_shaper.go b/pkg/cri/bandwidth/fake_shaper.go index 99bfd338a75d..7113596891b8 100644 --- a/pkg/cri/bandwidth/fake_shaper.go +++ b/pkg/cri/bandwidth/fake_shaper.go @@ -33,7 +33,7 @@ limitations under the License. package bandwidth import ( - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/cri/bandwidth/unsupported.go b/pkg/cri/bandwidth/unsupported.go index 26bda16ef449..d7b0b2f5c445 100644 --- a/pkg/cri/bandwidth/unsupported.go +++ b/pkg/cri/bandwidth/unsupported.go @@ -35,7 +35,7 @@ limitations under the License. package bandwidth import ( - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/cri/config/config_unix.go b/pkg/cri/config/config_unix.go index aa68703ce73d..02b4a3241207 100644 --- a/pkg/cri/config/config_unix.go +++ b/pkg/cri/config/config_unix.go @@ -21,7 +21,7 @@ package config import ( "time" - "github.com/containerd/containerd" + "github.com/containerd/containerd/v2" "github.com/pelletier/go-toml/v2" "k8s.io/kubelet/pkg/cri/streaming" ) diff --git a/pkg/cri/config/config_windows.go b/pkg/cri/config/config_windows.go index bde68d753538..f19a45e365e5 100644 --- a/pkg/cri/config/config_windows.go +++ b/pkg/cri/config/config_windows.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd" + "github.com/containerd/containerd/v2" "k8s.io/kubelet/pkg/cri/streaming" ) diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go index ac44981bf87b..775d9736664e 100644 --- a/pkg/cri/cri.go +++ b/pkg/cri/cri.go @@ -21,20 +21,20 @@ import ( "fmt" "path/filepath" - "github.com/containerd/containerd" - "github.com/containerd/containerd/pkg/cri/nri" - "github.com/containerd/containerd/pkg/cri/server" - nriservice "github.com/containerd/containerd/pkg/nri" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/pkg/cri/nri" + "github.com/containerd/containerd/v2/pkg/cri/server" + nriservice "github.com/containerd/containerd/v2/pkg/nri" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" imagespec "github.com/opencontainers/image-spec/specs-go/v1" "k8s.io/klog/v2" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/constants" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/constants" ) // Register CRI service plugin diff --git a/pkg/cri/instrument/instrumented_service.go b/pkg/cri/instrument/instrumented_service.go index 98bcab97afe3..aa795d06d2a0 100644 --- a/pkg/cri/instrument/instrumented_service.go +++ b/pkg/cri/instrument/instrumented_service.go @@ -20,12 +20,12 @@ import ( "context" "errors" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/tracing" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" ) const ( diff --git a/pkg/cri/io/container_io.go b/pkg/cri/io/container_io.go index f6fc3b0b9eeb..8ec03b85b3c6 100644 --- a/pkg/cri/io/container_io.go +++ b/pkg/cri/io/container_io.go @@ -22,11 +22,11 @@ import ( "strings" "sync" - "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/v2/cio" "github.com/containerd/log" - "github.com/containerd/containerd/pkg/cri/util" - cioutil "github.com/containerd/containerd/pkg/ioutil" + "github.com/containerd/containerd/v2/pkg/cri/util" + cioutil "github.com/containerd/containerd/v2/pkg/ioutil" ) // streamKey generates a key for the stream. diff --git a/pkg/cri/io/exec_io.go b/pkg/cri/io/exec_io.go index f5baf1f4fdd7..ee0b0dc4a9c2 100644 --- a/pkg/cri/io/exec_io.go +++ b/pkg/cri/io/exec_io.go @@ -20,8 +20,8 @@ import ( "io" "sync" - "github.com/containerd/containerd/cio" - cioutil "github.com/containerd/containerd/pkg/ioutil" + "github.com/containerd/containerd/v2/cio" + cioutil "github.com/containerd/containerd/v2/pkg/ioutil" "github.com/containerd/log" ) diff --git a/pkg/cri/io/helpers.go b/pkg/cri/io/helpers.go index bf99e9538fb0..25ab5fe5933a 100644 --- a/pkg/cri/io/helpers.go +++ b/pkg/cri/io/helpers.go @@ -24,7 +24,7 @@ import ( "sync" "syscall" - "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/v2/cio" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/io/logger.go b/pkg/cri/io/logger.go index 75bac2beaa1f..6ff7da3c1063 100644 --- a/pkg/cri/io/logger.go +++ b/pkg/cri/io/logger.go @@ -25,7 +25,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - cioutil "github.com/containerd/containerd/pkg/ioutil" + cioutil "github.com/containerd/containerd/v2/pkg/ioutil" "github.com/containerd/log" ) diff --git a/pkg/cri/io/logger_test.go b/pkg/cri/io/logger_test.go index 289aa5c3e6a3..c2bf3e56e29b 100644 --- a/pkg/cri/io/logger_test.go +++ b/pkg/cri/io/logger_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - cioutil "github.com/containerd/containerd/pkg/ioutil" + cioutil "github.com/containerd/containerd/v2/pkg/ioutil" ) func TestRedirectLogs(t *testing.T) { diff --git a/pkg/cri/nri/nri_api.go b/pkg/cri/nri/nri_api.go index 958dc0bef97f..26df03cfdbbd 100644 --- a/pkg/cri/nri/nri_api.go +++ b/pkg/cri/nri/nri_api.go @@ -20,9 +20,9 @@ import ( "context" "time" - criconfig "github.com/containerd/containerd/pkg/cri/config" - cstore "github.com/containerd/containerd/pkg/cri/store/container" - sstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" cri "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/nri/nri_api_linux.go b/pkg/cri/nri/nri_api_linux.go index 511e64d24df2..4e458b0b1eb7 100644 --- a/pkg/cri/nri/nri_api_linux.go +++ b/pkg/cri/nri/nri_api_linux.go @@ -21,15 +21,15 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/blockio" - "github.com/containerd/containerd/pkg/cri/annotations" - "github.com/containerd/containerd/pkg/cri/constants" - cstore "github.com/containerd/containerd/pkg/cri/store/container" - sstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/blockio" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/pkg/cri/constants" + cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" @@ -37,7 +37,7 @@ import ( "github.com/opencontainers/runtime-tools/generate" cri "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/nri" + "github.com/containerd/containerd/v2/pkg/nri" "github.com/containerd/nri/pkg/api" nrigen "github.com/containerd/nri/pkg/runtime-tools/generate" ) diff --git a/pkg/cri/nri/nri_api_other.go b/pkg/cri/nri/nri_api_other.go index 2f4872e51cbb..63fb0907dc8d 100644 --- a/pkg/cri/nri/nri_api_other.go +++ b/pkg/cri/nri/nri_api_other.go @@ -21,15 +21,15 @@ package nri import ( "context" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - cstore "github.com/containerd/containerd/pkg/cri/store/container" - sstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2" + "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" "github.com/opencontainers/runtime-spec/specs-go" cri "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/constants" - "github.com/containerd/containerd/pkg/nri" + "github.com/containerd/containerd/v2/pkg/cri/constants" + "github.com/containerd/containerd/v2/pkg/nri" "github.com/containerd/nri/pkg/api" ) diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 4f67ac33a2b3..258fa0cd454d 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -26,11 +26,11 @@ import ( "github.com/containerd/continuity/fs" imagespec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_darwin_opts.go b/pkg/cri/opts/spec_darwin_opts.go index ec48b6fc4f27..1098eeedc20d 100644 --- a/pkg/cri/opts/spec_darwin_opts.go +++ b/pkg/cri/opts/spec_darwin_opts.go @@ -26,9 +26,9 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" - osinterface "github.com/containerd/containerd/pkg/os" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" + osinterface "github.com/containerd/containerd/v2/pkg/os" ) // WithDarwinMounts adds mounts from CRI's container config + extra mounts. diff --git a/pkg/cri/opts/spec_linux.go b/pkg/cri/opts/spec_linux.go index bf1591c5cf13..1bd66193a904 100644 --- a/pkg/cri/opts/spec_linux.go +++ b/pkg/cri/opts/spec_linux.go @@ -31,8 +31,8 @@ import ( "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_linux_opts.go b/pkg/cri/opts/spec_linux_opts.go index 3f8a379e3809..f7cb22643bb3 100644 --- a/pkg/cri/opts/spec_linux_opts.go +++ b/pkg/cri/opts/spec_linux_opts.go @@ -31,10 +31,10 @@ import ( "github.com/opencontainers/selinux/go-selinux/label" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/oci" - osinterface "github.com/containerd/containerd/pkg/os" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/oci" + osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_nonlinux.go b/pkg/cri/opts/spec_nonlinux.go index 52b67fb57efc..d2d98cc4a162 100644 --- a/pkg/cri/opts/spec_nonlinux.go +++ b/pkg/cri/opts/spec_nonlinux.go @@ -21,8 +21,8 @@ package opts import ( "context" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/opts/spec_nonwindows.go b/pkg/cri/opts/spec_nonwindows.go index 4759711d3bd8..7c3b5537ead0 100644 --- a/pkg/cri/opts/spec_nonwindows.go +++ b/pkg/cri/opts/spec_nonwindows.go @@ -21,9 +21,9 @@ package opts import ( "context" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/opts/spec_opts.go b/pkg/cri/opts/spec_opts.go index 8980afb398ae..08bc3d5b126c 100644 --- a/pkg/cri/opts/spec_opts.go +++ b/pkg/cri/opts/spec_opts.go @@ -29,9 +29,9 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cri/util" ) // DefaultSandboxCPUshares is default cpu shares for sandbox container. diff --git a/pkg/cri/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go index 0f7307bd0a6f..7ebbd32786f8 100644 --- a/pkg/cri/opts/spec_windows.go +++ b/pkg/cri/opts/spec_windows.go @@ -23,8 +23,8 @@ import ( "errors" "strings" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/windows" diff --git a/pkg/cri/opts/spec_windows_opts.go b/pkg/cri/opts/spec_windows_opts.go index 6ab9256442c9..2a31aaf69580 100644 --- a/pkg/cri/opts/spec_windows_opts.go +++ b/pkg/cri/opts/spec_windows_opts.go @@ -24,9 +24,9 @@ import ( "sort" "strings" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" - osinterface "github.com/containerd/containerd/pkg/os" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" + osinterface "github.com/containerd/containerd/v2/pkg/os" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/opts/spec_windows_test.go b/pkg/cri/opts/spec_windows_test.go index 9b5d92e8c4ad..d8b4cf15d4e2 100644 --- a/pkg/cri/opts/spec_windows_test.go +++ b/pkg/cri/opts/spec_windows_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/oci" - osinterface "github.com/containerd/containerd/pkg/os" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/oci" + osinterface "github.com/containerd/containerd/v2/pkg/os" ) func TestWithDevices(t *testing.T) { diff --git a/pkg/cri/server/blockio_linux.go b/pkg/cri/server/blockio_linux.go index 7d1e522eaaed..dea2c71261e4 100644 --- a/pkg/cri/server/blockio_linux.go +++ b/pkg/cri/server/blockio_linux.go @@ -21,7 +21,7 @@ package server import ( "fmt" - "github.com/containerd/containerd/pkg/blockio" + "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/log" ) diff --git a/pkg/cri/server/container_attach.go b/pkg/cri/server/container_attach.go index d7d0096d6e0f..14bc7100dba8 100644 --- a/pkg/cri/server/container_attach.go +++ b/pkg/cri/server/container_attach.go @@ -21,12 +21,12 @@ import ( "fmt" "io" - "github.com/containerd/containerd" + "github.com/containerd/containerd/v2" "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - cio "github.com/containerd/containerd/pkg/cri/io" + cio "github.com/containerd/containerd/v2/pkg/cri/io" ) // Attach prepares a streaming endpoint to attach to a running container, and returns the address. diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go index 93c584c93caa..d0a333c0a436 100644 --- a/pkg/cri/server/container_create.go +++ b/pkg/cri/server/container_create.go @@ -33,17 +33,17 @@ import ( "github.com/opencontainers/selinux/go-selinux/label" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/blockio" - "github.com/containerd/containerd/pkg/cri/annotations" - criconfig "github.com/containerd/containerd/pkg/cri/config" - cio "github.com/containerd/containerd/pkg/cri/io" - customopts "github.com/containerd/containerd/pkg/cri/opts" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/blockio" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + cio "github.com/containerd/containerd/v2/pkg/cri/io" + customopts "github.com/containerd/containerd/v2/pkg/cri/opts" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" ) diff --git a/pkg/cri/server/container_create_linux.go b/pkg/cri/server/container_create_linux.go index 0c39eb08b7b2..86f3c2a922af 100644 --- a/pkg/cri/server/container_create_linux.go +++ b/pkg/cri/server/container_create_linux.go @@ -28,12 +28,12 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/contrib/apparmor" - "github.com/containerd/containerd/contrib/seccomp" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/contrib/apparmor" + "github.com/containerd/containerd/v2/contrib/seccomp" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/snapshots" - customopts "github.com/containerd/containerd/pkg/cri/opts" + customopts "github.com/containerd/containerd/v2/pkg/cri/opts" ) const ( diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index 35a37492d3a4..dfeecd818eba 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -26,12 +26,12 @@ import ( "testing" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/contrib/apparmor" - "github.com/containerd/containerd/contrib/seccomp" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/contrib/apparmor" + "github.com/containerd/containerd/v2/contrib/seccomp" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/platforms" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" @@ -39,14 +39,14 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cap" - "github.com/containerd/containerd/pkg/cri/annotations" - "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/opts" - customopts "github.com/containerd/containerd/pkg/cri/opts" - "github.com/containerd/containerd/pkg/cri/util" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - ostesting "github.com/containerd/containerd/pkg/os/testing" + "github.com/containerd/containerd/v2/pkg/cap" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/opts" + customopts "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/pkg/cri/util" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + ostesting "github.com/containerd/containerd/v2/pkg/os/testing" ) func getCreateContainerTestData() (*runtime.ContainerConfig, *runtime.PodSandboxConfig, diff --git a/pkg/cri/server/container_create_other.go b/pkg/cri/server/container_create_other.go index 9f010e6f4431..775ad3823dda 100644 --- a/pkg/cri/server/container_create_other.go +++ b/pkg/cri/server/container_create_other.go @@ -22,8 +22,8 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/snapshots" ) func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageConfig *imagespec.ImageConfig) ([]oci.SpecOpts, error) { diff --git a/pkg/cri/server/container_create_other_test.go b/pkg/cri/server/container_create_other_test.go index 604b289eb80a..b801d912208c 100644 --- a/pkg/cri/server/container_create_other_test.go +++ b/pkg/cri/server/container_create_other_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/annotations" + "github.com/containerd/containerd/v2/pkg/cri/annotations" ) // checkMount is defined by all tests but not used here diff --git a/pkg/cri/server/container_create_test.go b/pkg/cri/server/container_create_test.go index 6f3294f732d0..5855e0bce5ae 100644 --- a/pkg/cri/server/container_create_test.go +++ b/pkg/cri/server/container_create_test.go @@ -24,8 +24,8 @@ import ( goruntime "runtime" "testing" - ostesting "github.com/containerd/containerd/pkg/os/testing" - "github.com/containerd/containerd/platforms" + ostesting "github.com/containerd/containerd/v2/pkg/os/testing" + "github.com/containerd/containerd/v2/platforms" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" @@ -33,10 +33,10 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/constants" - "github.com/containerd/containerd/pkg/cri/opts" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/constants" + "github.com/containerd/containerd/v2/pkg/cri/opts" ) var currentPlatform = platforms.DefaultSpec() diff --git a/pkg/cri/server/container_create_windows.go b/pkg/cri/server/container_create_windows.go index 0b72173ce17f..ee41b819939a 100644 --- a/pkg/cri/server/container_create_windows.go +++ b/pkg/cri/server/container_create_windows.go @@ -22,8 +22,8 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/snapshots" ) // No extra spec options needed for windows. diff --git a/pkg/cri/server/container_create_windows_test.go b/pkg/cri/server/container_create_windows_test.go index 70f9a2afdb2a..4ef3a7931b7b 100644 --- a/pkg/cri/server/container_create_windows_test.go +++ b/pkg/cri/server/container_create_windows_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/annotations" - "github.com/containerd/containerd/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/pkg/cri/config" ) func getCreateContainerTestData() (*runtime.ContainerConfig, *runtime.PodSandboxConfig, diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index ba2c3a7d1985..cd9e31fc756f 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -24,17 +24,17 @@ import ( "syscall" "time" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2" + containerdio "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - cio "github.com/containerd/containerd/pkg/cri/io" - "github.com/containerd/containerd/pkg/cri/util" - cioutil "github.com/containerd/containerd/pkg/ioutil" + cio "github.com/containerd/containerd/v2/pkg/cri/io" + "github.com/containerd/containerd/v2/pkg/cri/util" + cioutil "github.com/containerd/containerd/v2/pkg/ioutil" ) type cappedWriter struct { diff --git a/pkg/cri/server/container_execsync_test.go b/pkg/cri/server/container_execsync_test.go index 48f72abef50c..59af765b90a3 100644 --- a/pkg/cri/server/container_execsync_test.go +++ b/pkg/cri/server/container_execsync_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - cioutil "github.com/containerd/containerd/pkg/ioutil" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" + cioutil "github.com/containerd/containerd/v2/pkg/ioutil" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/server/container_list.go b/pkg/cri/server/container_list.go index 931f1be2f480..eb8025cefe25 100644 --- a/pkg/cri/server/container_list.go +++ b/pkg/cri/server/container_list.go @@ -22,7 +22,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" ) // ListContainers lists all containers matching the filter. diff --git a/pkg/cri/server/container_list_test.go b/pkg/cri/server/container_list_test.go index 8af7165b2a49..e618f4772666 100644 --- a/pkg/cri/server/container_list_test.go +++ b/pkg/cri/server/container_list_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) func TestToCRIContainer(t *testing.T) { diff --git a/pkg/cri/server/container_remove.go b/pkg/cri/server/container_remove.go index 51b570fba6dc..284c8de0cbb4 100644 --- a/pkg/cri/server/container_remove.go +++ b/pkg/cri/server/container_remove.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/errdefs" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/container_remove_test.go b/pkg/cri/server/container_remove_test.go index 6beda46166fc..6e6c99b341d9 100644 --- a/pkg/cri/server/container_remove_test.go +++ b/pkg/cri/server/container_remove_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" ) // TestSetContainerRemoving tests setContainerRemoving sets removing diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index 92ae32d348c1..8b3009bba211 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -23,17 +23,17 @@ import ( "io" "time" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2" + containerdio "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - cio "github.com/containerd/containerd/pkg/cri/io" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - cioutil "github.com/containerd/containerd/pkg/ioutil" + cio "github.com/containerd/containerd/v2/pkg/cri/io" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + cioutil "github.com/containerd/containerd/v2/pkg/ioutil" ) // StartContainer starts the container. diff --git a/pkg/cri/server/container_start_test.go b/pkg/cri/server/container_start_test.go index 0c457f4f15e5..ce3d56b8b47f 100644 --- a/pkg/cri/server/container_start_test.go +++ b/pkg/cri/server/container_start_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" ) // TestSetContainerStarting tests setContainerStarting sets removing diff --git a/pkg/cri/server/container_stats.go b/pkg/cri/server/container_stats.go index e2ca5f1ace64..69efaeb8bb57 100644 --- a/pkg/cri/server/container_stats.go +++ b/pkg/cri/server/container_stats.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/api/services/tasks/v1" + "github.com/containerd/containerd/v2/api/services/tasks/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/container_stats_list.go b/pkg/cri/server/container_stats_list.go index 3f3253c9749a..3eadc68950be 100644 --- a/pkg/cri/server/container_stats_list.go +++ b/pkg/cri/server/container_stats_list.go @@ -26,16 +26,16 @@ import ( wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats" cg1 "github.com/containerd/cgroups/v3/cgroup1/stats" cg2 "github.com/containerd/cgroups/v3/cgroup2/stats" - "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/cri/store/stats" - "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" ) // ListContainerStats returns stats of all running containers. diff --git a/pkg/cri/server/container_stats_list_test.go b/pkg/cri/server/container_stats_list_test.go index 723249008f5f..90b66ae95c1f 100644 --- a/pkg/cri/server/container_stats_list_test.go +++ b/pkg/cri/server/container_stats_list_test.go @@ -25,9 +25,9 @@ import ( v1 "github.com/containerd/cgroups/v3/cgroup1/stats" v2 "github.com/containerd/cgroups/v3/cgroup2/stats" - "github.com/containerd/containerd/api/types" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/api/types" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/container_status.go b/pkg/cri/server/container_status.go index 721532257b1f..0d5748e00425 100644 --- a/pkg/cri/server/container_status.go +++ b/pkg/cri/server/container_status.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/cri/server/images" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cri/server/images" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_status_test.go b/pkg/cri/server/container_status_test.go index 4c6887c88c85..517cbbeacc42 100644 --- a/pkg/cri/server/container_status_test.go +++ b/pkg/cri/server/container_status_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - criconfig "github.com/containerd/containerd/pkg/cri/config" - snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" ) func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status, diff --git a/pkg/cri/server/container_stop.go b/pkg/cri/server/container_stop.go index 144400027096..53aa92258867 100644 --- a/pkg/cri/server/container_stop.go +++ b/pkg/cri/server/container_stop.go @@ -23,11 +23,11 @@ import ( "syscall" "time" - eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/containerd/protobuf" + eventtypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/errdefs" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" "github.com/moby/sys/signal" diff --git a/pkg/cri/server/container_stop_test.go b/pkg/cri/server/container_stop_test.go index e3ab4829b9c6..48df17e5892a 100644 --- a/pkg/cri/server/container_stop_test.go +++ b/pkg/cri/server/container_stop_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" ) func TestWaitContainerStop(t *testing.T) { diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go index cbbe3492c52b..270a96caa542 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/pkg/cri/server/container_update_resources.go @@ -27,13 +27,13 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" ) // UpdateContainerResources updates ContainerConfig of the container. diff --git a/pkg/cri/server/container_update_resources_linux.go b/pkg/cri/server/container_update_resources_linux.go index 95448786779f..2bf25f229569 100644 --- a/pkg/cri/server/container_update_resources_linux.go +++ b/pkg/cri/server/container_update_resources_linux.go @@ -23,9 +23,9 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/opts" - "github.com/containerd/containerd/pkg/cri/util" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/pkg/cri/util" ) // updateOCIResource updates container resource limit. diff --git a/pkg/cri/server/container_update_resources_linux_test.go b/pkg/cri/server/container_update_resources_linux_test.go index bb89d8cae53d..e81ef70be3ca 100644 --- a/pkg/cri/server/container_update_resources_linux_test.go +++ b/pkg/cri/server/container_update_resources_linux_test.go @@ -25,8 +25,8 @@ import ( "google.golang.org/protobuf/proto" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - criconfig "github.com/containerd/containerd/pkg/cri/config" - criopts "github.com/containerd/containerd/pkg/cri/opts" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + criopts "github.com/containerd/containerd/v2/pkg/cri/opts" ) func TestUpdateOCILinuxResource(t *testing.T) { diff --git a/pkg/cri/server/container_update_resources_other.go b/pkg/cri/server/container_update_resources_other.go index 4bf801ec245f..b87f74735312 100644 --- a/pkg/cri/server/container_update_resources_other.go +++ b/pkg/cri/server/container_update_resources_other.go @@ -24,7 +24,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" ) // UpdateContainerResources updates ContainerConfig of the container. diff --git a/pkg/cri/server/container_update_resources_windows.go b/pkg/cri/server/container_update_resources_windows.go index 9ce21aca84f5..8fd6f9fc3113 100644 --- a/pkg/cri/server/container_update_resources_windows.go +++ b/pkg/cri/server/container_update_resources_windows.go @@ -23,9 +23,9 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/opts" - "github.com/containerd/containerd/pkg/cri/util" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/pkg/cri/util" ) // updateOCIResource updates container resource limit. diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index cba4d2071d73..973ac64b3f20 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -23,17 +23,17 @@ import ( "sync" "time" - "github.com/containerd/containerd" - eventtypes "github.com/containerd/containerd/api/events" - apitasks "github.com/containerd/containerd/api/services/tasks/v1" - containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/pkg/cri/constants" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/v2" + eventtypes "github.com/containerd/containerd/v2/api/events" + apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" + containerdio "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/pkg/cri/constants" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/events_test.go b/pkg/cri/server/events_test.go index e15f47da8ce4..43fd2f576571 100644 --- a/pkg/cri/server/events_test.go +++ b/pkg/cri/server/events_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/protobuf" + eventtypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" diff --git a/pkg/cri/server/fuzz.go b/pkg/cri/server/fuzz.go index 1f3fe1f90afc..d37d76088998 100644 --- a/pkg/cri/server/fuzz.go +++ b/pkg/cri/server/fuzz.go @@ -21,7 +21,7 @@ package server import ( "fmt" - "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) func SandboxStore(cs CRIService) (*sandbox.Store, error) { diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 127107535e0d..b0e2a1ccd571 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -33,16 +33,16 @@ import ( "github.com/pelletier/go-toml/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - clabels "github.com/containerd/containerd/labels" - criconfig "github.com/containerd/containerd/pkg/cri/config" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" - runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1" - "github.com/containerd/containerd/plugins" - runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + clabels "github.com/containerd/containerd/v2/labels" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" + runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" + "github.com/containerd/containerd/v2/plugins" + runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" ) diff --git a/pkg/cri/server/helpers_linux.go b/pkg/cri/server/helpers_linux.go index 4580ba1383d2..88ea75406497 100644 --- a/pkg/cri/server/helpers_linux.go +++ b/pkg/cri/server/helpers_linux.go @@ -32,12 +32,12 @@ import ( "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/apparmor" - "github.com/containerd/containerd/pkg/seccomp" - "github.com/containerd/containerd/pkg/seutil" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/apparmor" + "github.com/containerd/containerd/v2/pkg/seccomp" + "github.com/containerd/containerd/v2/pkg/seutil" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" ) diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go index 648b9a64f386..572eea11eefd 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -26,13 +26,13 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/oci" - criconfig "github.com/containerd/containerd/pkg/cri/config" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf/types" - runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/oci" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf/types" + runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/images/image_list_test.go b/pkg/cri/server/images/image_list_test.go index b3c79db5c5ab..f26763c3df0b 100644 --- a/pkg/cri/server/images/image_list_test.go +++ b/pkg/cri/server/images/image_list_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" ) func TestListImages(t *testing.T) { diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index 7ff1ca69f0a3..1cd84ca3a8fb 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -37,16 +37,16 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" - containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/cri/annotations" - criconfig "github.com/containerd/containerd/pkg/cri/config" - crilabels "github.com/containerd/containerd/pkg/cri/labels" - snpkg "github.com/containerd/containerd/pkg/snapshotters" - "github.com/containerd/containerd/remotes/docker" - "github.com/containerd/containerd/remotes/docker/config" - "github.com/containerd/containerd/tracing" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/errdefs" + containerdimages "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" + snpkg "github.com/containerd/containerd/v2/pkg/snapshotters" + "github.com/containerd/containerd/v2/remotes/docker" + "github.com/containerd/containerd/v2/remotes/docker/config" + "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" distribution "github.com/distribution/reference" ) diff --git a/pkg/cri/server/images/image_pull_test.go b/pkg/cri/server/images/image_pull_test.go index e1ecd7f24f54..ea0d09ec305e 100644 --- a/pkg/cri/server/images/image_pull_test.go +++ b/pkg/cri/server/images/image_pull_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/annotations" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/labels" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/labels" ) func TestParseAuth(t *testing.T) { diff --git a/pkg/cri/server/images/image_remove.go b/pkg/cri/server/images/image_remove.go index 459e4df0c5ae..2c41499d65c5 100644 --- a/pkg/cri/server/images/image_remove.go +++ b/pkg/cri/server/images/image_remove.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/tracing" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/tracing" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/images/image_status.go b/pkg/cri/server/images/image_status.go index 9ca05df5e3d8..cb3eba329a6f 100644 --- a/pkg/cri/server/images/image_status.go +++ b/pkg/cri/server/images/image_status.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/errdefs" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" - "github.com/containerd/containerd/tracing" + "github.com/containerd/containerd/v2/errdefs" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" + "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" docker "github.com/distribution/reference" diff --git a/pkg/cri/server/images/image_status_test.go b/pkg/cri/server/images/image_status_test.go index 31d756994207..c3e607747b4a 100644 --- a/pkg/cri/server/images/image_status_test.go +++ b/pkg/cri/server/images/image_status_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" ) func TestImageStatus(t *testing.T) { diff --git a/pkg/cri/server/images/imagefs_info.go b/pkg/cri/server/images/imagefs_info.go index 0ee3331ea46a..abb3c478752f 100644 --- a/pkg/cri/server/images/imagefs_info.go +++ b/pkg/cri/server/images/imagefs_info.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/pkg/cri/store/snapshot" + "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/images/imagefs_info_test.go b/pkg/cri/server/images/imagefs_info_test.go index 3d380999e93f..62fed82e493a 100644 --- a/pkg/cri/server/images/imagefs_info_test.go +++ b/pkg/cri/server/images/imagefs_info_test.go @@ -20,12 +20,12 @@ import ( "context" "testing" - snapshot "github.com/containerd/containerd/snapshots" + snapshot "github.com/containerd/containerd/v2/snapshots" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" + snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" ) func TestImageFsInfo(t *testing.T) { diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index e6b6a2a0f6a2..fe8e46f24ea2 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -21,14 +21,14 @@ import ( "fmt" "time" - "github.com/containerd/containerd" - criconfig "github.com/containerd/containerd/pkg/cri/config" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" - snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/containerd/pkg/kmutex" - "github.com/containerd/containerd/platforms" - snapshot "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" + snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/kmutex" + "github.com/containerd/containerd/v2/platforms" + snapshot "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" docker "github.com/distribution/reference" imagedigest "github.com/opencontainers/go-digest" diff --git a/pkg/cri/server/images/service_test.go b/pkg/cri/server/images/service_test.go index 1ec7195de3c3..051e3ab8ba49 100644 --- a/pkg/cri/server/images/service_test.go +++ b/pkg/cri/server/images/service_test.go @@ -20,11 +20,11 @@ import ( "context" "testing" - "github.com/containerd/containerd/errdefs" - criconfig "github.com/containerd/containerd/pkg/cri/config" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" - snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/errdefs" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" + snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" + "github.com/containerd/containerd/v2/platforms" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/server/images/snapshots.go b/pkg/cri/server/images/snapshots.go index 7b1486548e0b..89fd19a8abea 100644 --- a/pkg/cri/server/images/snapshots.go +++ b/pkg/cri/server/images/snapshots.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/containerd/containerd/errdefs" - snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - snapshot "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/errdefs" + snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + snapshot "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" ) diff --git a/pkg/cri/server/nri.go b/pkg/cri/server/nri.go index 78475b0976bb..42253a91d368 100644 --- a/pkg/cri/server/nri.go +++ b/pkg/cri/server/nri.go @@ -17,9 +17,9 @@ package server import ( - criconfig "github.com/containerd/containerd/pkg/cri/config" - cstore "github.com/containerd/containerd/pkg/cri/store/container" - sstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) type criImplementation struct { diff --git a/pkg/cri/server/nri_linux.go b/pkg/cri/server/nri_linux.go index 76f99de2c565..6c33b01dbdf4 100644 --- a/pkg/cri/server/nri_linux.go +++ b/pkg/cri/server/nri_linux.go @@ -22,7 +22,7 @@ import ( "context" "time" - cstore "github.com/containerd/containerd/pkg/cri/store/container" + cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" cri "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/nri_other.go b/pkg/cri/server/nri_other.go index c4a4da3eb6f7..51c7d3ccba5e 100644 --- a/pkg/cri/server/nri_other.go +++ b/pkg/cri/server/nri_other.go @@ -22,7 +22,7 @@ import ( "context" "time" - cstore "github.com/containerd/containerd/pkg/cri/store/container" + cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" cri "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/podsandbox/container_linux.go b/pkg/cri/server/podsandbox/container_linux.go index 3c026207bfa6..92561da5f5b0 100644 --- a/pkg/cri/server/podsandbox/container_linux.go +++ b/pkg/cri/server/podsandbox/container_linux.go @@ -24,8 +24,8 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/contrib/seccomp" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/contrib/seccomp" + "github.com/containerd/containerd/v2/oci" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/podsandbox/controller.go b/pkg/cri/server/podsandbox/controller.go index 13ab1f9ab467..88a61177c6a7 100644 --- a/pkg/cri/server/podsandbox/controller.go +++ b/pkg/cri/server/podsandbox/controller.go @@ -24,21 +24,21 @@ import ( "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd" - eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/oci" - criconfig "github.com/containerd/containerd/pkg/cri/config" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - osinterface "github.com/containerd/containerd/pkg/os" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/sandbox" + "github.com/containerd/containerd/v2" + eventtypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/oci" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + osinterface "github.com/containerd/containerd/v2/pkg/os" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/sandbox" ) func init() { diff --git a/pkg/cri/server/podsandbox/controller_test.go b/pkg/cri/server/podsandbox/controller_test.go index b6a7f2c3ae0d..53e3f49c9ba3 100644 --- a/pkg/cri/server/podsandbox/controller_test.go +++ b/pkg/cri/server/podsandbox/controller_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/store/label" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ostesting "github.com/containerd/containerd/pkg/os/testing" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/store/label" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ostesting "github.com/containerd/containerd/v2/pkg/os/testing" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/server/podsandbox/helpers.go b/pkg/cri/server/podsandbox/helpers.go index 5e27c97dbe1b..aa0a3629aadc 100644 --- a/pkg/cri/server/podsandbox/helpers.go +++ b/pkg/cri/server/podsandbox/helpers.go @@ -23,13 +23,13 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - clabels "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/oci" - criconfig "github.com/containerd/containerd/pkg/cri/config" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/containers" + clabels "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/oci" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/log" docker "github.com/distribution/reference" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/podsandbox/helpers_linux.go b/pkg/cri/server/podsandbox/helpers_linux.go index 4fb035f7225a..4e59f7421431 100644 --- a/pkg/cri/server/podsandbox/helpers_linux.go +++ b/pkg/cri/server/podsandbox/helpers_linux.go @@ -28,11 +28,11 @@ import ( "syscall" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/seccomp" - "github.com/containerd/containerd/pkg/seutil" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/seccomp" + "github.com/containerd/containerd/v2/pkg/seutil" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/moby/sys/mountinfo" diff --git a/pkg/cri/server/podsandbox/helpers_test.go b/pkg/cri/server/podsandbox/helpers_test.go index 60a81fe5509b..11d19eb7311f 100644 --- a/pkg/cri/server/podsandbox/helpers_test.go +++ b/pkg/cri/server/podsandbox/helpers_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/oci" docker "github.com/distribution/reference" imagedigest "github.com/opencontainers/go-digest" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/podsandbox/opts.go b/pkg/cri/server/podsandbox/opts.go index 57c8948a041b..dc7ce156b3ea 100644 --- a/pkg/cri/server/podsandbox/opts.go +++ b/pkg/cri/server/podsandbox/opts.go @@ -19,7 +19,7 @@ package podsandbox import ( "context" - "github.com/containerd/containerd" + "github.com/containerd/containerd/v2" "github.com/containerd/log" "github.com/containerd/nri" v1 "github.com/containerd/nri/types/v1" diff --git a/pkg/cri/server/podsandbox/recover.go b/pkg/cri/server/podsandbox/recover.go index 13a47ac82284..8628cdcd70cd 100644 --- a/pkg/cri/server/podsandbox/recover.go +++ b/pkg/cri/server/podsandbox/recover.go @@ -22,14 +22,14 @@ import ( goruntime "runtime" "time" - "github.com/containerd/containerd/pkg/netns" + "github.com/containerd/containerd/v2/pkg/netns" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/errdefs" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/sandbox_delete.go b/pkg/cri/server/podsandbox/sandbox_delete.go index 8ed43801185e..808aa33540fd 100644 --- a/pkg/cri/server/podsandbox/sandbox_delete.go +++ b/pkg/cri/server/podsandbox/sandbox_delete.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/containerd/containerd" - apitasks "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2" + apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/sandbox_run.go b/pkg/cri/server/podsandbox/sandbox_run.go index 07eee22f5025..89524778bbb0 100644 --- a/pkg/cri/server/podsandbox/sandbox_run.go +++ b/pkg/cri/server/podsandbox/sandbox_run.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" "github.com/containerd/nri" v1 "github.com/containerd/nri/types/v1" "github.com/containerd/typeurl/v2" @@ -29,16 +29,16 @@ import ( "github.com/opencontainers/selinux/go-selinux" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/cri/annotations" - criconfig "github.com/containerd/containerd/pkg/cri/config" - customopts "github.com/containerd/containerd/pkg/cri/opts" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/containerd/sandbox" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2" + containerdio "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + customopts "github.com/containerd/containerd/v2/pkg/cri/opts" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/sandbox" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/sandbox_run_linux.go b/pkg/cri/server/podsandbox/sandbox_run_linux.go index 3c75187a3aab..21deafa0dfcd 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_linux.go +++ b/pkg/cri/server/podsandbox/sandbox_run_linux.go @@ -22,17 +22,17 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/annotations" - customopts "github.com/containerd/containerd/pkg/cri/opts" - "github.com/containerd/containerd/pkg/userns" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + customopts "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/pkg/userns" + "github.com/containerd/containerd/v2/snapshots" ) func (c *Controller) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig, diff --git a/pkg/cri/server/podsandbox/sandbox_run_linux_test.go b/pkg/cri/server/podsandbox/sandbox_run_linux_test.go index 850d49571c17..335c210cb62c 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_linux_test.go +++ b/pkg/cri/server/podsandbox/sandbox_run_linux_test.go @@ -30,9 +30,9 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" v1 "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/annotations" - "github.com/containerd/containerd/pkg/cri/opts" - ostesting "github.com/containerd/containerd/pkg/os/testing" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/pkg/cri/opts" + ostesting "github.com/containerd/containerd/v2/pkg/os/testing" ) func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) { diff --git a/pkg/cri/server/podsandbox/sandbox_run_other.go b/pkg/cri/server/podsandbox/sandbox_run_other.go index 15691a189a89..75bbe4cfe387 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_other.go +++ b/pkg/cri/server/podsandbox/sandbox_run_other.go @@ -19,9 +19,9 @@ package podsandbox import ( - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/cri/annotations" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/snapshots" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/podsandbox/sandbox_run_test.go b/pkg/cri/server/podsandbox/sandbox_run_test.go index 8ce1cda464f5..d719643f9fd4 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_test.go +++ b/pkg/cri/server/podsandbox/sandbox_run_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) func TestSandboxContainerSpec(t *testing.T) { diff --git a/pkg/cri/server/podsandbox/sandbox_run_windows.go b/pkg/cri/server/podsandbox/sandbox_run_windows.go index 9b2adc0290aa..156063870e28 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_windows.go +++ b/pkg/cri/server/podsandbox/sandbox_run_windows.go @@ -20,14 +20,14 @@ import ( "fmt" "strconv" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/annotations" - customopts "github.com/containerd/containerd/pkg/cri/opts" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + customopts "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/snapshots" ) func (c *Controller) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig, diff --git a/pkg/cri/server/podsandbox/sandbox_run_windows_test.go b/pkg/cri/server/podsandbox/sandbox_run_windows_test.go index 7b1779df4886..6d13385f1c24 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_windows_test.go +++ b/pkg/cri/server/podsandbox/sandbox_run_windows_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/annotations" - "github.com/containerd/containerd/pkg/cri/opts" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/pkg/cri/opts" ) func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) { diff --git a/pkg/cri/server/podsandbox/sandbox_stats.go b/pkg/cri/server/podsandbox/sandbox_stats.go index 86776f464bca..f34f8d29bd50 100644 --- a/pkg/cri/server/podsandbox/sandbox_stats.go +++ b/pkg/cri/server/podsandbox/sandbox_stats.go @@ -19,8 +19,8 @@ package podsandbox import ( "context" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/errdefs" ) // TODO(dcantah): Implement metrics to be used for SandboxStats rpc. diff --git a/pkg/cri/server/podsandbox/sandbox_status.go b/pkg/cri/server/podsandbox/sandbox_status.go index dceb657a1303..1f2197b243a9 100644 --- a/pkg/cri/server/podsandbox/sandbox_status.go +++ b/pkg/cri/server/podsandbox/sandbox_status.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/containerd/sandbox" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/go-cni" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/podsandbox/sandbox_stop.go b/pkg/cri/server/podsandbox/sandbox_stop.go index 2e68d809a00f..620f85a06b05 100644 --- a/pkg/cri/server/podsandbox/sandbox_stop.go +++ b/pkg/cri/server/podsandbox/sandbox_stop.go @@ -22,12 +22,12 @@ import ( "syscall" "time" - eventtypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/errdefs" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/sandbox" + eventtypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/errdefs" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/store.go b/pkg/cri/server/podsandbox/store.go index 767af7d5c7bb..bbc293feb331 100644 --- a/pkg/cri/server/podsandbox/store.go +++ b/pkg/cri/server/podsandbox/store.go @@ -19,7 +19,7 @@ package podsandbox import ( "sync" - "github.com/containerd/containerd" + "github.com/containerd/containerd/v2" ) type Status struct { diff --git a/pkg/cri/server/rdt.go b/pkg/cri/server/rdt.go index b45d24572455..edea6db142c2 100644 --- a/pkg/cri/server/rdt.go +++ b/pkg/cri/server/rdt.go @@ -21,7 +21,7 @@ package server import ( "fmt" - "github.com/containerd/containerd/pkg/rdt" + "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/log" ) diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index 027878162b80..4392d10ed23b 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -24,23 +24,23 @@ import ( "sync" "time" - "github.com/containerd/containerd" - containerdio "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" - containerdimages "github.com/containerd/containerd/images" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/server/podsandbox" - "github.com/containerd/containerd/pkg/netns" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2" + containerdio "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/errdefs" + containerdimages "github.com/containerd/containerd/v2/images" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" + "github.com/containerd/containerd/v2/pkg/netns" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "golang.org/x/sync/errgroup" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - cio "github.com/containerd/containerd/pkg/cri/io" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" + cio "github.com/containerd/containerd/v2/pkg/cri/io" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" ) // NOTE: The recovery logic has following assumption: when the cri plugin is down: diff --git a/pkg/cri/server/runtime_config_linux.go b/pkg/cri/server/runtime_config_linux.go index 719db31ebf33..f5b678daa67b 100644 --- a/pkg/cri/server/runtime_config_linux.go +++ b/pkg/cri/server/runtime_config_linux.go @@ -20,8 +20,8 @@ import ( "context" "sort" - "github.com/containerd/containerd/pkg/systemd" - runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/pkg/systemd" + runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/runtime_config_linux_test.go b/pkg/cri/server/runtime_config_linux_test.go index d712b60252d0..63768081cf35 100644 --- a/pkg/cri/server/runtime_config_linux_test.go +++ b/pkg/cri/server/runtime_config_linux_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/systemd" - "github.com/containerd/containerd/plugins" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/systemd" + "github.com/containerd/containerd/v2/plugins" "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_list.go b/pkg/cri/server/sandbox_list.go index 08ad80b7c70a..890112c2e673 100644 --- a/pkg/cri/server/sandbox_list.go +++ b/pkg/cri/server/sandbox_list.go @@ -22,7 +22,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) // ListPodSandbox returns a list of Sandbox. diff --git a/pkg/cri/server/sandbox_list_test.go b/pkg/cri/server/sandbox_list_test.go index 1d38c98d492b..b4fa895e5a61 100644 --- a/pkg/cri/server/sandbox_list_test.go +++ b/pkg/cri/server/sandbox_list_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) func TestToCRISandbox(t *testing.T) { diff --git a/pkg/cri/server/sandbox_portforward.go b/pkg/cri/server/sandbox_portforward.go index 9a1aee43f9de..e4595cdc938a 100644 --- a/pkg/cri/server/sandbox_portforward.go +++ b/pkg/cri/server/sandbox_portforward.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) // PortForward prepares a streaming endpoint to forward ports from a PodSandbox, and returns the address. diff --git a/pkg/cri/server/sandbox_portforward_other.go b/pkg/cri/server/sandbox_portforward_other.go index 9ba3fe16286d..8e2ecc9bc1f2 100644 --- a/pkg/cri/server/sandbox_portforward_other.go +++ b/pkg/cri/server/sandbox_portforward_other.go @@ -23,7 +23,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" ) // portForward uses netns to enter the sandbox namespace, and forwards a stream inside the diff --git a/pkg/cri/server/sandbox_portforward_windows.go b/pkg/cri/server/sandbox_portforward_windows.go index 44442f67827f..cdb75a917c76 100644 --- a/pkg/cri/server/sandbox_portforward_windows.go +++ b/pkg/cri/server/sandbox_portforward_windows.go @@ -24,8 +24,8 @@ import ( "k8s.io/utils/exec" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - cioutil "github.com/containerd/containerd/pkg/ioutil" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + cioutil "github.com/containerd/containerd/v2/pkg/ioutil" ) func (c *criService) portForward(ctx context.Context, id string, port int32, stream io.ReadWriter) error { diff --git a/pkg/cri/server/sandbox_remove.go b/pkg/cri/server/sandbox_remove.go index 5e04a7226a90..5b9e7633a63c 100644 --- a/pkg/cri/server/sandbox_remove.go +++ b/pkg/cri/server/sandbox_remove.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index 4e553ed1a9dd..71fa8f699b87 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -30,15 +30,15 @@ import ( "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd" - "github.com/containerd/containerd/pkg/cri/annotations" - "github.com/containerd/containerd/pkg/cri/bandwidth" - criconfig "github.com/containerd/containerd/pkg/cri/config" - "github.com/containerd/containerd/pkg/cri/server/podsandbox" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/containerd/pkg/netns" - sb "github.com/containerd/containerd/sandbox" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/pkg/cri/bandwidth" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/netns" + sb "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" ) diff --git a/pkg/cri/server/sandbox_stats_linux.go b/pkg/cri/server/sandbox_stats_linux.go index 028bf4e52a6c..f455b9ee78db 100644 --- a/pkg/cri/server/sandbox_stats_linux.go +++ b/pkg/cri/server/sandbox_stats_linux.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/errdefs" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/errdefs" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/containerd/log" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" diff --git a/pkg/cri/server/sandbox_stats_list.go b/pkg/cri/server/sandbox_stats_list.go index 233202c01373..4d0a787dfaae 100644 --- a/pkg/cri/server/sandbox_stats_list.go +++ b/pkg/cri/server/sandbox_stats_list.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/errdefs" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/errdefs" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_stats_other.go b/pkg/cri/server/sandbox_stats_other.go index 4f1a53e46baa..e390bc454ecb 100644 --- a/pkg/cri/server/sandbox_stats_other.go +++ b/pkg/cri/server/sandbox_stats_other.go @@ -22,8 +22,8 @@ import ( "context" "fmt" - "github.com/containerd/containerd/errdefs" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/errdefs" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_stats_windows.go b/pkg/cri/server/sandbox_stats_windows.go index 1691399b564b..cf8598372547 100644 --- a/pkg/cri/server/sandbox_stats_windows.go +++ b/pkg/cri/server/sandbox_stats_windows.go @@ -24,14 +24,14 @@ import ( "github.com/Microsoft/hcsshim" wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats" "github.com/Microsoft/hcsshim/hcn" - "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/containerd/pkg/cri/store/stats" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/errdefs" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/cri/store/stats" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" "github.com/containerd/typeurl/v2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_stats_windows_test.go b/pkg/cri/server/sandbox_stats_windows_test.go index f8023ab2588b..17d5872c97d5 100644 --- a/pkg/cri/server/sandbox_stats_windows_test.go +++ b/pkg/cri/server/sandbox_stats_windows_test.go @@ -21,10 +21,10 @@ import ( "time" wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/containerd/pkg/cri/store/stats" - "github.com/containerd/containerd/protobuf" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/protobuf" "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_status.go b/pkg/cri/server/sandbox_status.go index 70afaea1ea32..a475dec52d33 100644 --- a/pkg/cri/server/sandbox_status.go +++ b/pkg/cri/server/sandbox_status.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/containerd/containerd/errdefs" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/errdefs" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/containerd/go-cni" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_status_test.go b/pkg/cri/server/sandbox_status_test.go index 48fde0e24a01..19975ce88579 100644 --- a/pkg/cri/server/sandbox_status_test.go +++ b/pkg/cri/server/sandbox_status_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) func TestPodSandboxStatus(t *testing.T) { diff --git a/pkg/cri/server/sandbox_stop.go b/pkg/cri/server/sandbox_stop.go index e957a84ed9d9..98b9c85a961c 100644 --- a/pkg/cri/server/sandbox_stop.go +++ b/pkg/cri/server/sandbox_stop.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) // StopPodSandbox stops the sandbox. If there are any running containers in the diff --git a/pkg/cri/server/sandbox_stop_test.go b/pkg/cri/server/sandbox_stop_test.go index e58bc58b9060..7fad6b01bffc 100644 --- a/pkg/cri/server/sandbox_stop_test.go +++ b/pkg/cri/server/sandbox_stop_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ) func TestWaitSandboxStop(t *testing.T) { diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index d7e18c7b50b3..7a649949fb95 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -27,30 +27,30 @@ import ( "sync" "sync/atomic" - "github.com/containerd/containerd" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/cri/instrument" - "github.com/containerd/containerd/pkg/cri/nri" - "github.com/containerd/containerd/pkg/cri/server/images" - "github.com/containerd/containerd/pkg/cri/server/podsandbox" - imagestore "github.com/containerd/containerd/pkg/cri/store/image" - snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/sandbox" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cri/instrument" + "github.com/containerd/containerd/v2/pkg/cri/nri" + "github.com/containerd/containerd/v2/pkg/cri/server/images" + "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" + imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" + snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/go-cni" "github.com/containerd/log" "google.golang.org/grpc" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/kubelet/pkg/cri/streaming" - "github.com/containerd/containerd/pkg/cri/store/label" + "github.com/containerd/containerd/v2/pkg/cri/store/label" - criconfig "github.com/containerd/containerd/pkg/cri/config" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" - osinterface "github.com/containerd/containerd/pkg/os" - "github.com/containerd/containerd/pkg/registrar" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + osinterface "github.com/containerd/containerd/v2/pkg/os" + "github.com/containerd/containerd/v2/pkg/registrar" ) // defaultNetworkPlugin is used for the default CNI configuration diff --git a/pkg/cri/server/service_linux.go b/pkg/cri/server/service_linux.go index 0e3c42e422b3..64d1a0d58119 100644 --- a/pkg/cri/server/service_linux.go +++ b/pkg/cri/server/service_linux.go @@ -22,8 +22,8 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/opencontainers/selinux/go-selinux" - "github.com/containerd/containerd/pkg/cap" - "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/containerd/v2/pkg/cap" + "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/go-cni" "github.com/containerd/log" ) diff --git a/pkg/cri/server/service_test.go b/pkg/cri/server/service_test.go index c0d306e3091e..960f43ce53ce 100644 --- a/pkg/cri/server/service_test.go +++ b/pkg/cri/server/service_test.go @@ -21,18 +21,18 @@ import ( "os" "testing" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/oci" "github.com/containerd/go-cni" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - criconfig "github.com/containerd/containerd/pkg/cri/config" - containerstore "github.com/containerd/containerd/pkg/cri/store/container" - "github.com/containerd/containerd/pkg/cri/store/label" - sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - servertesting "github.com/containerd/containerd/pkg/cri/testing" - ostesting "github.com/containerd/containerd/pkg/os/testing" - "github.com/containerd/containerd/pkg/registrar" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + "github.com/containerd/containerd/v2/pkg/cri/store/label" + sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + servertesting "github.com/containerd/containerd/v2/pkg/cri/testing" + ostesting "github.com/containerd/containerd/v2/pkg/os/testing" + "github.com/containerd/containerd/v2/pkg/registrar" ) // newTestCRIService creates a fake criService for test. diff --git a/pkg/cri/server/streaming.go b/pkg/cri/server/streaming.go index 8ed2238bd52b..50ae7cb09385 100644 --- a/pkg/cri/server/streaming.go +++ b/pkg/cri/server/streaming.go @@ -33,7 +33,7 @@ import ( k8scert "k8s.io/client-go/util/cert" "k8s.io/utils/exec" - ctrdutil "github.com/containerd/containerd/pkg/cri/util" + ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "k8s.io/kubelet/pkg/cri/streaming" ) diff --git a/pkg/cri/server/streaming_test.go b/pkg/cri/server/streaming_test.go index d7b7b427ed78..d93945d6bbe6 100644 --- a/pkg/cri/server/streaming_test.go +++ b/pkg/cri/server/streaming_test.go @@ -19,7 +19,7 @@ package server import ( "testing" - "github.com/containerd/containerd/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/server/test_config.go b/pkg/cri/server/test_config.go index d4450b10e2b4..74d6849056af 100644 --- a/pkg/cri/server/test_config.go +++ b/pkg/cri/server/test_config.go @@ -16,7 +16,7 @@ package server -import criconfig "github.com/containerd/containerd/pkg/cri/config" +import criconfig "github.com/containerd/containerd/v2/pkg/cri/config" const ( testRootDir = "/test/root" diff --git a/pkg/cri/server/update_runtime_config.go b/pkg/cri/server/update_runtime_config.go index e0a44e7b7ed3..783d2aebedcd 100644 --- a/pkg/cri/server/update_runtime_config.go +++ b/pkg/cri/server/update_runtime_config.go @@ -28,7 +28,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/atomicfile" + "github.com/containerd/containerd/v2/pkg/atomicfile" "github.com/containerd/log" ) diff --git a/pkg/cri/server/update_runtime_config_test.go b/pkg/cri/server/update_runtime_config_test.go index 51822272e69b..a78b64a20c3e 100644 --- a/pkg/cri/server/update_runtime_config_test.go +++ b/pkg/cri/server/update_runtime_config_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - criconfig "github.com/containerd/containerd/pkg/cri/config" - servertesting "github.com/containerd/containerd/pkg/cri/testing" + criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + servertesting "github.com/containerd/containerd/v2/pkg/cri/testing" ) func TestUpdateRuntimeConfig(t *testing.T) { diff --git a/pkg/cri/server/version.go b/pkg/cri/server/version.go index 1de600f5824a..ef68e9f439b9 100644 --- a/pkg/cri/server/version.go +++ b/pkg/cri/server/version.go @@ -19,10 +19,10 @@ package server import ( "context" - "github.com/containerd/containerd/version" + "github.com/containerd/containerd/v2/version" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/pkg/cri/constants" + "github.com/containerd/containerd/v2/pkg/cri/constants" ) const ( diff --git a/pkg/cri/store/container/container.go b/pkg/cri/store/container/container.go index 524b58291612..76a14e825f9b 100644 --- a/pkg/cri/store/container/container.go +++ b/pkg/cri/store/container/container.go @@ -19,13 +19,13 @@ package container import ( "sync" - "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" - cio "github.com/containerd/containerd/pkg/cri/io" - "github.com/containerd/containerd/pkg/cri/store" - "github.com/containerd/containerd/pkg/cri/store/label" - "github.com/containerd/containerd/pkg/cri/store/stats" - "github.com/containerd/containerd/pkg/truncindex" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/errdefs" + cio "github.com/containerd/containerd/v2/pkg/cri/io" + "github.com/containerd/containerd/v2/pkg/cri/store" + "github.com/containerd/containerd/v2/pkg/cri/store/label" + "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/pkg/truncindex" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/store/container/container_test.go b/pkg/cri/store/container/container_test.go index 6f7bd69b6b62..e629d6712682 100644 --- a/pkg/cri/store/container/container_test.go +++ b/pkg/cri/store/container/container_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" - cio "github.com/containerd/containerd/pkg/cri/io" - "github.com/containerd/containerd/pkg/cri/store/label" - "github.com/containerd/containerd/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/errdefs" + cio "github.com/containerd/containerd/v2/pkg/cri/io" + "github.com/containerd/containerd/v2/pkg/cri/store/label" + "github.com/containerd/containerd/v2/pkg/cri/store/stats" "github.com/opencontainers/selinux/go-selinux" assertlib "github.com/stretchr/testify/assert" diff --git a/pkg/cri/store/image/fake_image.go b/pkg/cri/store/image/fake_image.go index 96532aa937fd..041443f99e48 100644 --- a/pkg/cri/store/image/fake_image.go +++ b/pkg/cri/store/image/fake_image.go @@ -19,7 +19,7 @@ package image import ( "fmt" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/platforms" ) // NewFakeStore returns an image store with predefined images. diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go index 71b22a0e4457..df167943971d 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -22,13 +22,13 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/usage" - "github.com/containerd/containerd/pkg/cri/labels" - "github.com/containerd/containerd/pkg/cri/util" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/images/usage" + "github.com/containerd/containerd/v2/pkg/cri/labels" + "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/platforms" docker "github.com/distribution/reference" "github.com/opencontainers/go-digest" diff --git a/pkg/cri/store/image/image_test.go b/pkg/cri/store/image/image_test.go index dad5d4e4cea0..7ee72cb5edff 100644 --- a/pkg/cri/store/image/image_test.go +++ b/pkg/cri/store/image/image_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "github.com/opencontainers/go-digest/digestset" assertlib "github.com/stretchr/testify/assert" diff --git a/pkg/cri/store/sandbox/sandbox.go b/pkg/cri/store/sandbox/sandbox.go index 26dd8f6dba34..0a42592d6f83 100644 --- a/pkg/cri/store/sandbox/sandbox.go +++ b/pkg/cri/store/sandbox/sandbox.go @@ -19,13 +19,13 @@ package sandbox import ( "sync" - "github.com/containerd/containerd" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/cri/store" - "github.com/containerd/containerd/pkg/cri/store/label" - "github.com/containerd/containerd/pkg/cri/store/stats" - "github.com/containerd/containerd/pkg/netns" - "github.com/containerd/containerd/pkg/truncindex" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cri/store" + "github.com/containerd/containerd/v2/pkg/cri/store/label" + "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/pkg/netns" + "github.com/containerd/containerd/v2/pkg/truncindex" ) // Sandbox contains all resources associated with the sandbox. All methods to diff --git a/pkg/cri/store/sandbox/sandbox_test.go b/pkg/cri/store/sandbox/sandbox_test.go index 68ff056eaa20..c6beedcd5d59 100644 --- a/pkg/cri/store/sandbox/sandbox_test.go +++ b/pkg/cri/store/sandbox/sandbox_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/cri/store/label" - "github.com/containerd/containerd/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cri/store/label" + "github.com/containerd/containerd/v2/pkg/cri/store/stats" assertlib "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/store/snapshot/snapshot.go b/pkg/cri/store/snapshot/snapshot.go index 1f83c204e80c..2195b9cc23ce 100644 --- a/pkg/cri/store/snapshot/snapshot.go +++ b/pkg/cri/store/snapshot/snapshot.go @@ -19,8 +19,8 @@ package snapshot import ( "sync" - "github.com/containerd/containerd/errdefs" - snapshot "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/errdefs" + snapshot "github.com/containerd/containerd/v2/snapshots" ) type Key struct { diff --git a/pkg/cri/store/snapshot/snapshot_test.go b/pkg/cri/store/snapshot/snapshot_test.go index d30f95a4d4a3..70ac3c291cb3 100644 --- a/pkg/cri/store/snapshot/snapshot_test.go +++ b/pkg/cri/store/snapshot/snapshot_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" - snapshot "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/errdefs" + snapshot "github.com/containerd/containerd/v2/snapshots" assertlib "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/util/util.go b/pkg/cri/util/util.go index ced3cfc93f28..07647bd8eebd 100644 --- a/pkg/cri/util/util.go +++ b/pkg/cri/util/util.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/namespaces" - "github.com/containerd/containerd/pkg/cri/constants" + "github.com/containerd/containerd/v2/pkg/cri/constants" ) // deferCleanupTimeout is the default timeout for containerd cleanup operations diff --git a/pkg/display/manifest_printer.go b/pkg/display/manifest_printer.go index 4cb15213075e..81e15ebe78d4 100644 --- a/pkg/display/manifest_printer.go +++ b/pkg/display/manifest_printer.go @@ -25,8 +25,8 @@ import ( "os" "strings" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/imageverifier/bindir/bindir.go b/pkg/imageverifier/bindir/bindir.go index 2f2e86a8c1ce..c832713beea9 100644 --- a/pkg/imageverifier/bindir/bindir.go +++ b/pkg/imageverifier/bindir/bindir.go @@ -29,8 +29,8 @@ import ( "strings" "time" - "github.com/containerd/containerd/pkg/imageverifier" - "github.com/containerd/containerd/pkg/tomlext" + "github.com/containerd/containerd/v2/pkg/imageverifier" + "github.com/containerd/containerd/v2/pkg/tomlext" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/imageverifier/bindir/bindir_test.go b/pkg/imageverifier/bindir/bindir_test.go index 033109b22386..d7a4d1440281 100644 --- a/pkg/imageverifier/bindir/bindir_test.go +++ b/pkg/imageverifier/bindir/bindir_test.go @@ -29,7 +29,7 @@ import ( "text/template" "time" - "github.com/containerd/containerd/pkg/tomlext" + "github.com/containerd/containerd/v2/pkg/tomlext" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/pkg/kmutex/kmutex_test.go b/pkg/kmutex/kmutex_test.go index 6bfff477a974..80a30bc3e2d4 100644 --- a/pkg/kmutex/kmutex_test.go +++ b/pkg/kmutex/kmutex_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/pkg/randutil" + "github.com/containerd/containerd/v2/pkg/randutil" "github.com/stretchr/testify/assert" ) diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go index f72433bd7c9e..93e61f9d68d1 100644 --- a/pkg/netns/netns_linux.go +++ b/pkg/netns/netns_linux.go @@ -39,7 +39,7 @@ import ( "runtime" "sync" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/mount" cnins "github.com/containernetworking/plugins/pkg/ns" "github.com/moby/sys/symlink" "golang.org/x/sys/unix" diff --git a/pkg/nri/config.go b/pkg/nri/config.go index aa4665f3ed93..c1fc3db4b284 100644 --- a/pkg/nri/config.go +++ b/pkg/nri/config.go @@ -17,7 +17,7 @@ package nri import ( - "github.com/containerd/containerd/pkg/tomlext" + "github.com/containerd/containerd/v2/pkg/tomlext" nri "github.com/containerd/nri/pkg/adaptation" ) diff --git a/pkg/nri/domain.go b/pkg/nri/domain.go index d761ed2b0b12..13b51c00296d 100644 --- a/pkg/nri/domain.go +++ b/pkg/nri/domain.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/log" nri "github.com/containerd/nri/pkg/adaptation" ) diff --git a/pkg/nri/nri.go b/pkg/nri/nri.go index 0cf61a82d784..21aa1a450f2c 100644 --- a/pkg/nri/nri.go +++ b/pkg/nri/nri.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/log" - "github.com/containerd/containerd/version" + "github.com/containerd/containerd/v2/version" nri "github.com/containerd/nri/pkg/adaptation" ) diff --git a/pkg/nri/plugin/plugin.go b/pkg/nri/plugin/plugin.go index 3a9bdea39b34..4c564c94b7d5 100644 --- a/pkg/nri/plugin/plugin.go +++ b/pkg/nri/plugin/plugin.go @@ -17,10 +17,10 @@ package plugin import ( - "github.com/containerd/containerd/pkg/nri" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/pkg/nri" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" ) func init() { diff --git a/pkg/oom/v1/v1.go b/pkg/oom/v1/v1.go index 1686230ec248..c604d38b9c55 100644 --- a/pkg/oom/v1/v1.go +++ b/pkg/oom/v1/v1.go @@ -24,10 +24,10 @@ import ( "sync" "github.com/containerd/cgroups/v3/cgroup1" - eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/pkg/oom" - "github.com/containerd/containerd/runtime" - "github.com/containerd/containerd/runtime/v2/shim" + eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/pkg/oom" + "github.com/containerd/containerd/v2/runtime" + "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/pkg/oom/v2/v2.go b/pkg/oom/v2/v2.go index 63710e234b7c..3951c5d4bc30 100644 --- a/pkg/oom/v2/v2.go +++ b/pkg/oom/v2/v2.go @@ -23,10 +23,10 @@ import ( "fmt" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/pkg/oom" - "github.com/containerd/containerd/runtime" - "github.com/containerd/containerd/runtime/v2/shim" + eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/pkg/oom" + "github.com/containerd/containerd/v2/runtime" + "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" ) diff --git a/pkg/os/mount_linux.go b/pkg/os/mount_linux.go index 15228e57dbbe..8658ea0821dd 100644 --- a/pkg/os/mount_linux.go +++ b/pkg/os/mount_linux.go @@ -17,7 +17,7 @@ package os import ( - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/mount" "golang.org/x/sys/unix" ) diff --git a/pkg/os/mount_other.go b/pkg/os/mount_other.go index 71ab91c99c3d..30b68530250f 100644 --- a/pkg/os/mount_other.go +++ b/pkg/os/mount_other.go @@ -18,7 +18,7 @@ package os -import "github.com/containerd/containerd/mount" +import "github.com/containerd/containerd/v2/mount" // LookupMount gets mount info of a given path. func (RealOS) LookupMount(path string) (mount.Info, error) { diff --git a/pkg/os/mount_unix.go b/pkg/os/mount_unix.go index bc3423797d30..0412a4dbf8b2 100644 --- a/pkg/os/mount_unix.go +++ b/pkg/os/mount_unix.go @@ -19,7 +19,7 @@ package os import ( - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/mount" ) // Mount will call unix.Mount to mount the file. diff --git a/pkg/os/mount_windows.go b/pkg/os/mount_windows.go index 78426cd6f62c..346d40c5894b 100644 --- a/pkg/os/mount_windows.go +++ b/pkg/os/mount_windows.go @@ -19,7 +19,7 @@ package os import ( "errors" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/mount" ) // Mount is an empty stub on Windows. diff --git a/pkg/os/os.go b/pkg/os/os.go index 7bdc4046f480..c0814f4ed87f 100644 --- a/pkg/os/os.go +++ b/pkg/os/os.go @@ -22,7 +22,7 @@ import ( "github.com/moby/sys/symlink" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/mount" ) // OS collects system level operations that need to be mocked out diff --git a/pkg/os/testing/fake_os.go b/pkg/os/testing/fake_os.go index c4f1bf6cc1a0..00d7e4fd8028 100644 --- a/pkg/os/testing/fake_os.go +++ b/pkg/os/testing/fake_os.go @@ -20,9 +20,9 @@ import ( "os" "sync" - containerdmount "github.com/containerd/containerd/mount" + containerdmount "github.com/containerd/containerd/v2/mount" - osInterface "github.com/containerd/containerd/pkg/os" + osInterface "github.com/containerd/containerd/v2/pkg/os" ) // CalledDetail is the struct contains called function name and arguments. diff --git a/pkg/process/deleted_state.go b/pkg/process/deleted_state.go index 30852104b231..19930ff8bf80 100644 --- a/pkg/process/deleted_state.go +++ b/pkg/process/deleted_state.go @@ -24,8 +24,8 @@ import ( "fmt" "github.com/containerd/console" - "github.com/containerd/containerd/errdefs" - google_protobuf "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/errdefs" + google_protobuf "github.com/containerd/containerd/v2/protobuf/types" ) type deletedState struct { diff --git a/pkg/process/exec.go b/pkg/process/exec.go index 620ad093a1b0..e393ec486af3 100644 --- a/pkg/process/exec.go +++ b/pkg/process/exec.go @@ -31,8 +31,8 @@ import ( "golang.org/x/sys/unix" "github.com/containerd/console" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/stdio" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/process/init.go b/pkg/process/init.go index f4c3dcd8901c..10da7d798cab 100644 --- a/pkg/process/init.go +++ b/pkg/process/init.go @@ -32,9 +32,9 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/stdio" - google_protobuf "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/stdio" + google_protobuf "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" "github.com/containerd/log" diff --git a/pkg/process/init_state.go b/pkg/process/init_state.go index df528e4dbd96..190e625530c0 100644 --- a/pkg/process/init_state.go +++ b/pkg/process/init_state.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" - google_protobuf "github.com/containerd/containerd/protobuf/types" + google_protobuf "github.com/containerd/containerd/v2/protobuf/types" runc "github.com/containerd/go-runc" "github.com/containerd/log" ) diff --git a/pkg/process/io.go b/pkg/process/io.go index 006645a8128c..9688dfb0fb1a 100644 --- a/pkg/process/io.go +++ b/pkg/process/io.go @@ -31,8 +31,8 @@ import ( "syscall" "time" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/stdio" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" "github.com/containerd/log" diff --git a/pkg/process/io_test.go b/pkg/process/io_test.go index 90072f7ccd05..9ea1bb6e5b81 100644 --- a/pkg/process/io_test.go +++ b/pkg/process/io_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/namespaces" ) func TestNewBinaryIO(t *testing.T) { diff --git a/pkg/process/process.go b/pkg/process/process.go index 7cebb9b30907..7c1de346d32b 100644 --- a/pkg/process/process.go +++ b/pkg/process/process.go @@ -22,7 +22,7 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd/pkg/stdio" + "github.com/containerd/containerd/v2/pkg/stdio" ) // Process on a system diff --git a/pkg/process/types.go b/pkg/process/types.go index 797b69f5f315..54f79876cf2e 100644 --- a/pkg/process/types.go +++ b/pkg/process/types.go @@ -17,7 +17,7 @@ package process import ( - google_protobuf "github.com/containerd/containerd/protobuf/types" + google_protobuf "github.com/containerd/containerd/v2/protobuf/types" ) // Mount holds filesystem mount configuration diff --git a/pkg/process/utils.go b/pkg/process/utils.go index 58f9a21d21ee..b107517343e3 100644 --- a/pkg/process/utils.go +++ b/pkg/process/utils.go @@ -30,7 +30,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" runc "github.com/containerd/go-runc" specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/unix" diff --git a/pkg/runtimeoptions/v1/api.pb.go b/pkg/runtimeoptions/v1/api.pb.go index 8a30127be2fc..eb0d66ee56a9 100644 --- a/pkg/runtimeoptions/v1/api.pb.go +++ b/pkg/runtimeoptions/v1/api.pb.go @@ -104,13 +104,13 @@ var file_github_com_containerd_containerd_pkg_runtimeoptions_v1_api_proto_rawDes 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x6f, 0x64, 0x79, 0x42, 0x4a, 0x5a, - 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, + 0x0c, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x6f, 0x64, 0x79, 0x42, 0x4d, 0x5a, + 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, - 0x64, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x72, 0x75, 0x6e, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/runtimeoptions/v1/api.proto b/pkg/runtimeoptions/v1/api.proto index d0ab0e2f9544..2e0730ff2c86 100644 --- a/pkg/runtimeoptions/v1/api.proto +++ b/pkg/runtimeoptions/v1/api.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package runtimeoptions.v1; -option go_package = "github.com/containerd/containerd/pkg/runtimeoptions/v1;runtimeoptions_v1"; +option go_package = "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1;runtimeoptions_v1"; message Options { // TypeUrl specifies the type of the content inside the config file. diff --git a/pkg/snapshotters/annotations.go b/pkg/snapshotters/annotations.go index 259f350b8206..8f33aa819dec 100644 --- a/pkg/snapshotters/annotations.go +++ b/pkg/snapshotters/annotations.go @@ -19,8 +19,8 @@ package snapshotters import ( "context" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/labels" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/testutil/helpers.go b/pkg/testutil/helpers.go index 81bf54b241be..cc02c4555762 100644 --- a/pkg/testutil/helpers.go +++ b/pkg/testutil/helpers.go @@ -24,7 +24,7 @@ import ( "strconv" "testing" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/mount" "github.com/stretchr/testify/assert" ) diff --git a/pkg/transfer/archive/exporter.go b/pkg/transfer/archive/exporter.go index 7e987c0b7649..b2cdf8689a7d 100644 --- a/pkg/transfer/archive/exporter.go +++ b/pkg/transfer/archive/exporter.go @@ -23,15 +23,15 @@ import ( "github.com/containerd/typeurl/v2" v1 "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/api/types" - transfertypes "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/archive" - "github.com/containerd/containerd/pkg/streaming" - "github.com/containerd/containerd/pkg/transfer/plugins" - tstreaming "github.com/containerd/containerd/pkg/transfer/streaming" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/api/types" + transfertypes "github.com/containerd/containerd/v2/api/types/transfer" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/pkg/streaming" + "github.com/containerd/containerd/v2/pkg/transfer/plugins" + tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" ) diff --git a/pkg/transfer/archive/importer.go b/pkg/transfer/archive/importer.go index d9a3df8760f5..e1f50f330b43 100644 --- a/pkg/transfer/archive/importer.go +++ b/pkg/transfer/archive/importer.go @@ -23,11 +23,11 @@ import ( "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - transferapi "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images/archive" - "github.com/containerd/containerd/pkg/streaming" - tstreaming "github.com/containerd/containerd/pkg/transfer/streaming" + transferapi "github.com/containerd/containerd/v2/api/types/transfer" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/pkg/streaming" + tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" "github.com/containerd/log" ) diff --git a/pkg/transfer/image/imagestore.go b/pkg/transfer/image/imagestore.go index 88d115d41e9d..68fd34913cfa 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -23,17 +23,17 @@ import ( "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/api/types" - transfertypes "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/images/archive" - "github.com/containerd/containerd/pkg/streaming" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/transfer/plugins" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2/api/types" + transfertypes "github.com/containerd/containerd/v2/api/types/transfer" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/pkg/streaming" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/transfer/plugins" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/remotes" ) func init() { diff --git a/pkg/transfer/image/imagestore_test.go b/pkg/transfer/image/imagestore_test.go index cefa0c1ef7e9..a58f238458c8 100644 --- a/pkg/transfer/image/imagestore_test.go +++ b/pkg/transfer/image/imagestore_test.go @@ -23,8 +23,8 @@ import ( "sync" "testing" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/local/export.go b/pkg/transfer/local/export.go index 069dcbebfd27..2b4031ed5789 100644 --- a/pkg/transfer/local/export.go +++ b/pkg/transfer/local/export.go @@ -19,8 +19,8 @@ package local import ( "context" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/transfer" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/transfer" ) func (ts *localTransferService) exportStream(ctx context.Context, ig transfer.ImageGetter, is transfer.ImageExporter, tops *transfer.Config) error { diff --git a/pkg/transfer/local/import.go b/pkg/transfer/local/import.go index ae741bd65e34..a75e80186021 100644 --- a/pkg/transfer/local/import.go +++ b/pkg/transfer/local/import.go @@ -23,11 +23,11 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/unpack" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/log" ) diff --git a/pkg/transfer/local/progress.go b/pkg/transfer/local/progress.go index dcaedc37131c..e5ea2864e7a5 100644 --- a/pkg/transfer/local/progress.go +++ b/pkg/transfer/local/progress.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index e0b08b5d8395..9dd9531a254e 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/unpack" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/unpack" + "github.com/containerd/containerd/v2/remotes" + "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" diff --git a/pkg/transfer/local/pull_test.go b/pkg/transfer/local/pull_test.go index 011dddf4841f..4e9e9cefa549 100644 --- a/pkg/transfer/local/pull_test.go +++ b/pkg/transfer/local/pull_test.go @@ -19,10 +19,10 @@ package local import ( "testing" - "github.com/containerd/containerd" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/unpack" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/unpack" + "github.com/containerd/containerd/v2/platforms" ) func TestGetSupportedPlatform(t *testing.T) { diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index 54cc6c577c83..1353b70212c4 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/remotes" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/local/tag.go b/pkg/transfer/local/tag.go index 8928a4a5fea2..d69894c5ef0d 100644 --- a/pkg/transfer/local/tag.go +++ b/pkg/transfer/local/tag.go @@ -19,7 +19,7 @@ package local import ( "context" - "github.com/containerd/containerd/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/transfer" ) func (ts *localTransferService) tag(ctx context.Context, ig transfer.ImageGetter, is transfer.ImageStorer, tops *transfer.Config) error { diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index 3d65865f252d..e70439c934cc 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.go @@ -25,14 +25,14 @@ import ( "github.com/containerd/typeurl/v2" "golang.org/x/sync/semaphore" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/pkg/imageverifier" - "github.com/containerd/containerd/pkg/kmutex" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/unpack" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/pkg/imageverifier" + "github.com/containerd/containerd/v2/pkg/kmutex" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/unpack" ) type localTransferService struct { diff --git a/pkg/transfer/plugins/plugins.go b/pkg/transfer/plugins/plugins.go index d122ec368b01..9f90f794cf4e 100644 --- a/pkg/transfer/plugins/plugins.go +++ b/pkg/transfer/plugins/plugins.go @@ -21,7 +21,7 @@ import ( "reflect" "sync" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/transfer/proxy/transfer.go b/pkg/transfer/proxy/transfer.go index 2ad7a944962b..764a74cf7e01 100644 --- a/pkg/transfer/proxy/transfer.go +++ b/pkg/transfer/proxy/transfer.go @@ -23,11 +23,11 @@ import ( "google.golang.org/protobuf/types/known/anypb" - transferapi "github.com/containerd/containerd/api/services/transfer/v1" - transfertypes "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/pkg/streaming" - "github.com/containerd/containerd/pkg/transfer" - tstreaming "github.com/containerd/containerd/pkg/transfer/streaming" + transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1" + transfertypes "github.com/containerd/containerd/v2/api/types/transfer" + "github.com/containerd/containerd/v2/pkg/streaming" + "github.com/containerd/containerd/v2/pkg/transfer" + tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/transfer/registry/registry.go b/pkg/transfer/registry/registry.go index fa60d88f8d09..db0a5d554490 100644 --- a/pkg/transfer/registry/registry.go +++ b/pkg/transfer/registry/registry.go @@ -25,13 +25,13 @@ import ( "strings" "sync" - transfertypes "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/pkg/streaming" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/transfer/plugins" - tstreaming "github.com/containerd/containerd/pkg/transfer/streaming" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker" + transfertypes "github.com/containerd/containerd/v2/api/types/transfer" + "github.com/containerd/containerd/v2/pkg/streaming" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/transfer/plugins" + tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" + "github.com/containerd/containerd/v2/remotes" + "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/log" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/transfer/streaming/stream.go b/pkg/transfer/streaming/stream.go index c26764b94076..4036c084cca1 100644 --- a/pkg/transfer/streaming/stream.go +++ b/pkg/transfer/streaming/stream.go @@ -26,8 +26,8 @@ import ( "sync" "time" - transferapi "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/pkg/streaming" + transferapi "github.com/containerd/containerd/v2/api/types/transfer" + "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/transfer/streaming/stream_test.go b/pkg/transfer/streaming/stream_test.go index 12d8a87a8836..f54a31b9e32d 100644 --- a/pkg/transfer/streaming/stream_test.go +++ b/pkg/transfer/streaming/stream_test.go @@ -22,7 +22,7 @@ import ( "io" "testing" - "github.com/containerd/containerd/pkg/streaming" + "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/transfer/streaming/writer.go b/pkg/transfer/streaming/writer.go index 96e9837f3df3..8da3cb17754d 100644 --- a/pkg/transfer/streaming/writer.go +++ b/pkg/transfer/streaming/writer.go @@ -22,8 +22,8 @@ import ( "io" "sync/atomic" - transferapi "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/pkg/streaming" + transferapi "github.com/containerd/containerd/v2/api/types/transfer" + "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/transfer/transfer.go b/pkg/transfer/transfer.go index 01df8c3d39d5..f6acc2016b64 100644 --- a/pkg/transfer/transfer.go +++ b/pkg/transfer/transfer.go @@ -22,8 +22,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" ) type Transferrer interface { diff --git a/pkg/ttrpcutil/client.go b/pkg/ttrpcutil/client.go index e1c1b6cf9c38..12a2c8bf8853 100644 --- a/pkg/ttrpcutil/client.go +++ b/pkg/ttrpcutil/client.go @@ -23,8 +23,8 @@ import ( "sync" "time" - v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/pkg/dialer" + v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" + "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/ttrpc" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 9879a93a1b65..f1372425231d 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -28,17 +28,17 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/cleanup" - "github.com/containerd/containerd/pkg/kmutex" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/tracing" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/kmutex" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" diff --git a/plugin/plugin_test.go b/plugin/plugin_test.go index d80c77be1ea5..69b909a1d587 100644 --- a/plugin/plugin_test.go +++ b/plugin/plugin_test.go @@ -19,7 +19,7 @@ package plugin import ( "testing" - "github.com/containerd/containerd/services" + "github.com/containerd/containerd/v2/services" ) func mockPluginFilter(*Registration) bool { diff --git a/plugin/registry/register.go b/plugin/registry/register.go index 5c5d75c6f86a..b6b114a2464a 100644 --- a/plugin/registry/register.go +++ b/plugin/registry/register.go @@ -19,7 +19,7 @@ package registry import ( "sync" - "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/v2/plugin" ) var register = struct { diff --git a/plugins/imageverifier/path_windows.go b/plugins/imageverifier/path_windows.go index 0a22bfb743d7..04faa546acbe 100644 --- a/plugins/imageverifier/path_windows.go +++ b/plugins/imageverifier/path_windows.go @@ -19,7 +19,7 @@ package imageverifier import ( "path/filepath" - "github.com/containerd/containerd/defaults" + "github.com/containerd/containerd/v2/defaults" ) var defaultPath = filepath.Join(defaults.DefaultRootDir, "opt", "image-verifier", "bin") diff --git a/plugins/imageverifier/plugin.go b/plugins/imageverifier/plugin.go index 14b23d0b86d4..7e9261395af2 100644 --- a/plugins/imageverifier/plugin.go +++ b/plugins/imageverifier/plugin.go @@ -19,11 +19,11 @@ package imageverifier import ( "time" - "github.com/containerd/containerd/pkg/imageverifier/bindir" - "github.com/containerd/containerd/pkg/tomlext" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/pkg/imageverifier/bindir" + "github.com/containerd/containerd/v2/pkg/tomlext" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" ) // Register default image verifier service plugin diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index 39db099bfd4f..4ea68eee970d 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -21,19 +21,19 @@ import ( "fmt" "time" - runtimeAPI "github.com/containerd/containerd/api/runtime/sandbox/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/events/exchange" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/runtime" - v2 "github.com/containerd/containerd/runtime/v2" - "github.com/containerd/containerd/sandbox" + runtimeAPI "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/runtime" + v2 "github.com/containerd/containerd/v2/runtime/v2" + "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" "google.golang.org/protobuf/types/known/anypb" diff --git a/plugins/sandbox/store.go b/plugins/sandbox/store.go index c5f5888154b5..811a35ddb679 100644 --- a/plugins/sandbox/store.go +++ b/plugins/sandbox/store.go @@ -17,10 +17,10 @@ package sandbox import ( - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" ) func init() { diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index 8aeb60953d4d..bdbb8a62c2b0 100644 --- a/plugins/streaming/manager.go +++ b/plugins/streaming/manager.go @@ -21,15 +21,15 @@ import ( "errors" "sync" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/streaming" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/streaming" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" ) func init() { diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index bda8b0fe8cc6..ce061492eb99 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -19,24 +19,24 @@ package transfer import ( "fmt" - "github.com/containerd/containerd" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/pkg/imageverifier" - "github.com/containerd/containerd/pkg/transfer/local" - "github.com/containerd/containerd/pkg/unpack" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/pkg/imageverifier" + "github.com/containerd/containerd/v2/pkg/transfer/local" + "github.com/containerd/containerd/v2/pkg/unpack" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" // Load packages with type registrations - _ "github.com/containerd/containerd/pkg/transfer/archive" - _ "github.com/containerd/containerd/pkg/transfer/image" - _ "github.com/containerd/containerd/pkg/transfer/registry" + _ "github.com/containerd/containerd/v2/pkg/transfer/archive" + _ "github.com/containerd/containerd/v2/pkg/transfer/image" + _ "github.com/containerd/containerd/v2/pkg/transfer/registry" ) // Register local transfer service plugin diff --git a/plugins/types.go b/plugins/types.go index 4524a7e909ac..2e04a6fe76b8 100644 --- a/plugins/types.go +++ b/plugins/types.go @@ -20,7 +20,7 @@ // package. package plugins -import "github.com/containerd/containerd/plugin" +import "github.com/containerd/containerd/v2/plugin" const ( // InternalPlugin implements an internal plugin to containerd diff --git a/process.go b/process.go index 8a4c919176b0..b83c4917e0a5 100644 --- a/process.go +++ b/process.go @@ -23,10 +23,10 @@ import ( "syscall" "time" - "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/protobuf" ) // Process represents a system process diff --git a/protobuf/plugin/fieldpath.pb.go b/protobuf/plugin/fieldpath.pb.go index 1bab0c77666e..c5fecc51dfcf 100644 --- a/protobuf/plugin/fieldpath.pb.go +++ b/protobuf/plugin/fieldpath.pb.go @@ -97,11 +97,11 @@ var file_github_com_containerd_containerd_protobuf_plugin_fieldpath_proto_rawDes 0x66, 0x69, 0x65, 0x6c, 0x64, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x90, 0xf7, 0x03, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x70, 0x61, 0x74, 0x68, 0x42, 0x32, 0x5a, - 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, + 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x70, 0x61, 0x74, 0x68, 0x42, 0x35, 0x5a, + 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, - 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, - 0x6e, + 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x6c, + 0x75, 0x67, 0x69, 0x6e, } var file_github_com_containerd_containerd_protobuf_plugin_fieldpath_proto_goTypes = []interface{}{ diff --git a/protobuf/plugin/fieldpath.proto b/protobuf/plugin/fieldpath.proto index de98dd899f4c..c900904d777c 100644 --- a/protobuf/plugin/fieldpath.proto +++ b/protobuf/plugin/fieldpath.proto @@ -31,7 +31,7 @@ package containerd.plugin; import "google/protobuf/descriptor.proto"; -option go_package = "github.com/containerd/containerd/protobuf/plugin"; +option go_package = "github.com/containerd/containerd/v2/protobuf/plugin"; extend google.protobuf.FileOptions { optional bool fieldpath_all = 63300; diff --git a/pull.go b/pull.go index d72702a5fb01..63a0f7446cbb 100644 --- a/pull.go +++ b/pull.go @@ -24,14 +24,14 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/pkg/unpack" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker" - "github.com/containerd/containerd/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. - "github.com/containerd/containerd/tracing" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/pkg/unpack" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/remotes" + "github.com/containerd/containerd/v2/remotes/docker" + "github.com/containerd/containerd/v2/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. + "github.com/containerd/containerd/v2/tracing" ) const ( diff --git a/remotes/docker/auth/fetch.go b/remotes/docker/auth/fetch.go index 244e03509a7d..b912e40a5d5b 100644 --- a/remotes/docker/auth/fetch.go +++ b/remotes/docker/auth/fetch.go @@ -26,8 +26,8 @@ import ( "strings" "time" - remoteserrors "github.com/containerd/containerd/remotes/errors" - "github.com/containerd/containerd/version" + remoteserrors "github.com/containerd/containerd/v2/remotes/errors" + "github.com/containerd/containerd/v2/version" "github.com/containerd/log" ) diff --git a/remotes/docker/authorizer.go b/remotes/docker/authorizer.go index e06f21f9ab82..486b3893c806 100644 --- a/remotes/docker/authorizer.go +++ b/remotes/docker/authorizer.go @@ -25,9 +25,9 @@ import ( "strings" "sync" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/remotes/docker/auth" - remoteerrors "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/remotes/docker/auth" + remoteerrors "github.com/containerd/containerd/v2/remotes/errors" "github.com/containerd/log" ) diff --git a/remotes/docker/config/hosts.go b/remotes/docker/config/hosts.go index 0ee1fd86916d..8abb0213cb4a 100644 --- a/remotes/docker/config/hosts.go +++ b/remotes/docker/config/hosts.go @@ -30,8 +30,8 @@ import ( "strings" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/log" "github.com/pelletier/go-toml/v2" tomlu "github.com/pelletier/go-toml/v2/unstable" diff --git a/remotes/docker/config/hosts_test.go b/remotes/docker/config/hosts_test.go index 2641c6dac9d2..801677e530cb 100644 --- a/remotes/docker/config/hosts_test.go +++ b/remotes/docker/config/hosts_test.go @@ -26,7 +26,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/log/logtest" ) diff --git a/remotes/docker/converter.go b/remotes/docker/converter.go index cdf6183fb76b..e173d3e42a22 100644 --- a/remotes/docker/converter.go +++ b/remotes/docker/converter.go @@ -22,9 +22,9 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/converter_fuzz.go b/remotes/docker/converter_fuzz.go index fc6043751d39..ebaff0583ebc 100644 --- a/remotes/docker/converter_fuzz.go +++ b/remotes/docker/converter_fuzz.go @@ -23,7 +23,7 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/content/local" + "github.com/containerd/containerd/v2/content/local" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go index 96073e1a9699..3efe4124ea8f 100644 --- a/remotes/docker/fetcher.go +++ b/remotes/docker/fetcher.go @@ -26,9 +26,9 @@ import ( "net/url" "strings" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/handler.go b/remotes/docker/handler.go index 045a50fb0214..3a0f8d961062 100644 --- a/remotes/docker/handler.go +++ b/remotes/docker/handler.go @@ -22,10 +22,10 @@ import ( "net/url" "strings" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/reference" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/reference" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/docker/handler_test.go b/remotes/docker/handler_test.go index b517ecca4eca..7043fa741569 100644 --- a/remotes/docker/handler_test.go +++ b/remotes/docker/handler_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/reference" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/reference" ) func TestAppendDistributionLabel(t *testing.T) { diff --git a/remotes/docker/httpreadseeker.go b/remotes/docker/httpreadseeker.go index 7e7790d2b376..5ada7e247f1e 100644 --- a/remotes/docker/httpreadseeker.go +++ b/remotes/docker/httpreadseeker.go @@ -21,7 +21,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" ) diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go index 720e5e198cc3..f0bc4a38bb16 100644 --- a/remotes/docker/pusher.go +++ b/remotes/docker/pusher.go @@ -28,11 +28,11 @@ import ( "sync" "time" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/remotes" - remoteserrors "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/remotes" + remoteserrors "github.com/containerd/containerd/v2/remotes/errors" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/pusher_test.go b/remotes/docker/pusher_test.go index e17410d86b05..a861025659f9 100644 --- a/remotes/docker/pusher_test.go +++ b/remotes/docker/pusher_test.go @@ -29,10 +29,10 @@ import ( "strings" "testing" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/reference" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/reference" + "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go index b4af75e1b10d..0a9e82b0b895 100644 --- a/remotes/docker/resolver.go +++ b/remotes/docker/resolver.go @@ -28,14 +28,14 @@ import ( "path" "strings" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/reference" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. - remoteerrors "github.com/containerd/containerd/remotes/errors" - "github.com/containerd/containerd/tracing" - "github.com/containerd/containerd/version" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/reference" + "github.com/containerd/containerd/v2/remotes" + "github.com/containerd/containerd/v2/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. + remoteerrors "github.com/containerd/containerd/v2/remotes/errors" + "github.com/containerd/containerd/v2/tracing" + "github.com/containerd/containerd/v2/version" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/resolver_test.go b/remotes/docker/resolver_test.go index 196143b5ab6c..7a12072c54ec 100644 --- a/remotes/docker/resolver_test.go +++ b/remotes/docker/resolver_test.go @@ -32,10 +32,10 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/remotes" - "github.com/containerd/containerd/remotes/docker/auth" - remoteerrors "github.com/containerd/containerd/remotes/errors" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/remotes" + "github.com/containerd/containerd/v2/remotes/docker/auth" + remoteerrors "github.com/containerd/containerd/v2/remotes/errors" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go index 6b179ba3fdf2..5e6cbc705d2e 100644 --- a/remotes/docker/schema1/converter.go +++ b/remotes/docker/schema1/converter.go @@ -32,12 +32,12 @@ import ( "sync" "time" - "github.com/containerd/containerd/archive/compression" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/remotes" + "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" diff --git a/remotes/docker/scope.go b/remotes/docker/scope.go index 95b4810ab93e..fe9304915bbe 100644 --- a/remotes/docker/scope.go +++ b/remotes/docker/scope.go @@ -23,7 +23,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/reference" + "github.com/containerd/containerd/v2/reference" ) // RepositoryScope returns a repository scope string such as "repository:foo/bar:pull" diff --git a/remotes/docker/scope_test.go b/remotes/docker/scope_test.go index 5d0b621f7f8a..dbee7c4b3fa0 100644 --- a/remotes/docker/scope_test.go +++ b/remotes/docker/scope_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/reference" + "github.com/containerd/containerd/v2/reference" "github.com/stretchr/testify/assert" ) diff --git a/remotes/docker/status.go b/remotes/docker/status.go index 1a9227725bb3..ada761148271 100644 --- a/remotes/docker/status.go +++ b/remotes/docker/status.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" "github.com/moby/locker" ) diff --git a/remotes/handlers.go b/remotes/handlers.go index bd32a8937a4f..f6d710f6c02a 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -25,11 +25,11 @@ import ( "strings" "sync" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go index 9acf54680bf3..42bbc809786d 100644 --- a/remotes/handlers_test.go +++ b/remotes/handlers_test.go @@ -23,9 +23,9 @@ import ( "sync" "testing" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/images" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/resolver.go b/remotes/resolver.go index c1b11efae46a..e784426fe8c0 100644 --- a/remotes/resolver.go +++ b/remotes/resolver.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/containerd/containerd/content" + "github.com/containerd/containerd/v2/content" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/rootfs/apply.go b/rootfs/apply.go index cc9a92ed9956..976220f879d9 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -23,10 +23,10 @@ import ( "fmt" "time" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" diff --git a/rootfs/diff.go b/rootfs/diff.go index da9dbe275291..5dd4e1a1ec8b 100644 --- a/rootfs/diff.go +++ b/rootfs/diff.go @@ -20,10 +20,10 @@ import ( "context" "fmt" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/cleanup" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/rootfs/init.go b/rootfs/init.go index e6866ace2b49..1b674ff5bed9 100644 --- a/rootfs/init.go +++ b/rootfs/init.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ) diff --git a/runtime/events.go b/runtime/events.go index 29fc741a4837..f6f38dad5bd1 100644 --- a/runtime/events.go +++ b/runtime/events.go @@ -17,7 +17,7 @@ package runtime import ( - "github.com/containerd/containerd/api/events" + "github.com/containerd/containerd/v2/api/events" "github.com/containerd/log" ) diff --git a/runtime/nsmap.go b/runtime/nsmap.go index d37f305d96a6..947b7836f6c0 100644 --- a/runtime/nsmap.go +++ b/runtime/nsmap.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/namespaces" ) type object interface { diff --git a/runtime/opts/opts_linux.go b/runtime/opts/opts_linux.go index 0fd0b9103e5a..99dd30d57d4d 100644 --- a/runtime/opts/opts_linux.go +++ b/runtime/opts/opts_linux.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/cgroups/v3" cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroup2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/namespaces" ) // WithNamespaceCgroupDeletion removes the cgroup directory that was created for the namespace diff --git a/runtime/restart/monitor/change.go b/runtime/restart/monitor/change.go index 55c55bb63cdf..875d38f52f38 100644 --- a/runtime/restart/monitor/change.go +++ b/runtime/restart/monitor/change.go @@ -23,9 +23,9 @@ import ( "strconv" "syscall" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/runtime/restart" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/runtime/restart" ) type stopChange struct { diff --git a/runtime/restart/monitor/monitor.go b/runtime/restart/monitor/monitor.go index 97d41bfc3cac..283c7c7616a2 100644 --- a/runtime/restart/monitor/monitor.go +++ b/runtime/restart/monitor/monitor.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/containerd/containerd" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/runtime/restart" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/log" ) diff --git a/runtime/restart/restart.go b/runtime/restart/restart.go index e71e9ec4d4c1..e90faeb01ed4 100644 --- a/runtime/restart/restart.go +++ b/runtime/restart/restart.go @@ -36,9 +36,9 @@ import ( "strconv" "strings" - "github.com/containerd/containerd" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/containers" "github.com/containerd/log" ) diff --git a/runtime/restart/restart_test.go b/runtime/restart/restart_test.go index 23958ed8a5c8..046c382e9e02 100644 --- a/runtime/restart/restart_test.go +++ b/runtime/restart/restart_test.go @@ -19,7 +19,7 @@ package restart import ( "testing" - "github.com/containerd/containerd" + "github.com/containerd/containerd/v2" "github.com/stretchr/testify/assert" ) diff --git a/runtime/runtime.go b/runtime/runtime.go index 49a47eb7a1b2..52760e37e444 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/mount" "github.com/containerd/typeurl/v2" ) diff --git a/runtime/task.go b/runtime/task.go index 6f9611cf29a0..71ef674fb970 100644 --- a/runtime/task.go +++ b/runtime/task.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/protobuf/types" ) // TaskInfo provides task specific information diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go index 288a2f965594..0888c675d7f2 100644 --- a/runtime/v2/binary.go +++ b/runtime/v2/binary.go @@ -25,13 +25,13 @@ import ( "path/filepath" gruntime "runtime" - "github.com/containerd/containerd/api/runtime/task/v2" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/proto" - "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/runtime" - client "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/v2/api/runtime/task/v2" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/runtime" + client "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" ) diff --git a/runtime/v2/bridge.go b/runtime/v2/bridge.go index 6262e0efddd7..9f280c22adac 100644 --- a/runtime/v2/bridge.go +++ b/runtime/v2/bridge.go @@ -24,10 +24,10 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" - v2 "github.com/containerd/containerd/api/runtime/task/v2" - v3 "github.com/containerd/containerd/api/runtime/task/v3" + v2 "github.com/containerd/containerd/v2/api/runtime/task/v2" + v3 "github.com/containerd/containerd/v2/api/runtime/task/v3" - api "github.com/containerd/containerd/api/runtime/task/v3" // Current version used by TaskServiceClient + api "github.com/containerd/containerd/v2/api/runtime/task/v3" // Current version used by TaskServiceClient ) // TaskServiceClient exposes a client interface to shims, which aims to hide diff --git a/runtime/v2/bundle.go b/runtime/v2/bundle.go index e7b5800c8868..569f0e235a12 100644 --- a/runtime/v2/bundle.go +++ b/runtime/v2/bundle.go @@ -23,10 +23,10 @@ import ( "path/filepath" "runtime" - "github.com/containerd/containerd/identifiers" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/identifiers" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/oci" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/runtime/v2/bundle_linux_test.go b/runtime/v2/bundle_linux_test.go index 07e077445b36..af3b6538d48b 100644 --- a/runtime/v2/bundle_linux_test.go +++ b/runtime/v2/bundle_linux_test.go @@ -26,9 +26,9 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" diff --git a/runtime/v2/bundle_test.go b/runtime/v2/bundle_test.go index 54e5f24cc2ed..ea5d154623fd 100644 --- a/runtime/v2/bundle_test.go +++ b/runtime/v2/bundle_test.go @@ -19,5 +19,5 @@ package v2 import ( // When testutil is imported for one platform (bundle_linux_test.go) it // should be imported for all platforms. - _ "github.com/containerd/containerd/pkg/testutil" + _ "github.com/containerd/containerd/v2/pkg/testutil" ) diff --git a/runtime/v2/example/cmd/main.go b/runtime/v2/example/cmd/main.go index 7e912a2c018d..850d2cc9465f 100644 --- a/runtime/v2/example/cmd/main.go +++ b/runtime/v2/example/cmd/main.go @@ -19,8 +19,8 @@ package main import ( "context" - "github.com/containerd/containerd/runtime/v2/example" - "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/v2/runtime/v2/example" + "github.com/containerd/containerd/v2/runtime/v2/shim" ) func main() { diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go index 8633aa17e07b..0f56dd34e689 100644 --- a/runtime/v2/example/example.go +++ b/runtime/v2/example/example.go @@ -20,14 +20,14 @@ import ( "context" "os" - taskAPI "github.com/containerd/containerd/api/runtime/task/v2" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/shutdown" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/runtime/v2/shim" + taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/shutdown" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/ttrpc" ) diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 923489eed79e..673c827726e8 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -26,21 +26,21 @@ import ( "strings" "sync" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events/exchange" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/cleanup" - "github.com/containerd/containerd/pkg/timeout" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/runtime" - shimbinary "github.com/containerd/containerd/runtime/v2/shim" - "github.com/containerd/containerd/sandbox" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/timeout" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/runtime" + shimbinary "github.com/containerd/containerd/v2/runtime/v2/shim" + "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" ) diff --git a/runtime/v2/manager_unix.go b/runtime/v2/manager_unix.go index df2559afd8ed..d4c147dc452a 100644 --- a/runtime/v2/manager_unix.go +++ b/runtime/v2/manager_unix.go @@ -19,7 +19,7 @@ package v2 import ( - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/platforms" ) func defaultPlatforms() []string { diff --git a/runtime/v2/manager_windows.go b/runtime/v2/manager_windows.go index fe2040daf481..544e0afa9b02 100644 --- a/runtime/v2/manager_windows.go +++ b/runtime/v2/manager_windows.go @@ -17,7 +17,7 @@ package v2 import ( - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/platforms" ) func defaultPlatforms() []string { diff --git a/runtime/v2/process.go b/runtime/v2/process.go index 83e18151f791..65792645eeb8 100644 --- a/runtime/v2/process.go +++ b/runtime/v2/process.go @@ -20,11 +20,11 @@ import ( "context" "errors" - task "github.com/containerd/containerd/api/runtime/task/v3" - tasktypes "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/runtime" + task "github.com/containerd/containerd/v2/api/runtime/task/v3" + tasktypes "github.com/containerd/containerd/v2/api/types/task" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/runtime" "github.com/containerd/ttrpc" ) diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go index 2f6ebbbd2e15..4f36e8d9e107 100644 --- a/runtime/v2/runc/container.go +++ b/runtime/v2/runc/container.go @@ -30,13 +30,13 @@ import ( "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" "github.com/containerd/console" - "github.com/containerd/containerd/api/runtime/task/v3" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/process" - "github.com/containerd/containerd/pkg/stdio" - "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/process" + "github.com/containerd/containerd/v2/pkg/stdio" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/runtime/v2/runc/manager/manager_linux.go b/runtime/v2/runc/manager/manager_linux.go index eefc32822d62..d780a064ad71 100644 --- a/runtime/v2/runc/manager/manager_linux.go +++ b/runtime/v2/runc/manager/manager_linux.go @@ -29,14 +29,14 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/process" - "github.com/containerd/containerd/pkg/schedcore" - "github.com/containerd/containerd/runtime/v2/runc" - "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/process" + "github.com/containerd/containerd/v2/pkg/schedcore" + "github.com/containerd/containerd/v2/runtime/v2/runc" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/runtime/v2/shim" runcC "github.com/containerd/go-runc" "github.com/containerd/log" exec "golang.org/x/sys/execabs" diff --git a/runtime/v2/runc/options/next.pb.txt b/runtime/v2/runc/options/next.pb.txt index c358cb24bc05..f3a0b3674fe9 100755 --- a/runtime/v2/runc/options/next.pb.txt +++ b/runtime/v2/runc/options/next.pb.txt @@ -155,7 +155,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/runtime/v2/runc/options;options" + go_package: "github.com/containerd/containerd/v2/runtime/v2/runc/options;options" } syntax: "proto3" } diff --git a/runtime/v2/runc/options/oci.pb.go b/runtime/v2/runc/options/oci.pb.go index 37b87f502ddc..f68f96380f0d 100644 --- a/runtime/v2/runc/options/oci.pb.go +++ b/runtime/v2/runc/options/oci.pb.go @@ -369,12 +369,12 @@ var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawD 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, 0x22, 0x29, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x78, 0x65, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x65, 0x78, 0x65, 0x63, 0x49, 0x64, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x65, 0x78, 0x65, 0x63, 0x49, 0x64, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, - 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, - 0x6d, 0x65, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x3b, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75, + 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x2f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3b, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/runtime/v2/runc/options/oci.proto b/runtime/v2/runc/options/oci.proto index 0893cf1b1f94..458052bb5f5c 100644 --- a/runtime/v2/runc/options/oci.proto +++ b/runtime/v2/runc/options/oci.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package containerd.runc.v1; -option go_package = "github.com/containerd/containerd/runtime/v2/runc/options;options"; +option go_package = "github.com/containerd/containerd/v2/runtime/v2/runc/options;options"; message Options { // disable pivot root when creating a container diff --git a/runtime/v2/runc/pause/sandbox.go b/runtime/v2/runc/pause/sandbox.go index 25a3871ee084..04822de6cf28 100644 --- a/runtime/v2/runc/pause/sandbox.go +++ b/runtime/v2/runc/pause/sandbox.go @@ -22,16 +22,16 @@ import ( "context" "runtime" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/pkg/shutdown" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/pkg/shutdown" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" "github.com/containerd/ttrpc" - api "github.com/containerd/containerd/api/runtime/sandbox/v1" - "github.com/containerd/containerd/plugin" + api "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" + "github.com/containerd/containerd/v2/plugin" ) func init() { diff --git a/runtime/v2/runc/platform.go b/runtime/v2/runc/platform.go index fea18a1419b6..b50a3741967a 100644 --- a/runtime/v2/runc/platform.go +++ b/runtime/v2/runc/platform.go @@ -29,9 +29,9 @@ import ( "syscall" "github.com/containerd/console" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/process" - "github.com/containerd/containerd/pkg/stdio" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/process" + "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/fifo" ) diff --git a/runtime/v2/runc/task/plugin/plugin_linux.go b/runtime/v2/runc/task/plugin/plugin_linux.go index 2a70dbf64c8c..306cba198983 100644 --- a/runtime/v2/runc/task/plugin/plugin_linux.go +++ b/runtime/v2/runc/task/plugin/plugin_linux.go @@ -17,12 +17,12 @@ package plugin import ( - "github.com/containerd/containerd/pkg/shutdown" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/runtime/v2/runc/task" - "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/v2/pkg/shutdown" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/runtime/v2/runc/task" + "github.com/containerd/containerd/v2/runtime/v2/shim" ) func init() { diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go index 6233b1615689..3b85cdcb42cf 100644 --- a/runtime/v2/runc/task/service.go +++ b/runtime/v2/runc/task/service.go @@ -27,25 +27,25 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - eventstypes "github.com/containerd/containerd/api/events" - taskAPI "github.com/containerd/containerd/api/runtime/task/v3" - "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/oom" - oomv1 "github.com/containerd/containerd/pkg/oom/v1" - oomv2 "github.com/containerd/containerd/pkg/oom/v2" - "github.com/containerd/containerd/pkg/process" - "github.com/containerd/containerd/pkg/shutdown" - "github.com/containerd/containerd/pkg/stdio" - "github.com/containerd/containerd/pkg/userns" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/runtime" - "github.com/containerd/containerd/runtime/v2/runc" - "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/containerd/runtime/v2/shim" - "github.com/containerd/containerd/sys/reaper" + eventstypes "github.com/containerd/containerd/v2/api/events" + taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/api/types/task" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/oom" + oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" + oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" + "github.com/containerd/containerd/v2/pkg/process" + "github.com/containerd/containerd/v2/pkg/shutdown" + "github.com/containerd/containerd/v2/pkg/stdio" + "github.com/containerd/containerd/v2/pkg/userns" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/runtime" + "github.com/containerd/containerd/v2/runtime/v2/runc" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/runtime/v2/shim" + "github.com/containerd/containerd/v2/sys/reaper" runcC "github.com/containerd/go-runc" "github.com/containerd/log" "github.com/containerd/ttrpc" diff --git a/runtime/v2/runc/util.go b/runtime/v2/runc/util.go index 5a95c663dd43..da9409de7d72 100644 --- a/runtime/v2/runc/util.go +++ b/runtime/v2/runc/util.go @@ -22,7 +22,7 @@ import ( "context" "path/filepath" - "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index 76ce6d061f23..1f1e50ccca54 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -27,24 +27,24 @@ import ( "strings" "time" - "github.com/containerd/containerd/pkg/atomicfile" + "github.com/containerd/containerd/v2/pkg/atomicfile" "github.com/containerd/ttrpc" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials/insecure" - eventstypes "github.com/containerd/containerd/api/events" - task "github.com/containerd/containerd/api/runtime/task/v3" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events/exchange" - "github.com/containerd/containerd/identifiers" - "github.com/containerd/containerd/pkg/dialer" - "github.com/containerd/containerd/pkg/timeout" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/runtime" - client "github.com/containerd/containerd/runtime/v2/shim" + eventstypes "github.com/containerd/containerd/v2/api/events" + task "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/identifiers" + "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/pkg/timeout" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/runtime" + client "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" ) diff --git a/runtime/v2/shim/publisher.go b/runtime/v2/shim/publisher.go index 009f50ba2f30..c86d16eed43c 100644 --- a/runtime/v2/shim/publisher.go +++ b/runtime/v2/shim/publisher.go @@ -21,11 +21,11 @@ import ( "sync" "time" - v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/ttrpcutil" - "github.com/containerd/containerd/protobuf" + v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/ttrpcutil" + "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" "github.com/containerd/ttrpc" ) diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go index 0a4e6ab751c1..366b63e8eb66 100644 --- a/runtime/v2/shim/shim.go +++ b/runtime/v2/shim/shim.go @@ -30,16 +30,16 @@ import ( "runtime/debug" "time" - shimapi "github.com/containerd/containerd/api/runtime/task/v3" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/shutdown" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/proto" - "github.com/containerd/containerd/version" + shimapi "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/shutdown" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/containerd/v2/version" "github.com/containerd/log" "github.com/containerd/ttrpc" "github.com/sirupsen/logrus" diff --git a/runtime/v2/shim/shim_linux.go b/runtime/v2/shim/shim_linux.go index 1c05c2c5664c..df9ed5714c1e 100644 --- a/runtime/v2/shim/shim_linux.go +++ b/runtime/v2/shim/shim_linux.go @@ -17,7 +17,7 @@ package shim import ( - "github.com/containerd/containerd/sys/reaper" + "github.com/containerd/containerd/v2/sys/reaper" "github.com/containerd/ttrpc" ) diff --git a/runtime/v2/shim/shim_unix.go b/runtime/v2/shim/shim_unix.go index a9504b698da0..8cf8b3c98a16 100644 --- a/runtime/v2/shim/shim_unix.go +++ b/runtime/v2/shim/shim_unix.go @@ -27,7 +27,7 @@ import ( "os/signal" "syscall" - "github.com/containerd/containerd/sys/reaper" + "github.com/containerd/containerd/v2/sys/reaper" "github.com/containerd/fifo" "github.com/containerd/log" "github.com/sirupsen/logrus" diff --git a/runtime/v2/shim/shim_windows.go b/runtime/v2/shim/shim_windows.go index a290a06fb624..bfa4d9550c56 100644 --- a/runtime/v2/shim/shim_windows.go +++ b/runtime/v2/shim/shim_windows.go @@ -22,7 +22,7 @@ import ( "net" "os" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/ttrpc" "github.com/sirupsen/logrus" ) diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go index 3e7d19ec05a7..546b2f8497f9 100644 --- a/runtime/v2/shim/util.go +++ b/runtime/v2/shim/util.go @@ -32,11 +32,11 @@ import ( "github.com/containerd/typeurl/v2" exec "golang.org/x/sys/execabs" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/atomicfile" - "github.com/containerd/containerd/protobuf/proto" - "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/atomicfile" + "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/containerd/v2/protobuf/types" ) type CommandConfig struct { diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go index ac470f914ccc..a1f722494365 100644 --- a/runtime/v2/shim/util_unix.go +++ b/runtime/v2/shim/util_unix.go @@ -30,9 +30,9 @@ import ( "syscall" "time" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/sys" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/sys" ) const ( diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go index 980dba264160..fc100e77799b 100644 --- a/runtime/v2/shim_load.go +++ b/runtime/v2/shim_load.go @@ -22,11 +22,11 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/cleanup" - "github.com/containerd/containerd/pkg/timeout" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" ) diff --git a/runtime/v2/shim_test.go b/runtime/v2/shim_test.go index 05140fcbb905..78f6d9f70341 100644 --- a/runtime/v2/shim_test.go +++ b/runtime/v2/shim_test.go @@ -22,8 +22,8 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/errdefs" - client "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/v2/errdefs" + client "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/stretchr/testify/require" ) diff --git a/runtime/v2/shim_windows.go b/runtime/v2/shim_windows.go index 913e5b483dcb..80f31140f7bf 100644 --- a/runtime/v2/shim_windows.go +++ b/runtime/v2/shim_windows.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/namespaces" ) type deferredPipeConnection struct { diff --git a/sandbox.go b/sandbox.go index d9041c84e9a9..5476c4dda9be 100644 --- a/sandbox.go +++ b/sandbox.go @@ -22,11 +22,11 @@ import ( "fmt" "time" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/protobuf/types" - api "github.com/containerd/containerd/sandbox" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/protobuf/types" + api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" ) diff --git a/sandbox/bridge.go b/sandbox/bridge.go index 2c2749b00d30..48a56235d8f5 100644 --- a/sandbox/bridge.go +++ b/sandbox/bridge.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/ttrpc" "google.golang.org/grpc" - api "github.com/containerd/containerd/api/runtime/sandbox/v1" + api "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" ) // NewClient returns a new sandbox client that handles both GRPC and TTRPC clients. diff --git a/sandbox/controller.go b/sandbox/controller.go index 1beacdde4329..ada8c4103095 100644 --- a/sandbox/controller.go +++ b/sandbox/controller.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/platforms" "github.com/containerd/typeurl/v2" ) diff --git a/sandbox/helpers.go b/sandbox/helpers.go index 09667adb6365..9538560ddb7c 100644 --- a/sandbox/helpers.go +++ b/sandbox/helpers.go @@ -17,9 +17,9 @@ package sandbox import ( - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/protobuf" - gogo_types "github.com/containerd/containerd/protobuf/types" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/protobuf" + gogo_types "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" ) diff --git a/sandbox/proxy/controller.go b/sandbox/proxy/controller.go index c9f59da6761d..50d1f77ac43a 100644 --- a/sandbox/proxy/controller.go +++ b/sandbox/proxy/controller.go @@ -19,12 +19,12 @@ package proxy import ( "context" - api "github.com/containerd/containerd/api/services/sandbox/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/sandbox" + api "github.com/containerd/containerd/v2/api/services/sandbox/v1" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/sandbox" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/sandbox/proxy/store.go b/sandbox/proxy/store.go index 64e4a2b32039..bb2f9aa28954 100644 --- a/sandbox/proxy/store.go +++ b/sandbox/proxy/store.go @@ -19,9 +19,9 @@ package proxy import ( "context" - api "github.com/containerd/containerd/api/services/sandbox/v1" - "github.com/containerd/containerd/errdefs" - sb "github.com/containerd/containerd/sandbox" + api "github.com/containerd/containerd/v2/api/services/sandbox/v1" + "github.com/containerd/containerd/v2/errdefs" + sb "github.com/containerd/containerd/v2/sandbox" ) // remoteSandboxStore is a low-level containerd client to manage sandbox environments metadata diff --git a/sandbox/store.go b/sandbox/store.go index 6cffafb9b3c7..a4cb4ebe597e 100644 --- a/sandbox/store.go +++ b/sandbox/store.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/services.go b/services.go index c9c9ba5449c2..f790ae8e9be4 100644 --- a/services.go +++ b/services.go @@ -19,23 +19,23 @@ package containerd import ( "fmt" - containersapi "github.com/containerd/containerd/api/services/containers/v1" - "github.com/containerd/containerd/api/services/diff/v1" - imagesapi "github.com/containerd/containerd/api/services/images/v1" - introspectionapi "github.com/containerd/containerd/api/services/introspection/v1" - namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1" - "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/sandbox" - srv "github.com/containerd/containerd/services" - "github.com/containerd/containerd/services/introspection" - "github.com/containerd/containerd/snapshots" + containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" + "github.com/containerd/containerd/v2/api/services/diff/v1" + imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" + introspectionapi "github.com/containerd/containerd/v2/api/services/introspection/v1" + namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1" + "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/sandbox" + srv "github.com/containerd/containerd/v2/services" + "github.com/containerd/containerd/v2/services/introspection" + "github.com/containerd/containerd/v2/snapshots" ) type services struct { diff --git a/services/containers/helpers.go b/services/containers/helpers.go index e1bd5aff44fd..8608681195c9 100644 --- a/services/containers/helpers.go +++ b/services/containers/helpers.go @@ -17,10 +17,10 @@ package containers import ( - api "github.com/containerd/containerd/api/services/containers/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/containers/v1" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" ) diff --git a/services/containers/local.go b/services/containers/local.go index 197ea114ce55..27773924fb11 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -20,17 +20,17 @@ import ( "context" "io" - eventstypes "github.com/containerd/containerd/api/events" - api "github.com/containerd/containerd/api/services/containers/v1" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" + eventstypes "github.com/containerd/containerd/v2/api/events" + api "github.com/containerd/containerd/v2/api/services/containers/v1" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" bolt "go.etcd.io/bbolt" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/services/containers/service.go b/services/containers/service.go index fe19d46724ef..d140b3d36fbc 100644 --- a/services/containers/service.go +++ b/services/containers/service.go @@ -21,12 +21,12 @@ import ( "errors" "io" - api "github.com/containerd/containerd/api/services/containers/v1" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" + api "github.com/containerd/containerd/v2/api/services/containers/v1" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" "google.golang.org/grpc" ) diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go index 769250c0f35c..cd58d87769ce 100644 --- a/services/content/contentserver/contentserver.go +++ b/services/content/contentserver/contentserver.go @@ -22,11 +22,11 @@ import ( "io" "sync" - api "github.com/containerd/containerd/api/services/content/v1" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/content/v1" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/services/content/service.go b/services/content/service.go index 7c3d19a0d8ac..d72bbef1b943 100644 --- a/services/content/service.go +++ b/services/content/service.go @@ -19,12 +19,12 @@ package content import ( "errors" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/services" - "github.com/containerd/containerd/services/content/contentserver" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/services" + "github.com/containerd/containerd/v2/services/content/contentserver" ) func init() { diff --git a/services/content/store.go b/services/content/store.go index 59eab12f0b94..a48650e09592 100644 --- a/services/content/store.go +++ b/services/content/store.go @@ -19,14 +19,14 @@ package content import ( "context" - eventstypes "github.com/containerd/containerd/api/events" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/services" + eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/services" digest "github.com/opencontainers/go-digest" ) diff --git a/services/diff/local.go b/services/diff/local.go index 350993bf8fda..f79ef4401cf1 100644 --- a/services/diff/local.go +++ b/services/diff/local.go @@ -20,15 +20,15 @@ import ( "context" "fmt" - diffapi "github.com/containerd/containerd/api/services/diff/v1" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/services" + diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/services" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/grpc" diff --git a/services/diff/service.go b/services/diff/service.go index 198fe989f6a1..07035e2afab3 100644 --- a/services/diff/service.go +++ b/services/diff/service.go @@ -20,11 +20,11 @@ import ( "context" "errors" - diffapi "github.com/containerd/containerd/api/services/diff/v1" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/services" + diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/services" "google.golang.org/grpc" ) diff --git a/services/events/service.go b/services/events/service.go index 3e35a3c654ad..52cc5a40c26d 100644 --- a/services/events/service.go +++ b/services/events/service.go @@ -20,16 +20,16 @@ import ( "context" "fmt" - api "github.com/containerd/containerd/api/services/events/v1" - apittrpc "github.com/containerd/containerd/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/events/exchange" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/events/v1" + apittrpc "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/ttrpc" "google.golang.org/grpc" ) diff --git a/services/events/ttrpc.go b/services/events/ttrpc.go index 1b3ceb9432aa..ac9aa74812ef 100644 --- a/services/events/ttrpc.go +++ b/services/events/ttrpc.go @@ -19,12 +19,12 @@ package events import ( "context" - api "github.com/containerd/containerd/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/events/exchange" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" ) type ttrpcService struct { diff --git a/services/healthcheck/service.go b/services/healthcheck/service.go index 3f2b918e3f2c..e17e0d7cf4f8 100644 --- a/services/healthcheck/service.go +++ b/services/healthcheck/service.go @@ -17,9 +17,9 @@ package healthcheck import ( - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/services/images/helpers.go b/services/images/helpers.go index 43712212efb8..68326d4e784c 100644 --- a/services/images/helpers.go +++ b/services/images/helpers.go @@ -17,10 +17,10 @@ package images import ( - imagesapi "github.com/containerd/containerd/api/services/images/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/protobuf" + imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/protobuf" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/services/images/local.go b/services/images/local.go index c3b96b0bad24..f85c84d78ddb 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -24,21 +24,21 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - eventstypes "github.com/containerd/containerd/api/events" - imagesapi "github.com/containerd/containerd/api/services/images/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/gc" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/pkg/deprecation" - "github.com/containerd/containerd/pkg/epoch" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" - "github.com/containerd/containerd/services/warning" + eventstypes "github.com/containerd/containerd/v2/api/events" + imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/pkg/deprecation" + "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" + "github.com/containerd/containerd/v2/services/warning" ) func init() { diff --git a/services/images/service.go b/services/images/service.go index 28d5f511c905..b5263e9ebf9d 100644 --- a/services/images/service.go +++ b/services/images/service.go @@ -20,12 +20,12 @@ import ( "context" "errors" - imagesapi "github.com/containerd/containerd/api/services/images/v1" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" + imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" "google.golang.org/grpc" ) diff --git a/services/introspection/introspection.go b/services/introspection/introspection.go index 82954d5f4f1d..9fcff9ec79ae 100644 --- a/services/introspection/introspection.go +++ b/services/introspection/introspection.go @@ -19,9 +19,9 @@ package introspection import ( context "context" - api "github.com/containerd/containerd/api/services/introspection/v1" - "github.com/containerd/containerd/errdefs" - ptypes "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/introspection/v1" + "github.com/containerd/containerd/v2/errdefs" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" ) diff --git a/services/introspection/local.go b/services/introspection/local.go index 78f421d741c3..feff1457c963 100644 --- a/services/introspection/local.go +++ b/services/introspection/local.go @@ -30,17 +30,17 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/status" - api "github.com/containerd/containerd/api/services/introspection/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" - "github.com/containerd/containerd/services/warning" + api "github.com/containerd/containerd/v2/api/services/introspection/v1" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" + "github.com/containerd/containerd/v2/services/warning" ) func init() { diff --git a/services/introspection/service.go b/services/introspection/service.go index 95ba2657b1ae..e9cb15619eb5 100644 --- a/services/introspection/service.go +++ b/services/introspection/service.go @@ -20,12 +20,12 @@ import ( context "context" "errors" - api "github.com/containerd/containerd/api/services/introspection/v1" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" + api "github.com/containerd/containerd/v2/api/services/introspection/v1" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" "google.golang.org/grpc" ) diff --git a/services/leases/service.go b/services/leases/service.go index 4c519801feb8..a9404af91267 100644 --- a/services/leases/service.go +++ b/services/leases/service.go @@ -19,14 +19,14 @@ package leases import ( "context" - api "github.com/containerd/containerd/api/services/leases/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/leases/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "google.golang.org/grpc" ) diff --git a/services/namespaces/local.go b/services/namespaces/local.go index 3e76fa30d3be..28ce52169bbb 100644 --- a/services/namespaces/local.go +++ b/services/namespaces/local.go @@ -20,17 +20,17 @@ import ( "context" "strings" - eventstypes "github.com/containerd/containerd/api/events" - api "github.com/containerd/containerd/api/services/namespaces/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" + eventstypes "github.com/containerd/containerd/v2/api/events" + api "github.com/containerd/containerd/v2/api/services/namespaces/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" bolt "go.etcd.io/bbolt" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/services/namespaces/service.go b/services/namespaces/service.go index 7273a58fd43b..3d0e14fc6096 100644 --- a/services/namespaces/service.go +++ b/services/namespaces/service.go @@ -20,12 +20,12 @@ import ( "context" "errors" - api "github.com/containerd/containerd/api/services/namespaces/v1" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" + api "github.com/containerd/containerd/v2/api/services/namespaces/v1" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" "google.golang.org/grpc" ) diff --git a/services/opt/path_windows.go b/services/opt/path_windows.go index d379920f2136..8c407b8bb32b 100644 --- a/services/opt/path_windows.go +++ b/services/opt/path_windows.go @@ -19,7 +19,7 @@ package opt import ( "path/filepath" - "github.com/containerd/containerd/defaults" + "github.com/containerd/containerd/v2/defaults" ) var defaultPath = filepath.Join(defaults.DefaultRootDir, "opt") diff --git a/services/opt/service.go b/services/opt/service.go index 4e01c1e5e4d2..2b2af445f563 100644 --- a/services/opt/service.go +++ b/services/opt/service.go @@ -21,9 +21,9 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" ) // Config for the opt manager diff --git a/services/sandbox/controller_service.go b/services/sandbox/controller_service.go index 2cb066fdb7d9..0bc67ff674e8 100644 --- a/services/sandbox/controller_service.go +++ b/services/sandbox/controller_service.go @@ -25,16 +25,16 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/anypb" - eventtypes "github.com/containerd/containerd/api/events" - api "github.com/containerd/containerd/api/services/sandbox/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/sandbox" - "github.com/containerd/containerd/services" + eventtypes "github.com/containerd/containerd/v2/api/events" + api "github.com/containerd/containerd/v2/api/services/sandbox/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/sandbox" + "github.com/containerd/containerd/v2/services" "github.com/containerd/log" ) diff --git a/services/sandbox/sandboxers.go b/services/sandbox/sandboxers.go index 6d9ab4c9c8c6..cddbbf02df57 100644 --- a/services/sandbox/sandboxers.go +++ b/services/sandbox/sandboxers.go @@ -17,11 +17,11 @@ package sandbox import ( - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/sandbox" - "github.com/containerd/containerd/services" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/sandbox" + "github.com/containerd/containerd/v2/services" ) func init() { diff --git a/services/sandbox/store_service.go b/services/sandbox/store_service.go index 4c3972a079e9..233526008e3e 100644 --- a/services/sandbox/store_service.go +++ b/services/sandbox/store_service.go @@ -21,13 +21,13 @@ import ( "google.golang.org/grpc" - api "github.com/containerd/containerd/api/services/sandbox/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/sandbox" + api "github.com/containerd/containerd/v2/api/services/sandbox/v1" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" ) diff --git a/services/server/config/config.go b/services/server/config/config.go index 50f3f07dfce3..fad902b0c073 100644 --- a/services/server/config/config.go +++ b/services/server/config/config.go @@ -35,8 +35,8 @@ import ( "dario.cat/mergo" "github.com/pelletier/go-toml/v2" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/plugin" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/plugin" "github.com/containerd/log" ) diff --git a/services/server/namespace.go b/services/server/namespace.go index 99f5e33e4a34..46cda4b2db94 100644 --- a/services/server/namespace.go +++ b/services/server/namespace.go @@ -19,7 +19,7 @@ package server import ( "context" - "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/v2/namespaces" "google.golang.org/grpc" ) diff --git a/services/server/server.go b/services/server/server.go index 75919a622555..9b6e8fd7333e 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -46,28 +46,28 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" - csapi "github.com/containerd/containerd/api/services/content/v1" - diffapi "github.com/containerd/containerd/api/services/diff/v1" - sbapi "github.com/containerd/containerd/api/services/sandbox/v1" - ssapi "github.com/containerd/containerd/api/services/snapshots/v1" - "github.com/containerd/containerd/content/local" - csproxy "github.com/containerd/containerd/content/proxy" - "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/diff" - diffproxy "github.com/containerd/containerd/diff/proxy" - "github.com/containerd/containerd/pkg/deprecation" - "github.com/containerd/containerd/pkg/dialer" - "github.com/containerd/containerd/pkg/timeout" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/dynamic" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - sbproxy "github.com/containerd/containerd/sandbox/proxy" - srvconfig "github.com/containerd/containerd/services/server/config" - "github.com/containerd/containerd/services/warning" - ssproxy "github.com/containerd/containerd/snapshots/proxy" - "github.com/containerd/containerd/sys" + csapi "github.com/containerd/containerd/v2/api/services/content/v1" + diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" + sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" + ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + "github.com/containerd/containerd/v2/content/local" + csproxy "github.com/containerd/containerd/v2/content/proxy" + "github.com/containerd/containerd/v2/defaults" + "github.com/containerd/containerd/v2/diff" + diffproxy "github.com/containerd/containerd/v2/diff/proxy" + "github.com/containerd/containerd/v2/pkg/deprecation" + "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/pkg/timeout" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/dynamic" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + sbproxy "github.com/containerd/containerd/v2/sandbox/proxy" + srvconfig "github.com/containerd/containerd/v2/services/server/config" + "github.com/containerd/containerd/v2/services/warning" + ssproxy "github.com/containerd/containerd/v2/snapshots/proxy" + "github.com/containerd/containerd/v2/sys" ) // CreateTopLevelDirectories creates the top-level root and state directories. diff --git a/services/server/server_linux.go b/services/server/server_linux.go index d1c219d2bc6c..1cd818883847 100644 --- a/services/server/server_linux.go +++ b/services/server/server_linux.go @@ -23,8 +23,8 @@ import ( "github.com/containerd/cgroups/v3" cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - srvconfig "github.com/containerd/containerd/services/server/config" - "github.com/containerd/containerd/sys" + srvconfig "github.com/containerd/containerd/v2/services/server/config" + "github.com/containerd/containerd/v2/sys" "github.com/containerd/log" "github.com/containerd/ttrpc" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/services/server/server_solaris.go b/services/server/server_solaris.go index 35a637021d8f..3d29176f0ca7 100644 --- a/services/server/server_solaris.go +++ b/services/server/server_solaris.go @@ -19,7 +19,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/services/server/config" + srvconfig "github.com/containerd/containerd/v2/services/server/config" ) func apply(_ context.Context, _ *srvconfig.Config) error { diff --git a/services/server/server_test.go b/services/server/server_test.go index fb72b1cf9ced..2aa923415917 100644 --- a/services/server/server_test.go +++ b/services/server/server_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - srvconfig "github.com/containerd/containerd/services/server/config" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/stretchr/testify/assert" ) diff --git a/services/server/server_unsupported.go b/services/server/server_unsupported.go index def4b548a487..a90a9e72556d 100644 --- a/services/server/server_unsupported.go +++ b/services/server/server_unsupported.go @@ -21,7 +21,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/services/server/config" + srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/ttrpc" ) diff --git a/services/server/server_windows.go b/services/server/server_windows.go index 4d7c06024f12..1a05c352ce9f 100644 --- a/services/server/server_windows.go +++ b/services/server/server_windows.go @@ -19,7 +19,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/services/server/config" + srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/ttrpc" ) diff --git a/services/snapshots/service.go b/services/snapshots/service.go index 0a1c46903020..fe44428ba2fe 100644 --- a/services/snapshots/service.go +++ b/services/snapshots/service.go @@ -20,15 +20,15 @@ import ( "context" "errors" - snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" - "github.com/containerd/containerd/snapshots" + snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "google.golang.org/grpc" ) diff --git a/services/snapshots/snapshotters.go b/services/snapshots/snapshotters.go index d7af9149db3a..fad274fb2289 100644 --- a/services/snapshots/snapshotters.go +++ b/services/snapshots/snapshotters.go @@ -17,11 +17,11 @@ package snapshots import ( - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/services" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/services" ) func init() { diff --git a/services/streaming/service.go b/services/streaming/service.go index f19e7fb16269..d72aec34271b 100644 --- a/services/streaming/service.go +++ b/services/streaming/service.go @@ -20,14 +20,14 @@ import ( "errors" "io" - api "github.com/containerd/containerd/api/services/streaming/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/streaming" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - ptypes "github.com/containerd/containerd/protobuf/types" + api "github.com/containerd/containerd/v2/api/services/streaming/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/streaming" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "google.golang.org/grpc" diff --git a/services/tasks/local.go b/services/tasks/local.go index be6cd298ce29..cf7d9cb609ae 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -26,30 +26,30 @@ import ( "path/filepath" "time" - api "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/archive" - "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/events" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/metadata" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/blockio" - "github.com/containerd/containerd/pkg/rdt" - "github.com/containerd/containerd/pkg/timeout" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - "github.com/containerd/containerd/protobuf/proto" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/runtime" - "github.com/containerd/containerd/runtime/v2/runc/options" - "github.com/containerd/containerd/services" + api "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/api/types/task" + "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/blockio" + "github.com/containerd/containerd/v2/pkg/rdt" + "github.com/containerd/containerd/v2/pkg/timeout" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/protobuf/proto" + ptypes "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/containerd/v2/services" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/opencontainers/go-digest" diff --git a/services/tasks/local_darwin.go b/services/tasks/local_darwin.go index 1d0d4394089d..6061a9aca337 100644 --- a/services/tasks/local_darwin.go +++ b/services/tasks/local_darwin.go @@ -19,8 +19,8 @@ package tasks import ( - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugins" ) var tasksServiceRequires = []plugin.Type{ diff --git a/services/tasks/local_freebsd.go b/services/tasks/local_freebsd.go index 4221a1109641..bfd40ee69948 100644 --- a/services/tasks/local_freebsd.go +++ b/services/tasks/local_freebsd.go @@ -17,8 +17,8 @@ package tasks import ( - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugins" ) var tasksServiceRequires = []plugin.Type{ diff --git a/services/tasks/local_unix.go b/services/tasks/local_unix.go index ddff2ebb5c28..720a4eace083 100644 --- a/services/tasks/local_unix.go +++ b/services/tasks/local_unix.go @@ -19,8 +19,8 @@ package tasks import ( - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugins" ) var tasksServiceRequires = []plugin.Type{ diff --git a/services/tasks/local_windows.go b/services/tasks/local_windows.go index 4221a1109641..bfd40ee69948 100644 --- a/services/tasks/local_windows.go +++ b/services/tasks/local_windows.go @@ -17,8 +17,8 @@ package tasks import ( - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugins" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugins" ) var tasksServiceRequires = []plugin.Type{ diff --git a/services/tasks/service.go b/services/tasks/service.go index e141a7108f71..d0a0149925d0 100644 --- a/services/tasks/service.go +++ b/services/tasks/service.go @@ -20,12 +20,12 @@ import ( "context" "errors" - api "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/services" + api "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/services" "google.golang.org/grpc" ) diff --git a/services/transfer/service.go b/services/transfer/service.go index c03aa0a332af..28ff0388a104 100644 --- a/services/transfer/service.go +++ b/services/transfer/service.go @@ -19,16 +19,16 @@ package transfer import ( "context" - transferapi "github.com/containerd/containerd/api/services/transfer/v1" - transferTypes "github.com/containerd/containerd/api/types/transfer" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/streaming" - "github.com/containerd/containerd/pkg/transfer" - tplugins "github.com/containerd/containerd/pkg/transfer/plugins" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" + transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1" + transferTypes "github.com/containerd/containerd/v2/api/types/transfer" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/streaming" + "github.com/containerd/containerd/v2/pkg/transfer" + tplugins "github.com/containerd/containerd/v2/pkg/transfer/plugins" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "google.golang.org/grpc" diff --git a/services/version/service.go b/services/version/service.go index 269627f606bb..38453653c367 100644 --- a/services/version/service.go +++ b/services/version/service.go @@ -19,12 +19,12 @@ package version import ( "context" - api "github.com/containerd/containerd/api/services/version/v1" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - ptypes "github.com/containerd/containerd/protobuf/types" - ctrdversion "github.com/containerd/containerd/version" + api "github.com/containerd/containerd/v2/api/services/version/v1" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + ptypes "github.com/containerd/containerd/v2/protobuf/types" + ctrdversion "github.com/containerd/containerd/v2/version" "google.golang.org/grpc" ) diff --git a/services/warning/service.go b/services/warning/service.go index f5bb1949899f..eeb9398f2ba1 100644 --- a/services/warning/service.go +++ b/services/warning/service.go @@ -23,10 +23,10 @@ import ( "github.com/containerd/log" - deprecation "github.com/containerd/containerd/pkg/deprecation" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" + deprecation "github.com/containerd/containerd/v2/pkg/deprecation" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" ) type Service interface { diff --git a/signals.go b/signals.go index e21df0a11e4a..1ac58f5a74b1 100644 --- a/signals.go +++ b/signals.go @@ -22,8 +22,8 @@ import ( "fmt" "syscall" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/images" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/images" "github.com/moby/sys/signal" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go index f056309cf71d..8a27f4c2203f 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/snapshots/benchsuite/benchmark_test.go @@ -32,11 +32,11 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/stretchr/testify/assert" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/devmapper" - "github.com/containerd/containerd/snapshots/native" - "github.com/containerd/containerd/snapshots/overlay" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/devmapper" + "github.com/containerd/containerd/v2/snapshots/native" + "github.com/containerd/containerd/v2/snapshots/overlay" "github.com/containerd/log" ) diff --git a/snapshots/blockfile/blockfile.go b/snapshots/blockfile/blockfile.go index 11fefa9303b1..4673217dab7f 100644 --- a/snapshots/blockfile/blockfile.go +++ b/snapshots/blockfile/blockfile.go @@ -24,10 +24,10 @@ import ( "path/filepath" "runtime" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" ) diff --git a/snapshots/blockfile/blockfile_loopsetup_test.go b/snapshots/blockfile/blockfile_loopsetup_test.go index 7c1784d9b7e8..d0352727fb3a 100644 --- a/snapshots/blockfile/blockfile_loopsetup_test.go +++ b/snapshots/blockfile/blockfile_loopsetup_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/v2/mount" ) func setupSnapshotter(t *testing.T) ([]Opt, error) { diff --git a/snapshots/blockfile/blockfile_test.go b/snapshots/blockfile/blockfile_test.go index 7cf0c9c493b1..e77889d84408 100644 --- a/snapshots/blockfile/blockfile_test.go +++ b/snapshots/blockfile/blockfile_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/testsuite" ) func newSnapshotter(t *testing.T) func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { diff --git a/snapshots/blockfile/plugin/plugin.go b/snapshots/blockfile/plugin/plugin.go index 0defcec197af..42b7ad2e5c42 100644 --- a/snapshots/blockfile/plugin/plugin.go +++ b/snapshots/blockfile/plugin/plugin.go @@ -19,11 +19,11 @@ package plugin import ( "errors" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/snapshots/blockfile" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/snapshots/blockfile" ) // Config represents configuration for the native plugin. diff --git a/snapshots/btrfs/btrfs.go b/snapshots/btrfs/btrfs.go index ce558c5f476a..f0ac4ac5342f 100644 --- a/snapshots/btrfs/btrfs.go +++ b/snapshots/btrfs/btrfs.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/btrfs/v2" "github.com/containerd/continuity/fs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/log" ) diff --git a/snapshots/btrfs/btrfs_test.go b/snapshots/btrfs/btrfs_test.go index 02eb93d3782f..55f8941f5871 100644 --- a/snapshots/btrfs/btrfs_test.go +++ b/snapshots/btrfs/btrfs_test.go @@ -29,11 +29,11 @@ import ( "testing" "time" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/containerd/continuity/testutil/loopback" exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" diff --git a/snapshots/btrfs/plugin/plugin.go b/snapshots/btrfs/plugin/plugin.go index e4801059897b..ef9bd4b2cdc0 100644 --- a/snapshots/btrfs/plugin/plugin.go +++ b/snapshots/btrfs/plugin/plugin.go @@ -23,11 +23,11 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/snapshots/btrfs" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/snapshots/btrfs" ) // Config represents configuration for the btrfs plugin. diff --git a/snapshots/devmapper/dmsetup/dmsetup.go b/snapshots/devmapper/dmsetup/dmsetup.go index 8d1c145c03b8..3e0fbafa853d 100644 --- a/snapshots/devmapper/dmsetup/dmsetup.go +++ b/snapshots/devmapper/dmsetup/dmsetup.go @@ -28,7 +28,7 @@ import ( "strconv" "strings" - blkdiscard "github.com/containerd/containerd/snapshots/devmapper/blkdiscard" + blkdiscard "github.com/containerd/containerd/v2/snapshots/devmapper/blkdiscard" exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/snapshots/devmapper/dmsetup/dmsetup_test.go b/snapshots/devmapper/dmsetup/dmsetup_test.go index eaf4ff33626b..36b9c48373f6 100644 --- a/snapshots/devmapper/dmsetup/dmsetup_test.go +++ b/snapshots/devmapper/dmsetup/dmsetup_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/testutil" "github.com/docker/go-units" "github.com/stretchr/testify/assert" "golang.org/x/sys/unix" diff --git a/snapshots/devmapper/metadata.go b/snapshots/devmapper/metadata.go index 9f5a1cd0d2a2..d1935508a89e 100644 --- a/snapshots/devmapper/metadata.go +++ b/snapshots/devmapper/metadata.go @@ -25,7 +25,7 @@ import ( "fmt" "strconv" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/devmapper/plugin/plugin.go b/snapshots/devmapper/plugin/plugin.go index 47c375bf9267..e1c0d8a0ad8f 100644 --- a/snapshots/devmapper/plugin/plugin.go +++ b/snapshots/devmapper/plugin/plugin.go @@ -22,11 +22,11 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/snapshots/devmapper" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/snapshots/devmapper" ) func init() { diff --git a/snapshots/devmapper/pool_device.go b/snapshots/devmapper/pool_device.go index d921fb884c7b..f0cb5e00690d 100644 --- a/snapshots/devmapper/pool_device.go +++ b/snapshots/devmapper/pool_device.go @@ -28,8 +28,8 @@ import ( "golang.org/x/sys/unix" - blkdiscard "github.com/containerd/containerd/snapshots/devmapper/blkdiscard" - "github.com/containerd/containerd/snapshots/devmapper/dmsetup" + blkdiscard "github.com/containerd/containerd/v2/snapshots/devmapper/blkdiscard" + "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" "github.com/containerd/log" ) diff --git a/snapshots/devmapper/pool_device_test.go b/snapshots/devmapper/pool_device_test.go index dc6b89ae287b..fb889c4ab327 100644 --- a/snapshots/devmapper/pool_device_test.go +++ b/snapshots/devmapper/pool_device_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/snapshots/devmapper/dmsetup" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" "github.com/containerd/log" "github.com/docker/go-units" "github.com/stretchr/testify/assert" diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go index 1bc137d22961..93b15717e3ed 100644 --- a/snapshots/devmapper/snapshotter.go +++ b/snapshots/devmapper/snapshotter.go @@ -27,11 +27,11 @@ import ( "strings" "sync" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/devmapper/dmsetup" - "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" + "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/log" exec "golang.org/x/sys/execabs" ) diff --git a/snapshots/devmapper/snapshotter_test.go b/snapshots/devmapper/snapshotter_test.go index f0964eab3f52..1ca46fe5b901 100644 --- a/snapshots/devmapper/snapshotter_test.go +++ b/snapshots/devmapper/snapshotter_test.go @@ -29,12 +29,12 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/stretchr/testify/assert" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/devmapper/dmsetup" - "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" + "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/containerd/log" ) diff --git a/snapshots/lcow/lcow.go b/snapshots/lcow/lcow.go index 3f398223e05e..c238145d8006 100644 --- a/snapshots/lcow/lcow.go +++ b/snapshots/lcow/lcow.go @@ -34,13 +34,13 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim/pkg/go-runhcs" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/snapshots/native/native.go b/snapshots/native/native.go index 5277b8179cd0..8ac12ae01a2f 100644 --- a/snapshots/native/native.go +++ b/snapshots/native/native.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/log" "github.com/containerd/continuity/fs" diff --git a/snapshots/native/native_test.go b/snapshots/native/native_test.go index 4f48e6a76963..815ad09fe125 100644 --- a/snapshots/native/native_test.go +++ b/snapshots/native/native_test.go @@ -21,9 +21,9 @@ import ( "runtime" "testing" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/containerd/v2/pkg/testutil" + "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) { diff --git a/snapshots/native/plugin/plugin.go b/snapshots/native/plugin/plugin.go index d79846547b7b..447d391b4f23 100644 --- a/snapshots/native/plugin/plugin.go +++ b/snapshots/native/plugin/plugin.go @@ -19,11 +19,11 @@ package plugin import ( "errors" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/snapshots/native" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/snapshots/native" ) // Config represents configuration for the native plugin. diff --git a/snapshots/overlay/overlay.go b/snapshots/overlay/overlay.go index 319aa6c793b8..a68f45d9c044 100644 --- a/snapshots/overlay/overlay.go +++ b/snapshots/overlay/overlay.go @@ -26,10 +26,10 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/overlay/overlayutils" - "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" ) diff --git a/snapshots/overlay/overlay_test.go b/snapshots/overlay/overlay_test.go index 36eeef951a2d..a336c8f15b62 100644 --- a/snapshots/overlay/overlay_test.go +++ b/snapshots/overlay/overlay_test.go @@ -26,13 +26,13 @@ import ( "syscall" "testing" - "github.com/containerd/containerd" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/overlay/overlayutils" - "github.com/containerd/containerd/snapshots/storage" - "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/containerd/v2" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/snapshots/storage" + "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/snapshots/overlay/overlayutils/check.go b/snapshots/overlay/overlayutils/check.go index 678a7e1cb4f5..ca21e61d87db 100644 --- a/snapshots/overlay/overlayutils/check.go +++ b/snapshots/overlay/overlayutils/check.go @@ -26,9 +26,9 @@ import ( "golang.org/x/sys/unix" - kernel "github.com/containerd/containerd/contrib/seccomp/kernelversion" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/userns" + kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/continuity/fs" "github.com/containerd/log" ) diff --git a/snapshots/overlay/overlayutils/check_test.go b/snapshots/overlay/overlayutils/check_test.go index 7dba370f8e80..055e40321eb3 100644 --- a/snapshots/overlay/overlayutils/check_test.go +++ b/snapshots/overlay/overlayutils/check_test.go @@ -21,7 +21,7 @@ package overlayutils import ( "testing" - "github.com/containerd/containerd/pkg/testutil" + "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/testutil/loopback" exec "golang.org/x/sys/execabs" ) diff --git a/snapshots/overlay/plugin/plugin.go b/snapshots/overlay/plugin/plugin.go index be3cdeb7568b..3e61965b4364 100644 --- a/snapshots/overlay/plugin/plugin.go +++ b/snapshots/overlay/plugin/plugin.go @@ -21,12 +21,12 @@ package overlay import ( "errors" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/snapshots/overlay" - "github.com/containerd/containerd/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/snapshots/overlay" + "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" ) const ( diff --git a/snapshots/proxy/proxy.go b/snapshots/proxy/proxy.go index 215a7f311bcd..12548da1a397 100644 --- a/snapshots/proxy/proxy.go +++ b/snapshots/proxy/proxy.go @@ -20,11 +20,11 @@ import ( "context" "io" - snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - protobuftypes "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/snapshots" + snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + protobuftypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/snapshots" ) // NewSnapshotter returns a new Snapshotter which communicates over a GRPC diff --git a/snapshots/snapshotter.go b/snapshots/snapshotter.go index a35cd48839d5..81bcddfc453c 100644 --- a/snapshots/snapshotter.go +++ b/snapshots/snapshotter.go @@ -22,9 +22,9 @@ import ( "strings" "time" - snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/protobuf" + snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/protobuf" ) const ( diff --git a/snapshots/storage/bolt.go b/snapshots/storage/bolt.go index 095a741bda8e..942d48451d79 100644 --- a/snapshots/storage/bolt.go +++ b/snapshots/storage/bolt.go @@ -25,10 +25,10 @@ import ( "strings" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/filters" - "github.com/containerd/containerd/metadata/boltutil" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/metadata/boltutil" + "github.com/containerd/containerd/v2/snapshots" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/storage/bolt_test.go b/snapshots/storage/bolt_test.go index 838f7aa9faff..afef0f14a210 100644 --- a/snapshots/storage/bolt_test.go +++ b/snapshots/storage/bolt_test.go @@ -22,7 +22,7 @@ import ( // Does not require root but flag must be defined for snapshot tests - _ "github.com/containerd/containerd/pkg/testutil" + _ "github.com/containerd/containerd/v2/pkg/testutil" ) func TestMetastore(t *testing.T) { diff --git a/snapshots/storage/metastore.go b/snapshots/storage/metastore.go index 2f7beac1be1c..f2a7b6599318 100644 --- a/snapshots/storage/metastore.go +++ b/snapshots/storage/metastore.go @@ -27,7 +27,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/storage/metastore_bench_test.go b/snapshots/storage/metastore_bench_test.go index 8f360c1f863f..ea5c85605fdf 100644 --- a/snapshots/storage/metastore_bench_test.go +++ b/snapshots/storage/metastore_bench_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/snapshots" ) // Benchmarks returns a benchmark suite using the provided metadata store diff --git a/snapshots/storage/metastore_test.go b/snapshots/storage/metastore_test.go index 16847068d1b0..0a34eda6d53c 100644 --- a/snapshots/storage/metastore_test.go +++ b/snapshots/storage/metastore_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/snapshots" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/snapshots/testsuite/helpers.go b/snapshots/testsuite/helpers.go index 8032418fc7aa..51056ef20a08 100644 --- a/snapshots/testsuite/helpers.go +++ b/snapshots/testsuite/helpers.go @@ -21,9 +21,9 @@ import ( "fmt" "os" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/pkg/randutil" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/pkg/randutil" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/continuity/fs/fstest" ) diff --git a/snapshots/testsuite/issues.go b/snapshots/testsuite/issues.go index 1081763183af..c3667c316f7c 100644 --- a/snapshots/testsuite/issues.go +++ b/snapshots/testsuite/issues.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/continuity/fs/fstest" ) diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go index 2184cbf40ba5..cb6b4f690433 100644 --- a/snapshots/testsuite/testsuite.go +++ b/snapshots/testsuite/testsuite.go @@ -28,12 +28,12 @@ import ( "testing" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/namespaces" - "github.com/containerd/containerd/pkg/randutil" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/randutil" + "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/continuity/fs/fstest" "github.com/containerd/log/logtest" "github.com/stretchr/testify/assert" diff --git a/snapshots/windows/windows.go b/snapshots/windows/windows.go index 5a9adf10be19..586fd2f84e8c 100644 --- a/snapshots/windows/windows.go +++ b/snapshots/windows/windows.go @@ -34,14 +34,14 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/pkg/ociwclayer" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/platforms" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/storage" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/snapshots/windows/windows_test.go b/snapshots/windows/windows_test.go index d8d9eca829d2..fb22d2a3a0e2 100644 --- a/snapshots/windows/windows_test.go +++ b/snapshots/windows/windows_test.go @@ -23,9 +23,9 @@ import ( "context" "testing" - "github.com/containerd/containerd/pkg/testutil" - "github.com/containerd/containerd/snapshots" - "github.com/containerd/containerd/snapshots/testsuite" + "github.com/containerd/containerd/v2/pkg/testutil" + "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) { diff --git a/snapshotter_opts_unix.go b/snapshotter_opts_unix.go index ac970219e973..ca304c1979cd 100644 --- a/snapshotter_opts_unix.go +++ b/snapshotter_opts_unix.go @@ -22,7 +22,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/snapshots" ) const ( diff --git a/snapshotter_opts_windows.go b/snapshotter_opts_windows.go index 540bcb3130ab..87f0c29dee6f 100644 --- a/snapshotter_opts_windows.go +++ b/snapshotter_opts_windows.go @@ -19,7 +19,7 @@ package containerd import ( "context" - "github.com/containerd/containerd/snapshots" + "github.com/containerd/containerd/v2/snapshots" ) func resolveSnapshotOptions(ctx context.Context, client *Client, snapshotterName string, snapshotter snapshots.Snapshotter, parent string, opts ...snapshots.Opt) (string, error) { diff --git a/sys/oom_linux.go b/sys/oom_linux.go index bb2a3eafb4f9..f439a70c13aa 100644 --- a/sys/oom_linux.go +++ b/sys/oom_linux.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/containerd/v2/pkg/userns" "golang.org/x/sys/unix" ) diff --git a/sys/oom_linux_test.go b/sys/oom_linux_test.go index 52e7c18fadaa..2d32c81b6e57 100644 --- a/sys/oom_linux_test.go +++ b/sys/oom_linux_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/containerd/v2/pkg/userns" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" exec "golang.org/x/sys/execabs" diff --git a/task.go b/task.go index dbe61dd31b62..1ef6bdb7d53b 100644 --- a/task.go +++ b/task.go @@ -26,20 +26,20 @@ import ( "syscall" "time" - "github.com/containerd/containerd/api/services/tasks/v1" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/content" - "github.com/containerd/containerd/diff" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/protobuf" - google_protobuf "github.com/containerd/containerd/protobuf/types" - "github.com/containerd/containerd/rootfs" - "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/api/services/tasks/v1" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/protobuf" + google_protobuf "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/rootfs" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/typeurl/v2" digest "github.com/opencontainers/go-digest" is "github.com/opencontainers/image-spec/specs-go" diff --git a/task_opts.go b/task_opts.go index 9dd8fcd0226b..598edc9ad4eb 100644 --- a/task_opts.go +++ b/task_opts.go @@ -22,11 +22,11 @@ import ( "fmt" "syscall" - "github.com/containerd/containerd/api/types" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/images" - "github.com/containerd/containerd/mount" - "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/task_opts_unix.go b/task_opts_unix.go index ae8282c3a3b0..4b9ee77de510 100644 --- a/task_opts_unix.go +++ b/task_opts_unix.go @@ -22,7 +22,7 @@ import ( "context" "errors" - "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/runtime/v2/runc/options" ) // WithNoNewKeyring causes tasks not to be created with a new keyring for secret storage. diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go index 1f466a2a0bcf..33211bc02c1a 100644 --- a/tracing/plugin/otlp.go +++ b/tracing/plugin/otlp.go @@ -23,11 +23,11 @@ import ( "net/url" "time" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/plugin" - "github.com/containerd/containerd/plugin/registry" - "github.com/containerd/containerd/plugins" - "github.com/containerd/containerd/tracing" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/plugin" + "github.com/containerd/containerd/v2/plugin/registry" + "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" "github.com/sirupsen/logrus" "go.opentelemetry.io/otel" diff --git a/tracing/plugin/otlp_test.go b/tracing/plugin/otlp_test.go index 510685471b87..54fedae9aea8 100644 --- a/tracing/plugin/otlp_test.go +++ b/tracing/plugin/otlp_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/v2/errdefs" "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" ) diff --git a/transfer.go b/transfer.go index 9979aa75bd9b..a88557bbd40e 100644 --- a/transfer.go +++ b/transfer.go @@ -21,13 +21,13 @@ import ( "errors" "io" - streamingapi "github.com/containerd/containerd/api/services/streaming/v1" - transferapi "github.com/containerd/containerd/api/services/transfer/v1" - "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/pkg/streaming" - "github.com/containerd/containerd/pkg/transfer" - "github.com/containerd/containerd/pkg/transfer/proxy" - "github.com/containerd/containerd/protobuf" + streamingapi "github.com/containerd/containerd/v2/api/services/streaming/v1" + transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1" + "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/streaming" + "github.com/containerd/containerd/v2/pkg/transfer" + "github.com/containerd/containerd/v2/pkg/transfer/proxy" + "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" ) diff --git a/vendor/github.com/containerd/containerd/LICENSE b/vendor/github.com/containerd/containerd/LICENSE new file mode 100644 index 000000000000..584149b6ee28 --- /dev/null +++ b/vendor/github.com/containerd/containerd/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright The containerd Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/containerd/containerd/NOTICE b/vendor/github.com/containerd/containerd/NOTICE new file mode 100644 index 000000000000..8915f02773f5 --- /dev/null +++ b/vendor/github.com/containerd/containerd/NOTICE @@ -0,0 +1,16 @@ +Docker +Copyright 2012-2015 Docker, Inc. + +This product includes software developed at Docker, Inc. (https://www.docker.com). + +The following is courtesy of our legal counsel: + + +Use and transfer of Docker may be subject to certain restrictions by the +United States and other governments. +It is your responsibility to ensure that your use and/or transfer does not +violate applicable laws. + +For more information, please see https://www.bis.doc.gov + +See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. diff --git a/vendor/github.com/containerd/containerd/errdefs/errors.go b/vendor/github.com/containerd/containerd/errdefs/errors.go new file mode 100644 index 000000000000..876225597082 --- /dev/null +++ b/vendor/github.com/containerd/containerd/errdefs/errors.go @@ -0,0 +1,92 @@ +/* + Copyright The containerd Authors. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +// Package errdefs defines the common errors used throughout containerd +// packages. +// +// Use with fmt.Errorf to add context to an error. +// +// To detect an error class, use the IsXXX functions to tell whether an error +// is of a certain type. +// +// The functions ToGRPC and FromGRPC can be used to map server-side and +// client-side errors to the correct types. +package errdefs + +import ( + "context" + "errors" +) + +// Definitions of common error types used throughout containerd. All containerd +// errors returned by most packages will map into one of these errors classes. +// Packages should return errors of these types when they want to instruct a +// client to take a particular action. +// +// For the most part, we just try to provide local grpc errors. Most conditions +// map very well to those defined by grpc. +var ( + ErrUnknown = errors.New("unknown") // used internally to represent a missed mapping. + ErrInvalidArgument = errors.New("invalid argument") + ErrNotFound = errors.New("not found") + ErrAlreadyExists = errors.New("already exists") + ErrFailedPrecondition = errors.New("failed precondition") + ErrUnavailable = errors.New("unavailable") + ErrNotImplemented = errors.New("not implemented") // represents not supported and unimplemented +) + +// IsInvalidArgument returns true if the error is due to an invalid argument +func IsInvalidArgument(err error) bool { + return errors.Is(err, ErrInvalidArgument) +} + +// IsNotFound returns true if the error is due to a missing object +func IsNotFound(err error) bool { + return errors.Is(err, ErrNotFound) +} + +// IsAlreadyExists returns true if the error is due to an already existing +// metadata item +func IsAlreadyExists(err error) bool { + return errors.Is(err, ErrAlreadyExists) +} + +// IsFailedPrecondition returns true if an operation could not proceed to the +// lack of a particular condition +func IsFailedPrecondition(err error) bool { + return errors.Is(err, ErrFailedPrecondition) +} + +// IsUnavailable returns true if the error is due to a resource being unavailable +func IsUnavailable(err error) bool { + return errors.Is(err, ErrUnavailable) +} + +// IsNotImplemented returns true if the error is due to not being implemented +func IsNotImplemented(err error) bool { + return errors.Is(err, ErrNotImplemented) +} + +// IsCanceled returns true if the error is due to `context.Canceled`. +func IsCanceled(err error) bool { + return errors.Is(err, context.Canceled) +} + +// IsDeadlineExceeded returns true if the error is due to +// `context.DeadlineExceeded`. +func IsDeadlineExceeded(err error) bool { + return errors.Is(err, context.DeadlineExceeded) +} diff --git a/vendor/github.com/containerd/containerd/errdefs/grpc.go b/vendor/github.com/containerd/containerd/errdefs/grpc.go new file mode 100644 index 000000000000..7a9b33e05afe --- /dev/null +++ b/vendor/github.com/containerd/containerd/errdefs/grpc.go @@ -0,0 +1,147 @@ +/* + Copyright The containerd Authors. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package errdefs + +import ( + "context" + "fmt" + "strings" + + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +// ToGRPC will attempt to map the backend containerd error into a grpc error, +// using the original error message as a description. +// +// Further information may be extracted from certain errors depending on their +// type. +// +// If the error is unmapped, the original error will be returned to be handled +// by the regular grpc error handling stack. +func ToGRPC(err error) error { + if err == nil { + return nil + } + + if isGRPCError(err) { + // error has already been mapped to grpc + return err + } + + switch { + case IsInvalidArgument(err): + return status.Errorf(codes.InvalidArgument, err.Error()) + case IsNotFound(err): + return status.Errorf(codes.NotFound, err.Error()) + case IsAlreadyExists(err): + return status.Errorf(codes.AlreadyExists, err.Error()) + case IsFailedPrecondition(err): + return status.Errorf(codes.FailedPrecondition, err.Error()) + case IsUnavailable(err): + return status.Errorf(codes.Unavailable, err.Error()) + case IsNotImplemented(err): + return status.Errorf(codes.Unimplemented, err.Error()) + case IsCanceled(err): + return status.Errorf(codes.Canceled, err.Error()) + case IsDeadlineExceeded(err): + return status.Errorf(codes.DeadlineExceeded, err.Error()) + } + + return err +} + +// ToGRPCf maps the error to grpc error codes, assembling the formatting string +// and combining it with the target error string. +// +// This is equivalent to errdefs.ToGRPC(fmt.Errorf("%s: %w", fmt.Sprintf(format, args...), err)) +func ToGRPCf(err error, format string, args ...interface{}) error { + return ToGRPC(fmt.Errorf("%s: %w", fmt.Sprintf(format, args...), err)) +} + +// FromGRPC returns the underlying error from a grpc service based on the grpc error code +func FromGRPC(err error) error { + if err == nil { + return nil + } + + var cls error // divide these into error classes, becomes the cause + + switch code(err) { + case codes.InvalidArgument: + cls = ErrInvalidArgument + case codes.AlreadyExists: + cls = ErrAlreadyExists + case codes.NotFound: + cls = ErrNotFound + case codes.Unavailable: + cls = ErrUnavailable + case codes.FailedPrecondition: + cls = ErrFailedPrecondition + case codes.Unimplemented: + cls = ErrNotImplemented + case codes.Canceled: + cls = context.Canceled + case codes.DeadlineExceeded: + cls = context.DeadlineExceeded + default: + cls = ErrUnknown + } + + msg := rebaseMessage(cls, err) + if msg != "" { + err = fmt.Errorf("%s: %w", msg, cls) + } else { + err = cls + } + + return err +} + +// rebaseMessage removes the repeats for an error at the end of an error +// string. This will happen when taking an error over grpc then remapping it. +// +// Effectively, we just remove the string of cls from the end of err if it +// appears there. +func rebaseMessage(cls error, err error) string { + desc := errDesc(err) + clss := cls.Error() + if desc == clss { + return "" + } + + return strings.TrimSuffix(desc, ": "+clss) +} + +func isGRPCError(err error) bool { + _, ok := status.FromError(err) + return ok +} + +func code(err error) codes.Code { + if s, ok := status.FromError(err); ok { + return s.Code() + } + return codes.Unknown +} + +func errDesc(err error) string { + if s, ok := status.FromError(err); ok { + return s.Message() + } + return err.Error() +} diff --git a/vendor/github.com/containerd/containerd/log/context_deprecated.go b/vendor/github.com/containerd/containerd/log/context_deprecated.go new file mode 100644 index 000000000000..9e9e8b49135b --- /dev/null +++ b/vendor/github.com/containerd/containerd/log/context_deprecated.go @@ -0,0 +1,149 @@ +/* + Copyright The containerd Authors. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package log + +import ( + "context" + + "github.com/containerd/log" +) + +// G is a shorthand for [GetLogger]. +// +// Deprecated: use [log.G]. +var G = log.G + +// L is an alias for the standard logger. +// +// Deprecated: use [log.L]. +var L = log.L + +// Fields type to pass to "WithFields". +// +// Deprecated: use [log.Fields]. +type Fields = log.Fields + +// Entry is a logging entry. +// +// Deprecated: use [log.Entry]. +type Entry = log.Entry + +// RFC3339NanoFixed is [time.RFC3339Nano] with nanoseconds padded using +// zeros to ensure the formatted time is always the same number of +// characters. +// +// Deprecated: use [log.RFC3339NanoFixed]. +const RFC3339NanoFixed = log.RFC3339NanoFixed + +// Level is a logging level. +// +// Deprecated: use [log.Level]. +type Level = log.Level + +// Supported log levels. +const ( + // TraceLevel level. + // + // Deprecated: use [log.TraceLevel]. + TraceLevel Level = log.TraceLevel + + // DebugLevel level. + // + // Deprecated: use [log.DebugLevel]. + DebugLevel Level = log.DebugLevel + + // InfoLevel level. + // + // Deprecated: use [log.InfoLevel]. + InfoLevel Level = log.InfoLevel + + // WarnLevel level. + // + // Deprecated: use [log.WarnLevel]. + WarnLevel Level = log.WarnLevel + + // ErrorLevel level + // + // Deprecated: use [log.ErrorLevel]. + ErrorLevel Level = log.ErrorLevel + + // FatalLevel level. + // + // Deprecated: use [log.FatalLevel]. + FatalLevel Level = log.FatalLevel + + // PanicLevel level. + // + // Deprecated: use [log.PanicLevel]. + PanicLevel Level = log.PanicLevel +) + +// SetLevel sets log level globally. It returns an error if the given +// level is not supported. +// +// Deprecated: use [log.SetLevel]. +func SetLevel(level string) error { + return log.SetLevel(level) +} + +// GetLevel returns the current log level. +// +// Deprecated: use [log.GetLevel]. +func GetLevel() log.Level { + return log.GetLevel() +} + +// OutputFormat specifies a log output format. +// +// Deprecated: use [log.OutputFormat]. +type OutputFormat = log.OutputFormat + +// Supported log output formats. +const ( + // TextFormat represents the text logging format. + // + // Deprecated: use [log.TextFormat]. + TextFormat log.OutputFormat = "text" + + // JSONFormat represents the JSON logging format. + // + // Deprecated: use [log.JSONFormat]. + JSONFormat log.OutputFormat = "json" +) + +// SetFormat sets the log output format. +// +// Deprecated: use [log.SetFormat]. +func SetFormat(format OutputFormat) error { + return log.SetFormat(format) +} + +// WithLogger returns a new context with the provided logger. Use in +// combination with logger.WithField(s) for great effect. +// +// Deprecated: use [log.WithLogger]. +func WithLogger(ctx context.Context, logger *log.Entry) context.Context { + return log.WithLogger(ctx, logger) +} + +// GetLogger retrieves the current logger from the context. If no logger is +// available, the default logger is returned. +// +// Deprecated: use [log.GetLogger]. +func GetLogger(ctx context.Context) *log.Entry { + return log.GetLogger(ctx) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index c9d29ba96602..62469ac33bc3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -102,6 +102,10 @@ github.com/containerd/cgroups/v3/cgroup2/stats # github.com/containerd/console v1.0.3 ## explicit; go 1.13 github.com/containerd/console +# github.com/containerd/containerd v1.7.8 +## explicit; go 1.19 +github.com/containerd/containerd/errdefs +github.com/containerd/containerd/log # github.com/containerd/continuity v0.4.2 ## explicit; go 1.19 github.com/containerd/continuity diff --git a/version/version.go b/version/version.go index c9f9dd55ece0..85f13141dd4f 100644 --- a/version/version.go +++ b/version/version.go @@ -20,7 +20,7 @@ import "runtime" var ( // Package is filled at linking time - Package = "github.com/containerd/containerd" + Package = "github.com/containerd/containerd/v2" // Version holds the complete version number. Filled in at linking time. Version = "1.7.0+unknown"