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

Move metadata to core/metadata

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-17 09:52:03 -08:00
parent 18b3cbe4fa
commit 1a1e0e8c81
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
43 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/fuzz/metadata_fuzzer.go
View File

@ -30,7 +30,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/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/core/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"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"

0
metadata/adaptors.go → core/metadata/adaptors.go
View File

0
metadata/bolt.go → core/metadata/bolt.go
View File

0
metadata/boltutil/helpers.go → core/metadata/boltutil/helpers.go
View File

0
metadata/buckets.go → core/metadata/buckets.go
View File

0
metadata/compare_test.go → core/metadata/compare_test.go
View File

2
metadata/containers.go → core/metadata/containers.go
View File

@ -24,11 +24,11 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/metadata/boltutil"
"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/identifiers" "github.com/containerd/containerd/v2/identifiers"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/metadata/boltutil"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"

0
metadata/containers_test.go → core/metadata/containers_test.go
View File

2
metadata/content.go → core/metadata/content.go
View File

@ -26,10 +26,10 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/metadata/boltutil"
"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/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/metadata/boltutil"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/log" "github.com/containerd/log"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

0
metadata/content_test.go → core/metadata/content_test.go
View File

0
metadata/db.go → core/metadata/db.go
View File

0
metadata/db_test.go → core/metadata/db_test.go
View File

0
metadata/gc.go → core/metadata/gc.go
View File

2
metadata/gc_test.go → core/metadata/gc_test.go
View File

@ -28,8 +28,8 @@ import (
"text/tabwriter" "text/tabwriter"
"time" "time"
"github.com/containerd/containerd/v2/core/metadata/boltutil"
"github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/gc"
"github.com/containerd/containerd/v2/metadata/boltutil"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
metadata/images.go → core/metadata/images.go
View File

@ -26,10 +26,10 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/metadata/boltutil"
"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/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/metadata/boltutil"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

0
metadata/images_test.go → core/metadata/images_test.go
View File

2
metadata/leases.go → core/metadata/leases.go
View File

@ -25,9 +25,9 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/metadata/boltutil"
"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/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"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"

0
metadata/leases_test.go → core/metadata/leases_test.go
View File

0
metadata/migrations.go → core/metadata/migrations.go
View File

0
metadata/namespaces.go → core/metadata/namespaces.go
View File

0
metadata/namespaces_test.go → core/metadata/namespaces_test.go
View File

2
metadata/sandbox.go → core/metadata/sandbox.go
View File

@ -23,10 +23,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/v2/core/metadata/boltutil"
"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/identifiers" "github.com/containerd/containerd/v2/identifiers"
"github.com/containerd/containerd/v2/metadata/boltutil"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
api "github.com/containerd/containerd/v2/sandbox" api "github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

0
metadata/sandbox_test.go → core/metadata/sandbox_test.go
View File

2
metadata/snapshot.go → core/metadata/snapshot.go
View File

@ -25,10 +25,10 @@ import (
"time" "time"
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/core/metadata/boltutil"
"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/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/metadata/boltutil"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"

0
metadata/snapshot_test.go → core/metadata/snapshot_test.go
View File

2
plugins/cri/images/plugin.go
View File

@ -22,8 +22,8 @@ import (
"path/filepath" "path/filepath"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/metadata"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/constants"
"github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/pkg/cri/server/images"

2
plugins/diff/lcow/lcow.go
View File

@ -32,8 +32,8 @@ import (
"github.com/Microsoft/hcsshim/ext4/tar2ext4" "github.com/Microsoft/hcsshim/ext4/tar2ext4"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/log" "github.com/containerd/log"

2
plugins/diff/walking/plugin/plugin.go
View File

@ -19,7 +19,7 @@ package plugin
import ( import (
"github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/diff/apply" "github.com/containerd/containerd/v2/core/diff/apply"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/diff/walking" "github.com/containerd/containerd/v2/plugins/diff/walking"

2
plugins/diff/windows/cimfs.go
View File

@ -27,8 +27,8 @@ import (
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/metadata"
"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/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"

2
plugins/diff/windows/windows.go
View File

@ -32,9 +32,9 @@ import (
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/metadata"
"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/metadata"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"

2
plugins/leases/local.go
View File

@ -20,8 +20,8 @@ import (
"context" "context"
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/gc"
"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"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
plugins/metadata/plugin.go
View File

@ -23,9 +23,9 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/metadata"
"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/metadata"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"

2
plugins/sandbox/store.go
View File

@ -17,7 +17,7 @@
package sandbox package sandbox
import ( import (
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
plugins/streaming/manager.go
View File

@ -22,9 +22,9 @@ import (
"sync" "sync"
"github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/metadata"
"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/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"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"

2
plugins/transfer/plugin.go
View File

@ -21,9 +21,9 @@ import (
"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/core/leases"
"github.com/containerd/containerd/v2/core/metadata"
"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/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"
"github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/pkg/unpack"

2
runtime/v2/manager.go
View File

@ -27,9 +27,9 @@ import (
"sync" "sync"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events/exchange" "github.com/containerd/containerd/v2/events/exchange"
"github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/cleanup"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"

2
services/containers/local.go
View File

@ -23,9 +23,9 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
api "github.com/containerd/containerd/v2/api/services/containers/v1" api "github.com/containerd/containerd/v2/api/services/containers/v1"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/metadata"
"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/metadata"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/services"

2
services/content/store.go
View File

@ -21,8 +21,8 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/services"
"github.com/containerd/plugin" "github.com/containerd/plugin"

2
services/images/local.go
View File

@ -27,10 +27,10 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" imagesapi "github.com/containerd/containerd/v2/api/services/images/v1"
"github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/metadata"
"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/gc" "github.com/containerd/containerd/v2/gc"
"github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/deprecation"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"

2
services/namespaces/local.go
View File

@ -22,9 +22,9 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
api "github.com/containerd/containerd/v2/api/services/namespaces/v1" api "github.com/containerd/containerd/v2/api/services/namespaces/v1"
"github.com/containerd/containerd/v2/core/metadata"
"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/metadata"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"

2
services/snapshots/snapshotters.go
View File

@ -17,7 +17,7 @@
package snapshots package snapshots
import ( import (
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/services"
"github.com/containerd/plugin" "github.com/containerd/plugin"

2
services/tasks/local.go
View File

@ -33,10 +33,10 @@ 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/metadata"
"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/filters" "github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/blockio"
"github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/rdt"

2
snapshots/storage/bolt.go
View File

@ -25,9 +25,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/v2/core/metadata/boltutil"
"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/metadata/boltutil"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )