diff --git a/client/image.go b/client/image.go index 7184a3c46..9974dfb1d 100644 --- a/client/image.go +++ b/client/image.go @@ -28,8 +28,8 @@ 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/internal/kmutex" "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/pkg/rootfs" "github.com/containerd/containerd/v2/platforms" diff --git a/pkg/kmutex/kmutex.go b/internal/kmutex/kmutex.go similarity index 100% rename from pkg/kmutex/kmutex.go rename to internal/kmutex/kmutex.go diff --git a/pkg/kmutex/kmutex_test.go b/internal/kmutex/kmutex_test.go similarity index 100% rename from pkg/kmutex/kmutex_test.go rename to internal/kmutex/kmutex_test.go diff --git a/pkg/kmutex/noop.go b/internal/kmutex/noop.go similarity index 100% rename from pkg/kmutex/noop.go rename to internal/kmutex/noop.go diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index 6636a2c07..8c2f8a35d 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -24,11 +24,11 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/internal/kmutex" 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/pkg/events" - "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" docker "github.com/distribution/reference" diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index 7ceb40dd8..43d7a6f95 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.go @@ -28,9 +28,9 @@ 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/internal/kmutex" "github.com/containerd/containerd/v2/pkg/errdefs" "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" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index e1954fd0c..ea41629bf 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/internal/cleanup" + "github.com/containerd/containerd/v2/internal/kmutex" "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/pkg/tracing" "github.com/containerd/containerd/v2/platforms"