diff --git a/client/image.go b/client/image.go index 70293ee64..5924b47c3 100644 --- a/client/image.go +++ b/client/image.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/usage" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/rootfs" "github.com/opencontainers/go-digest" diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index 2550b36bf..d19574ea4 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -32,10 +32,10 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/core/containers" - clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" + clabels "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" ) diff --git a/core/images/archive/exporter.go b/core/images/archive/exporter.go index f6daa8441..2034009c5 100644 --- a/core/images/archive/exporter.go +++ b/core/images/archive/exporter.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/core/images/archive/importer.go b/core/images/archive/importer.go index b18ee839d..f5c804128 100644 --- a/core/images/archive/importer.go +++ b/core/images/archive/importer.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/labels" "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" digest "github.com/opencontainers/go-digest" diff --git a/core/images/converter/uncompress/uncompress.go b/core/images/converter/uncompress/uncompress.go index fc2fbbb6c..c57d275ad 100644 --- a/core/images/converter/uncompress/uncompress.go +++ b/core/images/converter/uncompress/uncompress.go @@ -24,9 +24,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/converter" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/diffid.go b/core/images/diffid.go index b47dbbb02..140d2c07c 100644 --- a/core/images/diffid.go +++ b/core/images/diffid.go @@ -24,8 +24,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive/compression" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" ) diff --git a/core/metadata/containers.go b/core/metadata/containers.go index 6064944f0..6e0d6f331 100644 --- a/core/metadata/containers.go +++ b/core/metadata/containers.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/identifiers" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" diff --git a/core/metadata/content.go b/core/metadata/content.go index 1e9751aa7..4fe22712c 100644 --- a/core/metadata/content.go +++ b/core/metadata/content.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/content_test.go b/core/metadata/content_test.go index 8676b7fca..fd334871c 100644 --- a/core/metadata/content_test.go +++ b/core/metadata/content_test.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/images.go b/core/metadata/images.go index 1a3b3ce67..69951e552 100644 --- a/core/metadata/images.go +++ b/core/metadata/images.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/labels" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/core/metadata/namespaces.go b/core/metadata/namespaces.go index d4a402540..0b9ee8df8 100644 --- a/core/metadata/namespaces.go +++ b/core/metadata/namespaces.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - l "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/identifiers" + l "github.com/containerd/containerd/v2/pkg/labels" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot.go b/core/metadata/snapshot.go index 68aebfc18..9f4b93071 100644 --- a/core/metadata/snapshot.go +++ b/core/metadata/snapshot.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/remotes/docker/handler.go b/core/remotes/docker/handler.go index cf01f2294..3b1e98c65 100644 --- a/core/remotes/docker/handler.go +++ b/core/remotes/docker/handler.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/reference" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/remotes/docker/handler_test.go b/core/remotes/docker/handler_test.go index 7043fa741..1cba56acf 100644 --- a/core/remotes/docker/handler_test.go +++ b/core/remotes/docker/handler_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/reference" ) diff --git a/core/remotes/docker/schema1/converter.go b/core/remotes/docker/schema1/converter.go index 4526d532a..f8876b185 100644 --- a/core/remotes/docker/schema1/converter.go +++ b/core/remotes/docker/schema1/converter.go @@ -35,9 +35,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" - "github.com/containerd/containerd/v2/labels" "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/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" diff --git a/core/remotes/handlers.go b/core/remotes/handlers.go index 1e09cf2dd..3afa22daa 100644 --- a/core/remotes/handlers.go +++ b/core/remotes/handlers.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/client/image_test.go b/integration/client/image_test.go index a3fd1ac84..105e41288 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" imagelist "github.com/containerd/containerd/v2/integration/images" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 0bda7e7fa..8fcae64c1 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -33,11 +33,11 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - clabels "github.com/containerd/containerd/v2/labels" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" "github.com/containerd/containerd/v2/pkg/errdefs" + clabels "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/helpers.go b/pkg/cri/server/podsandbox/helpers.go index 8f547634d..bb011abca 100644 --- a/pkg/cri/server/podsandbox/helpers.go +++ b/pkg/cri/server/podsandbox/helpers.go @@ -31,12 +31,12 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" 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" + clabels "github.com/containerd/containerd/v2/pkg/labels" ) const ( diff --git a/labels/labels.go b/pkg/labels/labels.go similarity index 100% rename from labels/labels.go rename to pkg/labels/labels.go diff --git a/labels/validate.go b/pkg/labels/validate.go similarity index 100% rename from labels/validate.go rename to pkg/labels/validate.go diff --git a/labels/validate_test.go b/pkg/labels/validate_test.go similarity index 100% rename from labels/validate_test.go rename to pkg/labels/validate_test.go diff --git a/pkg/snapshotters/annotations.go b/pkg/snapshotters/annotations.go index d6582e9a2..2e44b05fb 100644 --- a/pkg/snapshotters/annotations.go +++ b/pkg/snapshotters/annotations.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 8153d9089..0624e05b1 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -33,10 +33,10 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" diff --git a/plugins/diff/walking/differ.go b/plugins/diff/walking/differ.go index 83edbb7f5..ab7f14f50 100644 --- a/plugins/diff/walking/differ.go +++ b/plugins/diff/walking/differ.go @@ -28,11 +28,11 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/plugins/diff/windows/windows.go b/plugins/diff/windows/windows.go index 1ee3f1936..bdb68c859 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -32,11 +32,11 @@ import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/archive/compression" "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"