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

Merge pull request #9892 from dmcgowan/move-nri-packages

Browse Source 
Move nri packages to plugin and internal
This commit is contained in:
Maksym Pavlenko 2024-03-05 01:31:52 +00:00 committed by GitHub
commit c3dc7209f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/containerd/builtins/builtins.go
View File

@ -19,12 +19,12 @@ package builtins
// register containerd builtins here // register containerd builtins here
import ( import (
_ "github.com/containerd/containerd/v2/core/runtime/v2" _ "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/events"
_ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/gc"
_ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/imageverifier"
_ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/leases"
_ "github.com/containerd/containerd/v2/plugins/metadata" _ "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/restart"
_ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/services/containers" _ "github.com/containerd/containerd/v2/plugins/services/containers"

2
contrib/fuzz/builtins.go
View File

@ -19,7 +19,6 @@ package fuzz
import ( import (
// base containerd imports // base containerd imports
_ "github.com/containerd/containerd/v2/core/runtime/v2" _ "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"
_ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/cri/images"
_ "github.com/containerd/containerd/v2/plugins/cri/runtime" _ "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/imageverifier"
_ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/leases"
_ "github.com/containerd/containerd/v2/plugins/metadata" _ "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/restart"
_ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/services/containers" _ "github.com/containerd/containerd/v2/plugins/services/containers"

2
contrib/v2-migrate.sh
View File

@ -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\/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\/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\/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\/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\/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 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

2
internal/cri/nri/nri_api_linux.go
View File

@ -36,7 +36,7 @@ import (
"github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/generate"
cri "k8s.io/cri-api/pkg/apis/runtime/v1" 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" "github.com/containerd/nri/pkg/api"
nrigen "github.com/containerd/nri/pkg/runtime-tools/generate" nrigen "github.com/containerd/nri/pkg/runtime-tools/generate"
) )

2
internal/cri/nri/nri_api_other.go
View File

@ -29,7 +29,7 @@ import (
cri "k8s.io/cri-api/pkg/apis/runtime/v1" cri "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/v2/internal/cri/constants" "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" "github.com/containerd/nri/pkg/api"
) )

0
pkg/nri/config.go → internal/nri/config.go
View File

0
pkg/nri/container.go → internal/nri/container.go
View File

0
pkg/nri/container_linux.go → internal/nri/container_linux.go
View File

0
pkg/nri/container_other.go → internal/nri/container_other.go
View File

0
pkg/nri/domain.go → internal/nri/domain.go
View File

0
pkg/nri/nri.go → internal/nri/nri.go
View File

0
pkg/nri/sandbox.go → internal/nri/sandbox.go
View File

0
pkg/nri/sandbox_linux.go → internal/nri/sandbox_linux.go
View File

0
pkg/nri/sandbox_other.go → internal/nri/sandbox_other.go
View File

2
plugins/cri/cri.go
View File

@ -34,7 +34,7 @@ import (
"github.com/containerd/containerd/v2/internal/cri/instrument" "github.com/containerd/containerd/v2/internal/cri/instrument"
"github.com/containerd/containerd/v2/internal/cri/nri" "github.com/containerd/containerd/v2/internal/cri/nri"
"github.com/containerd/containerd/v2/internal/cri/server" "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"
"github.com/containerd/containerd/v2/plugins/services/warning" "github.com/containerd/containerd/v2/plugins/services/warning"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"

4
pkg/nri/plugin/plugin.go → plugins/nri/plugin.go
View File

@ -14,10 +14,10 @@
limitations under the License. limitations under the License.
*/ */
package plugin package nri
import ( import (
"github.com/containerd/containerd/v2/pkg/nri" "github.com/containerd/containerd/v2/internal/nri"
"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"