diff --git a/client/client.go b/client/client.go index 8ca8d9496..063433081 100644 --- a/client/client.go +++ b/client/client.go @@ -53,9 +53,9 @@ import ( snproxy "github.com/containerd/containerd/v2/core/snapshots/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/platforms" "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 1c9049e72..6cc3f8710 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/errdefs" - "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" ) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 7675d0657..1badd7c18 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -18,8 +18,8 @@ package builtins // register containerd builtins here import ( - _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" + _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" diff --git a/cmd/ctr/commands/events/events.go b/cmd/ctr/commands/events/events.go index 30b09aa6f..a1f98608b 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/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 337726368..0f3dec7ba 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -18,9 +18,9 @@ package fuzz import ( // base containerd imports - _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/pkg/cri" + _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" diff --git a/contrib/fuzz/exchange_fuzzer.go b/contrib/fuzz/exchange_fuzzer.go index 52a95d5a2..b3dcc6e02 100644 --- a/contrib/fuzz/exchange_fuzzer.go +++ b/contrib/fuzz/exchange_fuzzer.go @@ -20,9 +20,9 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/events/exchange" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/events/exchange" ) func FuzzExchange(data []byte) int { diff --git a/core/metadata/db.go b/core/metadata/db.go index d5c5df985..972588614 100644 --- a/core/metadata/db.go +++ b/core/metadata/db.go @@ -29,10 +29,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index aca1c0ac6..165295ea6 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/plugin" "github.com/opencontainers/go-digest" - _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" + _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/leases" diff --git a/metrics/cgroups/cgroups.go b/metrics/cgroups/cgroups.go index aee7af011..5ba02d606 100644 --- a/metrics/cgroups/cgroups.go +++ b/metrics/cgroups/cgroups.go @@ -20,9 +20,9 @@ package cgroups import ( "github.com/containerd/cgroups/v3" - "github.com/containerd/containerd/v2/events" v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1" v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime" diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go index c04ea97c5..c47501940 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -24,8 +24,8 @@ import ( cgroups "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/runtime" "github.com/containerd/log" "github.com/docker/go-metrics" diff --git a/metrics/cgroups/v2/cgroups.go b/metrics/cgroups/v2/cgroups.go index b9cc6c1bc..09de1e277 100644 --- a/metrics/cgroups/v2/cgroups.go +++ b/metrics/cgroups/v2/cgroups.go @@ -21,7 +21,7 @@ package v2 import ( "context" - "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/runtime" "github.com/docker/go-metrics" ) diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 9ac44dc12..701f2a0db 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -32,12 +32,12 @@ import ( apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cri/constants" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index dae77167a..6636a2c07 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -24,10 +24,10 @@ 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/events" 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" diff --git a/events/events.go b/pkg/events/events.go similarity index 100% rename from events/events.go rename to pkg/events/events.go diff --git a/events/exchange/exchange.go b/pkg/events/exchange/exchange.go similarity index 99% rename from events/exchange/exchange.go rename to pkg/events/exchange/exchange.go index e54707caa..a48d6bd2d 100644 --- a/events/exchange/exchange.go +++ b/pkg/events/exchange/exchange.go @@ -23,10 +23,10 @@ import ( "time" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/log" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" diff --git a/events/exchange/exchange_test.go b/pkg/events/exchange/exchange_test.go similarity index 99% rename from events/exchange/exchange_test.go rename to pkg/events/exchange/exchange_test.go index d419a4fa1..f1f50b9fb 100644 --- a/events/exchange/exchange_test.go +++ b/pkg/events/exchange/exchange_test.go @@ -24,8 +24,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" diff --git a/events/plugin/plugin.go b/pkg/events/plugin/plugin.go similarity index 94% rename from events/plugin/plugin.go rename to pkg/events/plugin/plugin.go index 09efb2be3..261ba5b33 100644 --- a/events/plugin/plugin.go +++ b/pkg/events/plugin/plugin.go @@ -17,7 +17,7 @@ package plugin import ( - "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go index e8b146d02..eb0c98d9d 100644 --- a/plugins/cri/images/plugin.go +++ b/plugins/cri/images/plugin.go @@ -25,10 +25,10 @@ import ( srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/events" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/server/images" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" diff --git a/plugins/metadata/plugin.go b/plugins/metadata/plugin.go index 80dbb264d..3e429dbd1 100644 --- a/plugins/metadata/plugin.go +++ b/plugins/metadata/plugin.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index 050c792b0..56f92d5f7 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime" diff --git a/plugins/services/containers/local.go b/plugins/services/containers/local.go index 4961188ee..35a173030 100644 --- a/plugins/services/containers/local.go +++ b/plugins/services/containers/local.go @@ -25,7 +25,7 @@ import ( "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/events" + "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 ea9368cc4..7f918daae 100644 --- a/plugins/services/content/store.go +++ b/plugins/services/content/store.go @@ -22,7 +22,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "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/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 b171ef6e5..8b2975aea 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/errdefs" - "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/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 ac9aa7481..440ab07f1 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/errdefs" - "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/plugins/services/images/local.go b/plugins/services/images/local.go index 76e558111..48e3f8ea2 100644 --- a/plugins/services/images/local.go +++ b/plugins/services/images/local.go @@ -29,10 +29,10 @@ import ( "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/events" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services/warning" diff --git a/plugins/services/namespaces/local.go b/plugins/services/namespaces/local.go index 9fb700757..ed808d1d7 100644 --- a/plugins/services/namespaces/local.go +++ b/plugins/services/namespaces/local.go @@ -24,8 +24,8 @@ import ( 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/events" "github.com/containerd/containerd/v2/namespaces" + "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/sandbox/controller_service.go b/plugins/services/sandbox/controller_service.go index 5275ad19b..c9fad23ca 100644 --- a/plugins/services/sandbox/controller_service.go +++ b/plugins/services/sandbox/controller_service.go @@ -28,7 +28,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/sandbox/v1" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index ae8a206a3..438a1697a 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -35,10 +35,10 @@ import ( "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/filters" "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/rdt" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 7737aa2e5..f620e7e46 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events/exchange" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index fa70d3c5e..5b272858d 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -39,8 +39,8 @@ import ( task "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events/exchange" "github.com/containerd/containerd/v2/identifiers" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/runtime/v2/shim/publisher.go b/runtime/v2/shim/publisher.go index c86d16eed..234627091 100644 --- a/runtime/v2/shim/publisher.go +++ b/runtime/v2/shim/publisher.go @@ -22,8 +22,8 @@ import ( "time" v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go index 591f4d84b..4d9c7f875 100644 --- a/runtime/v2/shim/shim.go +++ b/runtime/v2/shim/shim.go @@ -31,8 +31,8 @@ import ( "time" shimapi "github.com/containerd/containerd/v2/api/runtime/task/v3" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf"