diff --git a/client/client.go b/client/client.go index 8894b46b0..b78030b71 100644 --- a/client/client.go +++ b/client/client.go @@ -42,6 +42,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" contentproxy "github.com/containerd/containerd/v2/core/content/proxy" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy" @@ -53,7 +54,6 @@ import ( snproxy "github.com/containerd/containerd/v2/core/snapshots/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/dialer" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/introspection" diff --git a/client/events.go b/client/events.go index 80f42212c..4ac3701f0 100644 --- a/client/events.go +++ b/client/events.go @@ -21,7 +21,7 @@ import ( eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 29dd9a002..45a2f6d14 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -19,8 +19,8 @@ package builtins // register containerd builtins here import ( _ "github.com/containerd/containerd/v2/core/runtime/v2" - _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" + _ "github.com/containerd/containerd/v2/plugins/events" _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" diff --git a/cmd/ctr/commands/events/events.go b/cmd/ctr/commands/events/events.go index d4b014374..c27e36503 100644 --- a/cmd/ctr/commands/events/events.go +++ b/cmd/ctr/commands/events/events.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli/v2" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index a5e5c2c1b..8800e4a37 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -19,12 +19,12 @@ package fuzz import ( // base containerd imports _ "github.com/containerd/containerd/v2/core/runtime/v2" - _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/cri" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/cri/runtime" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/plugins/events" _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" diff --git a/contrib/fuzz/exchange_fuzzer.go b/contrib/fuzz/exchange_fuzzer.go index 4348d1ba2..4266e9eb8 100644 --- a/contrib/fuzz/exchange_fuzzer.go +++ b/contrib/fuzz/exchange_fuzzer.go @@ -20,8 +20,8 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/pkg/events" - "github.com/containerd/containerd/v2/pkg/events/exchange" + "github.com/containerd/containerd/v2/core/events" + "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/pkg/namespaces" ) diff --git a/contrib/v2-migrate.sh b/contrib/v2-migrate.sh index cb07521d0..e045bf5de 100755 --- a/contrib/v2-migrate.sh +++ b/contrib/v2-migrate.sh @@ -34,7 +34,8 @@ for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots/$1$2"github.com\/containerd\/containerd\/v2\/core\/snapshots/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/archive/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/archive/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/cio/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/cio/g' $GOFILE - perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/events/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/events/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/events\/plugin/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/events/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/events/$1$2"github.com\/containerd\/containerd\/v2\/core\/events/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/errdefs/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/errdefs/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/filters/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/filters/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/gc\/scheduler/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/gc/g' $GOFILE diff --git a/pkg/events/events.go b/core/events/events.go similarity index 100% rename from pkg/events/events.go rename to core/events/events.go diff --git a/pkg/events/exchange/exchange.go b/core/events/exchange/exchange.go similarity index 99% rename from pkg/events/exchange/exchange.go rename to core/events/exchange/exchange.go index 112bd48b0..3e13f1577 100644 --- a/pkg/events/exchange/exchange.go +++ b/core/events/exchange/exchange.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/namespaces" diff --git a/pkg/events/exchange/exchange_test.go b/core/events/exchange/exchange_test.go similarity index 99% rename from pkg/events/exchange/exchange_test.go rename to core/events/exchange/exchange_test.go index 09b79a632..f161b1f55 100644 --- a/pkg/events/exchange/exchange_test.go +++ b/core/events/exchange/exchange_test.go @@ -23,7 +23,7 @@ import ( "time" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/errdefs" diff --git a/core/metadata/db.go b/core/metadata/db.go index 303af643d..de6862bce 100644 --- a/core/metadata/db.go +++ b/core/metadata/db.go @@ -28,9 +28,9 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/internal/cleanup" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" diff --git a/core/metrics/cgroups/cgroups.go b/core/metrics/cgroups/cgroups.go index 972105308..66a6b7ced 100644 --- a/core/metrics/cgroups/cgroups.go +++ b/core/metrics/cgroups/cgroups.go @@ -22,10 +22,10 @@ import ( "context" "github.com/containerd/cgroups/v3" + "github.com/containerd/containerd/v2/core/events" v1 "github.com/containerd/containerd/v2/core/metrics/cgroups/v1" v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" "github.com/containerd/containerd/v2/core/runtime" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/version" "github.com/containerd/platforms" diff --git a/core/metrics/cgroups/v1/cgroups.go b/core/metrics/cgroups/v1/cgroups.go index 09622c84c..73babe471 100644 --- a/core/metrics/cgroups/v1/cgroups.go +++ b/core/metrics/cgroups/v1/cgroups.go @@ -23,8 +23,8 @@ import ( cgroups "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/runtime" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/errdefs" "github.com/containerd/log" diff --git a/core/metrics/cgroups/v2/cgroups.go b/core/metrics/cgroups/v2/cgroups.go index 7e83c7f37..d84def68f 100644 --- a/core/metrics/cgroups/v2/cgroups.go +++ b/core/metrics/cgroups/v2/cgroups.go @@ -21,8 +21,8 @@ package v2 import ( "context" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/runtime" - "github.com/containerd/containerd/v2/pkg/events" "github.com/docker/go-metrics" ) diff --git a/core/runtime/v2/manager.go b/core/runtime/v2/manager.go index 62c3b535b..bebc0b12e 100644 --- a/core/runtime/v2/manager.go +++ b/core/runtime/v2/manager.go @@ -29,12 +29,12 @@ import ( apitypes "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/runtime" shimbinary "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/internal/cleanup" - "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" diff --git a/core/runtime/v2/shim.go b/core/runtime/v2/shim.go index 6d7bed38a..6fb38c2c8 100644 --- a/core/runtime/v2/shim.go +++ b/core/runtime/v2/shim.go @@ -38,9 +38,9 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" task "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/runtime" client "github.com/containerd/containerd/v2/core/runtime/v2/shim" - "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/protobuf" diff --git a/core/runtime/v2/shim/publisher.go b/core/runtime/v2/shim/publisher.go index cf97f8266..882a476f3 100644 --- a/core/runtime/v2/shim/publisher.go +++ b/core/runtime/v2/shim/publisher.go @@ -23,7 +23,7 @@ import ( v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/protobuf" diff --git a/core/runtime/v2/shim/shim.go b/core/runtime/v2/shim/shim.go index b6898a88f..d8f77e259 100644 --- a/core/runtime/v2/shim/shim.go +++ b/core/runtime/v2/shim/shim.go @@ -32,7 +32,7 @@ import ( shimapi "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 20488feff..2358714ca 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -36,10 +36,10 @@ import ( _ "github.com/containerd/containerd/v2/core/runtime/v2" _ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/cri/runtime" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/plugins/events" _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" diff --git a/internal/cri/server/events.go b/internal/cri/server/events.go index c8fc06786..49fa1d9a7 100644 --- a/internal/cri/server/events.go +++ b/internal/cri/server/events.go @@ -31,12 +31,12 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/internal/cri/constants" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" containerdio "github.com/containerd/containerd/v2/pkg/cio" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/errdefs" ) diff --git a/pkg/events/plugin/plugin.go b/plugins/events/plugin.go similarity index 92% rename from pkg/events/plugin/plugin.go rename to plugins/events/plugin.go index 261ba5b33..c9a0c66c1 100644 --- a/pkg/events/plugin/plugin.go +++ b/plugins/events/plugin.go @@ -14,10 +14,10 @@ limitations under the License. */ -package plugin +package events import ( - "github.com/containerd/containerd/v2/pkg/events/exchange" + "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/metadata/plugin.go b/plugins/metadata/plugin.go index a77e6e142..7171c80de 100644 --- a/plugins/metadata/plugin.go +++ b/plugins/metadata/plugin.go @@ -23,9 +23,9 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/errdefs" diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index d387ee2d0..bc8b8e237 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -23,12 +23,12 @@ import ( runtimeAPI "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/core/events" + "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/runtime" v2 "github.com/containerd/containerd/v2/core/runtime/v2" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/pkg/events" - "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/errdefs" "github.com/containerd/log" diff --git a/plugins/services/containers/local.go b/plugins/services/containers/local.go index 3c79c1bad..7be944cba 100644 --- a/plugins/services/containers/local.go +++ b/plugins/services/containers/local.go @@ -23,8 +23,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/containers/v1" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/plugins/services/content/store.go b/plugins/services/content/store.go index 7f918daae..3e645359b 100644 --- a/plugins/services/content/store.go +++ b/plugins/services/content/store.go @@ -21,8 +21,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/plugin" diff --git a/plugins/services/events/service.go b/plugins/services/events/service.go index 29fbd9812..a462accde 100644 --- a/plugins/services/events/service.go +++ b/plugins/services/events/service.go @@ -23,8 +23,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/events/v1" apittrpc "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/pkg/events" - "github.com/containerd/containerd/v2/pkg/events/exchange" + "github.com/containerd/containerd/v2/core/events" + "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/plugins/services/events/ttrpc.go b/plugins/services/events/ttrpc.go index fcc1bd85b..ba0596fd4 100644 --- a/plugins/services/events/ttrpc.go +++ b/plugins/services/events/ttrpc.go @@ -21,8 +21,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/pkg/events" - "github.com/containerd/containerd/v2/pkg/events/exchange" + "github.com/containerd/containerd/v2/core/events" + "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" diff --git a/plugins/services/namespaces/local.go b/plugins/services/namespaces/local.go index 7ca6f0f2d..c051e7171 100644 --- a/plugins/services/namespaces/local.go +++ b/plugins/services/namespaces/local.go @@ -22,8 +22,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/namespaces/v1" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" diff --git a/plugins/services/sandbox/controller_service.go b/plugins/services/sandbox/controller_service.go index f9581d552..92987e4a7 100644 --- a/plugins/services/sandbox/controller_service.go +++ b/plugins/services/sandbox/controller_service.go @@ -26,8 +26,8 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/sandbox/v1" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/errdefs" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index 25224d340..514898c2e 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -31,6 +31,7 @@ import ( "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" @@ -38,7 +39,6 @@ import ( "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/blockio" - "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/timeout"