diff --git a/client/client.go b/client/client.go index e47531ee4..94bee29f7 100644 --- a/client/client.go +++ b/client/client.go @@ -43,11 +43,11 @@ import ( "github.com/containerd/containerd/v2/core/content" contentproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/leases" + leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" - "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" diff --git a/client/lease.go b/client/lease.go index 9b4ae473b..e0608a7c6 100644 --- a/client/lease.go +++ b/client/lease.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" ) // WithLease attaches a lease on the context diff --git a/client/services.go b/client/services.go index b6922b2ab..6b360b1bd 100644 --- a/client/services.go +++ b/client/services.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/sandbox" diff --git a/cmd/ctr/commands/content/prune.go b/cmd/ctr/commands/content/prune.go index 9afd35781..7e6ef3330 100644 --- a/cmd/ctr/commands/content/prune.go +++ b/cmd/ctr/commands/content/prune.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index 2b5690218..8cb5e63d2 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -22,9 +22,9 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" "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" diff --git a/cmd/ctr/commands/images/unmount.go b/cmd/ctr/commands/images/unmount.go index 722e68a3a..509886085 100644 --- a/cmd/ctr/commands/images/unmount.go +++ b/cmd/ctr/commands/images/unmount.go @@ -20,8 +20,8 @@ import ( "fmt" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/core/leases" "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/leases/leases.go b/cmd/ctr/commands/leases/leases.go index 23c1e4c43..e6a34b41f 100644 --- a/cmd/ctr/commands/leases/leases.go +++ b/cmd/ctr/commands/leases/leases.go @@ -25,7 +25,7 @@ import ( "time" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/urfave/cli" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index fe770b4a0..75ac481be 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" diff --git a/core/images/converter/converter.go b/core/images/converter/converter.go index ec46e5397..e88d702ec 100644 --- a/core/images/converter/converter.go +++ b/core/images/converter/converter.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/platforms" ) diff --git a/leases/context.go b/core/leases/context.go similarity index 100% rename from leases/context.go rename to core/leases/context.go diff --git a/leases/grpc.go b/core/leases/grpc.go similarity index 100% rename from leases/grpc.go rename to core/leases/grpc.go diff --git a/leases/id.go b/core/leases/id.go similarity index 100% rename from leases/id.go rename to core/leases/id.go diff --git a/leases/lease.go b/core/leases/lease.go similarity index 100% rename from leases/lease.go rename to core/leases/lease.go diff --git a/leases/lease_test.go b/core/leases/lease_test.go similarity index 100% rename from leases/lease_test.go rename to core/leases/lease_test.go diff --git a/leases/proxy/manager.go b/core/leases/proxy/manager.go similarity index 98% rename from leases/proxy/manager.go rename to core/leases/proxy/manager.go index a455258eb..0af29101b 100644 --- a/leases/proxy/manager.go +++ b/core/leases/proxy/manager.go @@ -20,8 +20,8 @@ import ( "context" leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/integration/client/client_test.go b/integration/client/client_test.go index ebdebbfbb..520591a8e 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -34,10 +34,10 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" 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" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index de147e75c..68fde3709 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -38,7 +38,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/transfer" diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 3594091b7..6f02ecd75 100644 --- a/integration/client/lease_test.go +++ b/integration/client/lease_test.go @@ -22,9 +22,9 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/errdefs" imagelist "github.com/containerd/containerd/v2/integration/images" - "github.com/containerd/containerd/v2/leases" "github.com/opencontainers/image-spec/identity" ) diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index 6af7dc2e4..df8fe474a 100644 --- a/integration/image_pull_timeout_test.go +++ b/integration/image_pull_timeout_test.go @@ -40,8 +40,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" - "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" diff --git a/metadata/adaptors.go b/metadata/adaptors.go index d7a164e81..5e5346e0c 100644 --- a/metadata/adaptors.go +++ b/metadata/adaptors.go @@ -22,8 +22,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "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/filters" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/containerd/v2/snapshots" ) diff --git a/metadata/content_test.go b/metadata/content_test.go index 51047d6e3..268256cdb 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -27,9 +27,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/errdefs" "github.com/containerd/containerd/v2/labels" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" diff --git a/metadata/db_test.go b/metadata/db_test.go index 95d00648e..dee507b90 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -32,9 +32,9 @@ import ( "github.com/containerd/containerd/v2/core/containers" "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/errdefs" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/metadata/leases.go b/metadata/leases.go index 8d8b45959..30ad0ed4f 100644 --- a/metadata/leases.go +++ b/metadata/leases.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "time" + "github.com/containerd/containerd/v2/core/leases" "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" diff --git a/metadata/leases_test.go b/metadata/leases_test.go index c9d1f903a..e76b52810 100644 --- a/metadata/leases_test.go +++ b/metadata/leases_test.go @@ -22,8 +22,8 @@ import ( "fmt" "testing" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/leases" bolt "go.etcd.io/bbolt" ) diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index c00930469..a41ccce57 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.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/core/leases" "github.com/containerd/containerd/v2/errdefs" - "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" diff --git a/plugins/leases/local.go b/plugins/leases/local.go index 54ef11c65..b6ac1f9aa 100644 --- a/plugins/leases/local.go +++ b/plugins/leases/local.go @@ -19,8 +19,8 @@ package plugin import ( "context" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index 0c0c301fc..ac24854d9 100644 --- a/plugins/streaming/manager.go +++ b/plugins/streaming/manager.go @@ -21,9 +21,9 @@ import ( "errors" "sync" + "github.com/containerd/containerd/v2/core/leases" "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" diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index c8babb9dc..4d637b656 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" "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" diff --git a/services/leases/service.go b/services/leases/service.go index 1c4036885..759512bad 100644 --- a/services/leases/service.go +++ b/services/leases/service.go @@ -20,8 +20,8 @@ import ( "context" api "github.com/containerd/containerd/v2/api/services/leases/v1" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types"