From e79ec7a095b8131f92e86efadd7254d20a88f9eb Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Fri, 19 Jan 2024 22:56:11 -0800 Subject: [PATCH] Remove deprecated platforms package Signed-off-by: Derek McGowan --- client/client.go | 2 +- client/client_opts.go | 2 +- client/container_checkpoint_opts.go | 2 +- client/image.go | 2 +- client/import.go | 2 +- client/pull.go | 2 +- cmd/containerd/server/server.go | 2 +- cmd/ctr/commands/content/fetch.go | 2 +- cmd/ctr/commands/images/convert.go | 2 +- cmd/ctr/commands/images/export.go | 2 +- cmd/ctr/commands/images/images.go | 2 +- cmd/ctr/commands/images/import.go | 2 +- cmd/ctr/commands/images/mount.go | 2 +- cmd/ctr/commands/images/pull.go | 2 +- cmd/ctr/commands/images/push.go | 2 +- cmd/ctr/commands/oci/oci.go | 2 +- cmd/ctr/commands/plugins/plugins.go | 2 +- cmd/ctr/commands/run/run_unix.go | 2 +- contrib/fuzz/fuzz_images.go | 2 +- core/images/archive/exporter.go | 2 +- core/images/archive/importer.go | 2 +- core/images/converter/converter.go | 2 +- core/images/converter/default.go | 2 +- core/images/handlers.go | 2 +- core/images/image.go | 2 +- core/images/usage/calculator.go | 2 +- core/images/usage/calculator_test.go | 2 +- core/metrics/cgroups/cgroups.go | 2 +- core/remotes/handlers.go | 2 +- core/runtime/v2/manager.go | 2 +- core/runtime/v2/manager_unix.go | 2 +- core/runtime/v2/manager_windows.go | 2 +- core/sandbox/controller.go | 2 +- core/sandbox/proxy/controller.go | 2 +- .../build_local_containerd_helper_test.go | 2 +- integration/client/client_test.go | 2 +- integration/client/client_unix_test.go | 2 +- integration/client/container_test.go | 2 +- integration/client/convert_test.go | 2 +- integration/client/export_test.go | 2 +- integration/client/image_test.go | 2 +- integration/client/import_test.go | 2 +- pkg/cri/cri.go | 2 +- pkg/cri/server/base/cri_base.go | 2 +- pkg/cri/server/container_create.go | 2 +- pkg/cri/server/container_create_linux_test.go | 2 +- pkg/cri/server/container_create_test.go | 2 +- pkg/cri/server/images/check.go | 2 +- pkg/cri/server/images/image_pull_test.go | 2 +- pkg/cri/server/images/service.go | 2 +- pkg/cri/server/images/service_test.go | 2 +- pkg/cri/server/podsandbox/controller.go | 2 +- pkg/cri/server/service_test.go | 2 +- pkg/cri/store/image/fake_image.go | 2 +- pkg/cri/store/image/image.go | 2 +- pkg/oci/spec.go | 2 +- pkg/oci/spec_opts.go | 2 +- pkg/transfer/archive/exporter.go | 2 +- pkg/transfer/image/imagestore.go | 2 +- pkg/transfer/local/pull_test.go | 2 +- pkg/transfer/local/push.go | 2 +- pkg/unpack/unpacker.go | 2 +- platforms/compare.go | 63 ------- platforms/defaults.go | 42 ----- platforms/platforms.go | 173 ------------------ plugins/cri/images/plugin.go | 2 +- plugins/diff/walking/plugin/plugin.go | 2 +- plugins/diff/windows/cimfs.go | 2 +- plugins/diff/windows/windows.go | 2 +- plugins/sandbox/controller.go | 2 +- plugins/snapshots/blockfile/plugin/plugin.go | 2 +- plugins/snapshots/btrfs/plugin/plugin.go | 2 +- plugins/snapshots/devmapper/plugin/plugin.go | 2 +- plugins/snapshots/native/plugin/plugin.go | 2 +- plugins/snapshots/overlay/plugin/plugin.go | 2 +- plugins/snapshots/windows/cimfs.go | 2 +- plugins/snapshots/windows/windows.go | 2 +- plugins/transfer/plugin.go | 2 +- 78 files changed, 75 insertions(+), 353 deletions(-) delete mode 100644 platforms/compare.go delete mode 100644 platforms/defaults.go delete mode 100644 platforms/platforms.go diff --git a/client/client.go b/client/client.go index a88a5f97a..173d5d207 100644 --- a/client/client.go +++ b/client/client.go @@ -56,10 +56,10 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/introspection" ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/platforms" "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/client_opts.go b/client/client_opts.go index e3b262c68..54b37d4ca 100644 --- a/client/client_opts.go +++ b/client/client_opts.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/grpc" diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index d04c365ab..9be0b45e4 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/rootfs" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/platforms" "github.com/opencontainers/go-digest" imagespec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/client/image.go b/client/image.go index 9974dfb1d..f0eef70ac 100644 --- a/client/image.go +++ b/client/image.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/rootfs" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/import.go b/client/import.go index bc67d591d..847d27c40 100644 --- a/client/import.go +++ b/client/import.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/client/pull.go b/client/pull.go index fd4c8bce6..9b8178694 100644 --- a/client/pull.go +++ b/client/pull.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/pkg/unpack" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) const ( diff --git a/cmd/containerd/server/server.go b/cmd/containerd/server/server.go index 92d7a1f36..c3721f9b3 100644 --- a/cmd/containerd/server/server.go +++ b/cmd/containerd/server/server.go @@ -61,10 +61,10 @@ import ( "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/containerd/v2/pkg/timeout" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/services/warning" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/dynamic" "github.com/containerd/plugin/registry" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index 3c295fe72..da6c70f5a 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/progress" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/images/convert.go b/cmd/ctr/commands/images/convert.go index 5e91e0dfe..29cb00dbf 100644 --- a/cmd/ctr/commands/images/convert.go +++ b/cmd/ctr/commands/images/convert.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/images/converter" "github.com/containerd/containerd/v2/core/images/converter/uncompress" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/export.go b/cmd/ctr/commands/images/export.go index 0f23f911e..a5a35b381 100644 --- a/cmd/ctr/commands/images/export.go +++ b/cmd/ctr/commands/images/export.go @@ -29,7 +29,7 @@ import ( "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/platforms" ) var exportCommand = cli.Command{ diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go index 28dda807f..a58b4f028 100644 --- a/cmd/ctr/commands/images/images.go +++ b/cmd/ctr/commands/images/images.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/progress" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/import.go b/cmd/ctr/commands/images/import.go index 21971797a..32cd72b84 100644 --- a/cmd/ctr/commands/images/import.go +++ b/cmd/ctr/commands/images/import.go @@ -31,8 +31,8 @@ import ( "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" + "github.com/containerd/platforms" ) var importCommand = cli.Command{ diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index 3ad277bc6..32be49cb6 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/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 489f8172d..83ff19604 100644 --- a/cmd/ctr/commands/images/pull.go +++ b/cmd/ctr/commands/images/pull.go @@ -32,8 +32,8 @@ import ( "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/containerd/platforms" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/images/push.go b/cmd/ctr/commands/images/push.go index 9b0e55731..62d4aa2d8 100644 --- a/cmd/ctr/commands/images/push.go +++ b/cmd/ctr/commands/images/push.go @@ -36,8 +36,8 @@ import ( "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/containerd/platforms" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/oci/oci.go b/cmd/ctr/commands/oci/oci.go index 8d8368579..fce3756e2 100644 --- a/cmd/ctr/commands/oci/oci.go +++ b/cmd/ctr/commands/oci/oci.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/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 770251896..ec60a8244 100644 --- a/cmd/ctr/commands/plugins/plugins.go +++ b/cmd/ctr/commands/plugins/plugins.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" pluginutils "github.com/containerd/plugin" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index bd10b693e..87118a2a0 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -40,8 +40,8 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/oci" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/intel/goresctrl/pkg/blockio" "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" diff --git a/contrib/fuzz/fuzz_images.go b/contrib/fuzz/fuzz_images.go index 1032266f9..9418c72ca 100644 --- a/contrib/fuzz/fuzz_images.go +++ b/contrib/fuzz/fuzz_images.go @@ -21,8 +21,8 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins/content/local" + "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/archive/exporter.go b/core/images/archive/exporter.go index 2034009c5..bd136a4b8 100644 --- a/core/images/archive/exporter.go +++ b/core/images/archive/exporter.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/labels" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/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/core/images/archive/importer.go b/core/images/archive/importer.go index f5c804128..314c22ab8 100644 --- a/core/images/archive/importer.go +++ b/core/images/archive/importer.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/labels" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" 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/core/images/converter/converter.go b/core/images/converter/converter.go index e88d702ec..20308cb55 100644 --- a/core/images/converter/converter.go +++ b/core/images/converter/converter.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) type convertOpts struct { diff --git a/core/images/converter/default.go b/core/images/converter/default.go index 538055d95..98f796536 100644 --- a/core/images/converter/default.go +++ b/core/images/converter/default.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" diff --git a/core/images/handlers.go b/core/images/handlers.go index 0a4397583..407030ab3 100644 --- a/core/images/handlers.go +++ b/core/images/handlers.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/core/images/image.go b/core/images/image.go index 90b1669a1..16bc9f74e 100644 --- a/core/images/image.go +++ b/core/images/image.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/usage/calculator.go b/core/images/usage/calculator.go index 0090d3806..738a459b8 100644 --- a/core/images/usage/calculator.go +++ b/core/images/usage/calculator.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" diff --git a/core/images/usage/calculator_test.go b/core/images/usage/calculator_test.go index bbbde885f..84ed167e4 100644 --- a/core/images/usage/calculator_test.go +++ b/core/images/usage/calculator_test.go @@ -22,8 +22,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/imagetest" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log/logtest" + "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/metrics/cgroups/cgroups.go b/core/metrics/cgroups/cgroups.go index 7fcbc448f..604977cf0 100644 --- a/core/metrics/cgroups/cgroups.go +++ b/core/metrics/cgroups/cgroups.go @@ -24,8 +24,8 @@ import ( v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" "github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/pkg/events" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" metrics "github.com/docker/go-metrics" diff --git a/core/remotes/handlers.go b/core/remotes/handlers.go index 3afa22daa..8e9cbebcc 100644 --- a/core/remotes/handlers.go +++ b/core/remotes/handlers.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/labels" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" ) diff --git a/core/runtime/v2/manager.go b/core/runtime/v2/manager.go index a14a980b5..c5cc52f15 100644 --- a/core/runtime/v2/manager.go +++ b/core/runtime/v2/manager.go @@ -36,10 +36,10 @@ import ( "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/core/runtime/v2/manager_unix.go b/core/runtime/v2/manager_unix.go index d4c147dc4..be6ce6e11 100644 --- a/core/runtime/v2/manager_unix.go +++ b/core/runtime/v2/manager_unix.go @@ -19,7 +19,7 @@ package v2 import ( - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) func defaultPlatforms() []string { diff --git a/core/runtime/v2/manager_windows.go b/core/runtime/v2/manager_windows.go index 544e0afa9..b1bfbaa48 100644 --- a/core/runtime/v2/manager_windows.go +++ b/core/runtime/v2/manager_windows.go @@ -17,7 +17,7 @@ package v2 import ( - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) func defaultPlatforms() []string { diff --git a/core/sandbox/controller.go b/core/sandbox/controller.go index b55f9b2fd..d30bb9f71 100644 --- a/core/sandbox/controller.go +++ b/core/sandbox/controller.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" "github.com/containerd/typeurl/v2" ) diff --git a/core/sandbox/proxy/controller.go b/core/sandbox/proxy/controller.go index 9b06be186..6992c4531 100644 --- a/core/sandbox/proxy/controller.go +++ b/core/sandbox/proxy/controller.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index f8355def1..f9577485e 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -28,9 +28,9 @@ import ( srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/pkg/cri/constants" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log/logtest" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/opencontainers/go-digest" diff --git a/integration/client/client_test.go b/integration/client/client_test.go index 5b29a0a3e..d3b2bf374 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -40,8 +40,8 @@ import ( "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" ) var ( diff --git a/integration/client/client_unix_test.go b/integration/client/client_unix_test.go index ef7a9afac..59bea46a2 100644 --- a/integration/client/client_unix_test.go +++ b/integration/client/client_unix_test.go @@ -23,7 +23,7 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/integration/images" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) var ( diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 939215d85..e5f554519 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -41,12 +41,12 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" gogotypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/continuity/fs" "github.com/containerd/go-runc" "github.com/containerd/log/logtest" + "github.com/containerd/platforms" "github.com/containerd/typeurl/v2" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/require" diff --git a/integration/client/convert_test.go b/integration/client/convert_test.go index 4f5f19c80..85f0f0c41 100644 --- a/integration/client/convert_test.go +++ b/integration/client/convert_test.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/converter" "github.com/containerd/containerd/v2/core/images/converter/uncompress" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" ) diff --git a/integration/client/export_test.go b/integration/client/export_test.go index c1c9e3346..bf727f308 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" "github.com/google/uuid" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/integration/client/image_test.go b/integration/client/image_test.go index 105e41288..3d907e0bb 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -29,7 +29,7 @@ import ( imagelist "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/labels" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/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 4c7a03bb9..ced7ea1f6 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -44,7 +44,7 @@ import ( "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/platforms" "github.com/google/uuid" digest "github.com/opencontainers/go-digest" diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go index 176045715..3488b9915 100644 --- a/pkg/cri/cri.go +++ b/pkg/cri/cri.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/pkg/cri/server" "github.com/containerd/containerd/v2/pkg/cri/server/base" nriservice "github.com/containerd/containerd/v2/pkg/nri" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/platforms" "google.golang.org/grpc" diff --git a/pkg/cri/server/base/cri_base.go b/pkg/cri/server/base/cri_base.go index a719e21e4..77ba76635 100644 --- a/pkg/cri/server/base/cri_base.go +++ b/pkg/cri/server/base/cri_base.go @@ -34,9 +34,9 @@ import ( criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/warning" + "github.com/containerd/platforms" ) // CRIBase contains common dependencies for CRI's runtime, image, and podsandbox services. diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go index 510e8d0e8..272096aaf 100644 --- a/pkg/cri/server/container_create.go +++ b/pkg/cri/server/container_create.go @@ -45,7 +45,7 @@ import ( containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) func init() { diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index b0f9576af..6bb4d63a3 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" diff --git a/pkg/cri/server/container_create_test.go b/pkg/cri/server/container_create_test.go index 2279f047f..f0f93fcbb 100644 --- a/pkg/cri/server/container_create_test.go +++ b/pkg/cri/server/container_create_test.go @@ -25,7 +25,7 @@ import ( "testing" ostesting "github.com/containerd/containerd/v2/pkg/os/testing" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/images/check.go b/pkg/cri/server/images/check.go index bd3430084..89610df95 100644 --- a/pkg/cri/server/images/check.go +++ b/pkg/cri/server/images/check.go @@ -22,8 +22,8 @@ import ( "sync" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" ) // LoadImages checks all existing images to ensure they are ready to diff --git a/pkg/cri/server/images/image_pull_test.go b/pkg/cri/server/images/image_pull_test.go index 8ffece4e5..a3994e689 100644 --- a/pkg/cri/server/images/image_pull_test.go +++ b/pkg/cri/server/images/image_pull_test.go @@ -29,7 +29,7 @@ import ( "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" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) func TestParseAuth(t *testing.T) { diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index 8c2f8a35d..a73f988b1 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -29,8 +29,8 @@ import ( 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/pkg/events" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" 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 1c49e771f..177992051 100644 --- a/pkg/cri/server/images/service_test.go +++ b/pkg/cri/server/images/service_test.go @@ -24,7 +24,7 @@ import ( 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/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/server/podsandbox/controller.go b/pkg/cri/server/podsandbox/controller.go index 3953c7bbf..96a94f5b1 100644 --- a/pkg/cri/server/podsandbox/controller.go +++ b/pkg/cri/server/podsandbox/controller.go @@ -38,9 +38,9 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/platforms" ) func init() { diff --git a/pkg/cri/server/service_test.go b/pkg/cri/server/service_test.go index f22f29a1b..4b1e4aaa4 100644 --- a/pkg/cri/server/service_test.go +++ b/pkg/cri/server/service_test.go @@ -31,7 +31,7 @@ import ( servertesting "github.com/containerd/containerd/v2/pkg/cri/testing" "github.com/containerd/containerd/v2/pkg/errdefs" ostesting "github.com/containerd/containerd/v2/pkg/os/testing" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) type fakeSandboxService struct{} diff --git a/pkg/cri/store/image/fake_image.go b/pkg/cri/store/image/fake_image.go index 041443f99..469c56f7f 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/v2/platforms" + "github.com/containerd/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 8fd2ad232..34ecc1d04 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" docker "github.com/distribution/reference" "k8s.io/apimachinery/pkg/util/sets" diff --git a/pkg/oci/spec.go b/pkg/oci/spec.go index a09b57c91..d4808cf68 100644 --- a/pkg/oci/spec.go +++ b/pkg/oci/spec.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) const ( diff --git a/pkg/oci/spec_opts.go b/pkg/oci/spec_opts.go index 2cbb48f6d..aedf26711 100644 --- a/pkg/oci/spec_opts.go +++ b/pkg/oci/spec_opts.go @@ -34,9 +34,9 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/continuity/fs" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/moby/sys/user" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/transfer/archive/exporter.go b/pkg/transfer/archive/exporter.go index 98a0a9119..d89fa0a5a 100644 --- a/pkg/transfer/archive/exporter.go +++ b/pkg/transfer/archive/exporter.go @@ -31,8 +31,8 @@ import ( "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" + "github.com/containerd/platforms" ) func init() { diff --git a/pkg/transfer/image/imagestore.go b/pkg/transfer/image/imagestore.go index 075d68d67..16cb86631 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -33,7 +33,7 @@ import ( "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/platforms" ) func init() { diff --git a/pkg/transfer/local/pull_test.go b/pkg/transfer/local/pull_test.go index 908d030ab..c46cf07e9 100644 --- a/pkg/transfer/local/pull_test.go +++ b/pkg/transfer/local/pull_test.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/unpack" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" ) func TestGetSupportedPlatform(t *testing.T) { diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index 098dde638..120ae1688 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/transfer" - "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/platforms" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index ea41629bf..07bcc769b 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -38,8 +38,8 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/tracing" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/platforms/compare.go b/platforms/compare.go deleted file mode 100644 index e874201ca..000000000 --- a/platforms/compare.go +++ /dev/null @@ -1,63 +0,0 @@ -/* - 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 platforms - -import ( - "github.com/containerd/platforms" - specs "github.com/opencontainers/image-spec/specs-go/v1" -) - -type MatchComparer = platforms.MatchComparer - -// Only returns a match comparer for a single platform -// using default resolution logic for the platform. -// -// For arm/v8, will also match arm/v7, arm/v6 and arm/v5 -// For arm/v7, will also match arm/v6 and arm/v5 -// For arm/v6, will also match arm/v5 -// For amd64, will also match 386 -func Only(platform specs.Platform) MatchComparer { - return platforms.Only(platform) -} - -// OnlyStrict returns a match comparer for a single platform. -// -// Unlike Only, OnlyStrict does not match sub platforms. -// So, "arm/vN" will not match "arm/vM" where M < N, -// and "amd64" will not also match "386". -// -// OnlyStrict matches non-canonical forms. -// So, "arm64" matches "arm/64/v8". -func OnlyStrict(platform specs.Platform) MatchComparer { - return platforms.OnlyStrict(platform) -} - -// Ordered returns a platform MatchComparer which matches any of the platforms -// but orders them in order they are provided. -func Ordered(ps ...specs.Platform) MatchComparer { - return platforms.Ordered(ps...) -} - -// Any returns a platform MatchComparer which matches any of the platforms -// with no preference for ordering. -func Any(ps ...specs.Platform) MatchComparer { - return platforms.Any(ps...) -} - -// All is a platform MatchComparer which matches all platforms -// with preference for ordering. -var All = platforms.All diff --git a/platforms/defaults.go b/platforms/defaults.go deleted file mode 100644 index ab2a89990..000000000 --- a/platforms/defaults.go +++ /dev/null @@ -1,42 +0,0 @@ -/* - 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 platforms - -import ( - "github.com/containerd/platforms" - specs "github.com/opencontainers/image-spec/specs-go/v1" -) - -// DefaultString returns the default string specifier for the platform. -func DefaultString() string { - return platforms.DefaultString() -} - -// DefaultStrict returns strict form of Default. -func DefaultStrict() MatchComparer { - return platforms.DefaultStrict() -} - -// DefaultSpec returns the current platform's default platform specification. -func DefaultSpec() specs.Platform { - return platforms.DefaultSpec() -} - -// Default returns the default matcher for the platform. -func Default() MatchComparer { - return platforms.Default() -} diff --git a/platforms/platforms.go b/platforms/platforms.go deleted file mode 100644 index 55070a778..000000000 --- a/platforms/platforms.go +++ /dev/null @@ -1,173 +0,0 @@ -/* - 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 platforms provides a toolkit for normalizing, matching and -// specifying container platforms. -// -// Centered around OCI platform specifications, we define a string-based -// specifier syntax that can be used for user input. With a specifier, users -// only need to specify the parts of the platform that are relevant to their -// context, providing an operating system or architecture or both. -// -// How do I use this package? -// -// The vast majority of use cases should simply use the match function with -// user input. The first step is to parse a specifier into a matcher: -// -// m, err := Parse("linux") -// if err != nil { ... } -// -// Once you have a matcher, use it to match against the platform declared by a -// component, typically from an image or runtime. Since extracting an images -// platform is a little more involved, we'll use an example against the -// platform default: -// -// if ok := m.Match(Default()); !ok { /* doesn't match */ } -// -// This can be composed in loops for resolving runtimes or used as a filter for -// fetch and select images. -// -// More details of the specifier syntax and platform spec follow. -// -// # Declaring Platform Support -// -// Components that have strict platform requirements should use the OCI -// platform specification to declare their support. Typically, this will be -// images and runtimes that should make these declaring which platform they -// support specifically. This looks roughly as follows: -// -// type Platform struct { -// Architecture string -// OS string -// Variant string -// } -// -// Most images and runtimes should at least set Architecture and OS, according -// to their GOARCH and GOOS values, respectively (follow the OCI image -// specification when in doubt). ARM should set variant under certain -// discussions, which are outlined below. -// -// # Platform Specifiers -// -// While the OCI platform specifications provide a tool for components to -// specify structured information, user input typically doesn't need the full -// context and much can be inferred. To solve this problem, we introduced -// "specifiers". A specifier has the format -// `||/[/]`. The user can provide either the -// operating system or the architecture or both. -// -// An example of a common specifier is `linux/amd64`. If the host has a default -// of runtime that matches this, the user can simply provide the component that -// matters. For example, if a image provides amd64 and arm64 support, the -// operating system, `linux` can be inferred, so they only have to provide -// `arm64` or `amd64`. Similar behavior is implemented for operating systems, -// where the architecture may be known but a runtime may support images from -// different operating systems. -// -// # Normalization -// -// Because not all users are familiar with the way the Go runtime represents -// platforms, several normalizations have been provided to make this package -// easier to user. -// -// The following are performed for architectures: -// -// Value Normalized -// aarch64 arm64 -// armhf arm -// armel arm/v6 -// i386 386 -// x86_64 amd64 -// x86-64 amd64 -// -// We also normalize the operating system `macos` to `darwin`. -// -// # ARM Support -// -// To qualify ARM architecture, the Variant field is used to qualify the arm -// version. The most common arm version, v7, is represented without the variant -// unless it is explicitly provided. This is treated as equivalent to armhf. A -// previous architecture, armel, will be normalized to arm/v6. -// -// Similarly, the most common arm64 version v8, and most common amd64 version v1 -// are represented without the variant. -// -// While these normalizations are provided, their support on arm platforms has -// not yet been fully implemented and tested. -package platforms - -import ( - "github.com/containerd/platforms" - specs "github.com/opencontainers/image-spec/specs-go/v1" -) - -// Platform is a type alias for convenience, so there is no need to import image-spec package everywhere. -type Platform = platforms.Platform - -// Matcher matches platforms specifications, provided by an image or runtime. -type Matcher = platforms.Matcher - -// NewMatcher returns a simple matcher based on the provided platform -// specification. The returned matcher only looks for equality based on os, -// architecture and variant. -// -// One may implement their own matcher if this doesn't provide the required -// functionality. -// -// Applications should opt to use `Match` over directly parsing specifiers. -func NewMatcher(platform specs.Platform) Matcher { - return platforms.NewMatcher(platform) -} - -// ParseAll parses a list of platform specifiers into a list of platform. -func ParseAll(specifiers []string) ([]specs.Platform, error) { - return platforms.ParseAll(specifiers) -} - -// Parse parses the platform specifier syntax into a platform declaration. -// -// Platform specifiers are in the format `||/[/]`. -// The minimum required information for a platform specifier is the operating -// system or architecture. If there is only a single string (no slashes), the -// value will be matched against the known set of operating systems, then fall -// back to the known set of architectures. The missing component will be -// inferred based on the local environment. -func Parse(specifier string) (specs.Platform, error) { - return platforms.Parse(specifier) -} - -// MustParse is like Parses but panics if the specifier cannot be parsed. -// Simplifies initialization of global variables. -func MustParse(specifier string) specs.Platform { - return platforms.MustParse(specifier) -} - -// Format returns a string specifier from the provided platform specification. -func Format(platform specs.Platform) string { - return platforms.Format(platform) -} - -// Normalize validates and translate the platform to the canonical value. -// -// For example, if "Aarch64" is encountered, we change it to "arm64" or if -// "x86_64" is encountered, it becomes "amd64". -func Normalize(platform specs.Platform) specs.Platform { - return platforms.Normalize(platform) -} - -func GetWindowsOsVersion() string { - return platforms.GetWindowsOsVersion() -} diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go index eb0c98d9d..c297a28a5 100644 --- a/plugins/cri/images/plugin.go +++ b/plugins/cri/images/plugin.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/pkg/events" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/plugins/diff/walking/plugin/plugin.go b/plugins/diff/walking/plugin/plugin.go index cc2f27ccd..0c5ce67d0 100644 --- a/plugins/diff/walking/plugin/plugin.go +++ b/plugins/diff/walking/plugin/plugin.go @@ -20,9 +20,9 @@ import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff/apply" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/diff/walking" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/plugins/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go index 5a14abe06..d4985ce0d 100644 --- a/plugins/diff/windows/cimfs.go +++ b/plugins/diff/windows/cimfs.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/plugins/diff/windows/windows.go b/plugins/diff/windows/windows.go index bdb68c859..d9fec7e12 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -37,9 +37,9 @@ import ( "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/labels" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "github.com/opencontainers/go-digest" diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index 3b909490f..1020bff73 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events/exchange" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/snapshots/blockfile/plugin/plugin.go b/plugins/snapshots/blockfile/plugin/plugin.go index a855efd18..69ee9ca6f 100644 --- a/plugins/snapshots/blockfile/plugin/plugin.go +++ b/plugins/snapshots/blockfile/plugin/plugin.go @@ -19,9 +19,9 @@ package plugin import ( "errors" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/snapshots/blockfile" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/plugins/snapshots/btrfs/plugin/plugin.go b/plugins/snapshots/btrfs/plugin/plugin.go index bf3ed5886..3dfea38c5 100644 --- a/plugins/snapshots/btrfs/plugin/plugin.go +++ b/plugins/snapshots/btrfs/plugin/plugin.go @@ -23,9 +23,9 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/snapshots/btrfs" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/plugins/snapshots/devmapper/plugin/plugin.go b/plugins/snapshots/devmapper/plugin/plugin.go index fd4d5f70b..143916c08 100644 --- a/plugins/snapshots/devmapper/plugin/plugin.go +++ b/plugins/snapshots/devmapper/plugin/plugin.go @@ -22,9 +22,9 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/plugins/snapshots/native/plugin/plugin.go b/plugins/snapshots/native/plugin/plugin.go index e68367b8d..816735912 100644 --- a/plugins/snapshots/native/plugin/plugin.go +++ b/plugins/snapshots/native/plugin/plugin.go @@ -19,9 +19,9 @@ package plugin import ( "errors" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/snapshots/native" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/plugins/snapshots/overlay/plugin/plugin.go b/plugins/snapshots/overlay/plugin/plugin.go index 7cffb971c..1ea5d5413 100644 --- a/plugins/snapshots/overlay/plugin/plugin.go +++ b/plugins/snapshots/overlay/plugin/plugin.go @@ -21,10 +21,10 @@ package overlay import ( "errors" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/snapshots/overlay" "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/plugins/snapshots/windows/cimfs.go b/plugins/snapshots/windows/cimfs.go index a4e2bbe9c..f60214267 100644 --- a/plugins/snapshots/windows/cimfs.go +++ b/plugins/snapshots/windows/cimfs.go @@ -33,9 +33,9 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/storage" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/plugins/snapshots/windows/windows.go b/plugins/snapshots/windows/windows.go index d59496c34..87588eac2 100644 --- a/plugins/snapshots/windows/windows.go +++ b/plugins/snapshots/windows/windows.go @@ -33,10 +33,10 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/storage" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/continuity/fs" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index 38972b29a..ea78f8613 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -27,9 +27,9 @@ import ( "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/plugins" "github.com/containerd/log" + "github.com/containerd/platforms" "github.com/containerd/plugin" "github.com/containerd/plugin/registry"