github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move leases to core/leases

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-17 09:51:45 -08:00
parent cc6a5c9c69
commit f80760f9ff
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
29 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/client.go
View File

@ -43,11 +43,11 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
contentproxy "github.com/containerd/containerd/v2/core/content/proxy" contentproxy "github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/core/images" "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/defaults"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events" "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/namespaces"
"github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"

2
client/lease.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"time" "time"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/core/leases"
) )
// WithLease attaches a lease on the context // WithLease attaches a lease on the context

2
client/services.go
View File

@ -28,7 +28,7 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "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/namespaces"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/sandbox" "github.com/containerd/containerd/v2/sandbox"

2
cmd/ctr/commands/content/prune.go
View File

@ -23,7 +23,7 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/core/content" "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/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/ctr/commands/images/mount.go
View File

@ -22,9 +22,9 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "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/defaults"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"

2
cmd/ctr/commands/images/unmount.go
View File

@ -20,8 +20,8 @@ import (
"fmt" "fmt"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "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/errdefs"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/ctr/commands/leases/leases.go
View File

@ -25,7 +25,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "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" "github.com/urfave/cli"
) )

2
contrib/fuzz/metadata_fuzzer.go
View File

@ -29,7 +29,7 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "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/metadata"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"

2
core/images/converter/converter.go
View File

@ -22,7 +22,7 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "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" "github.com/containerd/containerd/v2/platforms"
) )

0
leases/context.go → core/leases/context.go
View File

0
leases/grpc.go → core/leases/grpc.go
View File

0
leases/id.go → core/leases/id.go
View File

0
leases/lease.go → core/leases/lease.go
View File

0
leases/lease_test.go → core/leases/lease_test.go
View File

2
leases/proxy/manager.go → core/leases/proxy/manager.go
View File

@ -20,8 +20,8 @@ import (
"context" "context"
leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1" 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/errdefs"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
) )

2
integration/client/client_test.go
View File

@ -34,10 +34,10 @@ import (
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/images" "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/defaults"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
imagelist "github.com/containerd/containerd/v2/integration/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/namespaces"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"

2
integration/client/import_test.go
View File

@ -38,7 +38,7 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/images/archive" "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/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"

2
integration/client/lease_test.go
View File

@ -22,9 +22,9 @@ import (
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/images" "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/errdefs"
imagelist "github.com/containerd/containerd/v2/integration/images" imagelist "github.com/containerd/containerd/v2/integration/images"
"github.com/containerd/containerd/v2/leases"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
) )

2
integration/image_pull_timeout_test.go
View File

@ -40,8 +40,8 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/content" "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/defaults"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
criserver "github.com/containerd/containerd/v2/pkg/cri/server" criserver "github.com/containerd/containerd/v2/pkg/cri/server"

2
metadata/adaptors.go
View File

@ -22,8 +22,8 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "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/filters"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/sandbox" "github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"
) )

2
metadata/content_test.go
View File

@ -27,9 +27,9 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/content/testsuite" "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/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
metadata/db_test.go
View File

@ -32,9 +32,9 @@ import (
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "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/errdefs"
"github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/gc"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"

2
metadata/leases.go
View File

@ -24,9 +24,9 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/metadata/boltutil"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

2
metadata/leases_test.go
View File

@ -22,8 +22,8 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/leases"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

2
pkg/transfer/local/transfer.go
View File

@ -27,8 +27,8 @@ import (
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images" "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/errdefs"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/pkg/imageverifier" "github.com/containerd/containerd/v2/pkg/imageverifier"
"github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/kmutex"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"

2
plugins/leases/local.go
View File

@ -19,8 +19,8 @@ package plugin
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/gc"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin" "github.com/containerd/plugin"

2
plugins/streaming/manager.go
View File

@ -21,9 +21,9 @@ import (
"errors" "errors"
"sync" "sync"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/gc"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/streaming"

2
plugins/transfer/plugin.go
View File

@ -20,9 +20,9 @@ import (
"fmt" "fmt"
"github.com/containerd/containerd/v2/core/diff" "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/defaults"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/pkg/imageverifier" "github.com/containerd/containerd/v2/pkg/imageverifier"
"github.com/containerd/containerd/v2/pkg/transfer/local" "github.com/containerd/containerd/v2/pkg/transfer/local"

2
services/leases/service.go
View File

@ -20,8 +20,8 @@ import (
"context" "context"
api "github.com/containerd/containerd/v2/api/services/leases/v1" 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/errdefs"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"