diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 45a2f6d14..c2dbcdc47 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -19,12 +19,12 @@ package builtins // register containerd builtins here import ( _ "github.com/containerd/containerd/v2/core/runtime/v2" - _ "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" _ "github.com/containerd/containerd/v2/plugins/metadata" + _ "github.com/containerd/containerd/v2/plugins/nri" _ "github.com/containerd/containerd/v2/plugins/restart" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/services/containers" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 8800e4a37..43528438f 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -19,7 +19,6 @@ package fuzz import ( // base containerd imports _ "github.com/containerd/containerd/v2/core/runtime/v2" - _ "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" @@ -29,6 +28,7 @@ import ( _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" + _ "github.com/containerd/containerd/v2/plugins/nri" _ "github.com/containerd/containerd/v2/plugins/restart" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/services/containers" diff --git a/contrib/v2-migrate.sh b/contrib/v2-migrate.sh index e045bf5de..d96a61364 100755 --- a/contrib/v2-migrate.sh +++ b/contrib/v2-migrate.sh @@ -52,6 +52,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\/pkg\/failpoint/$1$2"github.com\/containerd\/containerd\/v2\/internal\/failpoint/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/hasher/$1$2"github.com\/containerd\/containerd\/v2\/internal\/hasher/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/kmutex/$1$2"github.com\/containerd\/containerd\/v2\/internal\/kmutex/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/nri\/plugin/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/nri/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/nri/$1$2"github.com\/containerd\/containerd\/v2\/internal\/nri/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/randutil/$1$2"github.com\/containerd\/containerd\/v2\/internal\/randutil/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/registrar/$1$2"github.com\/containerd\/containerd\/v2\/internal\/registrar/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/streaming/$1$2"github.com\/containerd\/containerd\/v2\/core\/streaming/g' $GOFILE diff --git a/internal/cri/nri/nri_api_linux.go b/internal/cri/nri/nri_api_linux.go index 5387415b7..c57e67fd5 100644 --- a/internal/cri/nri/nri_api_linux.go +++ b/internal/cri/nri/nri_api_linux.go @@ -36,7 +36,7 @@ import ( "github.com/opencontainers/runtime-tools/generate" cri "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/pkg/nri" + "github.com/containerd/containerd/v2/internal/nri" "github.com/containerd/nri/pkg/api" nrigen "github.com/containerd/nri/pkg/runtime-tools/generate" ) diff --git a/internal/cri/nri/nri_api_other.go b/internal/cri/nri/nri_api_other.go index 33ae5891b..a8b3dfedb 100644 --- a/internal/cri/nri/nri_api_other.go +++ b/internal/cri/nri/nri_api_other.go @@ -29,7 +29,7 @@ import ( cri "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/internal/cri/constants" - "github.com/containerd/containerd/v2/pkg/nri" + "github.com/containerd/containerd/v2/internal/nri" "github.com/containerd/nri/pkg/api" ) diff --git a/pkg/nri/config.go b/internal/nri/config.go similarity index 100% rename from pkg/nri/config.go rename to internal/nri/config.go diff --git a/pkg/nri/container.go b/internal/nri/container.go similarity index 100% rename from pkg/nri/container.go rename to internal/nri/container.go diff --git a/pkg/nri/container_linux.go b/internal/nri/container_linux.go similarity index 100% rename from pkg/nri/container_linux.go rename to internal/nri/container_linux.go diff --git a/pkg/nri/container_other.go b/internal/nri/container_other.go similarity index 100% rename from pkg/nri/container_other.go rename to internal/nri/container_other.go diff --git a/pkg/nri/domain.go b/internal/nri/domain.go similarity index 100% rename from pkg/nri/domain.go rename to internal/nri/domain.go diff --git a/pkg/nri/nri.go b/internal/nri/nri.go similarity index 100% rename from pkg/nri/nri.go rename to internal/nri/nri.go diff --git a/pkg/nri/sandbox.go b/internal/nri/sandbox.go similarity index 100% rename from pkg/nri/sandbox.go rename to internal/nri/sandbox.go diff --git a/pkg/nri/sandbox_linux.go b/internal/nri/sandbox_linux.go similarity index 100% rename from pkg/nri/sandbox_linux.go rename to internal/nri/sandbox_linux.go diff --git a/pkg/nri/sandbox_other.go b/internal/nri/sandbox_other.go similarity index 100% rename from pkg/nri/sandbox_other.go rename to internal/nri/sandbox_other.go diff --git a/plugins/cri/cri.go b/plugins/cri/cri.go index 4151e4393..07f174a95 100644 --- a/plugins/cri/cri.go +++ b/plugins/cri/cri.go @@ -34,7 +34,7 @@ import ( "github.com/containerd/containerd/v2/internal/cri/instrument" "github.com/containerd/containerd/v2/internal/cri/nri" "github.com/containerd/containerd/v2/internal/cri/server" - nriservice "github.com/containerd/containerd/v2/pkg/nri" + nriservice "github.com/containerd/containerd/v2/internal/nri" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/warning" "github.com/containerd/containerd/v2/version" diff --git a/pkg/nri/plugin/plugin.go b/plugins/nri/plugin.go similarity index 94% rename from pkg/nri/plugin/plugin.go rename to plugins/nri/plugin.go index a918b0917..31b60457e 100644 --- a/pkg/nri/plugin/plugin.go +++ b/plugins/nri/plugin.go @@ -14,10 +14,10 @@ limitations under the License. */ -package plugin +package nri import ( - "github.com/containerd/containerd/v2/pkg/nri" + "github.com/containerd/containerd/v2/internal/nri" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry"