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

Merge pull request #9321 from dmcgowan/switch-to-plugin-repo

Browse Source 
Switch to plugin repo
This commit is contained in:
Samuel Karp
2023-11-02 16:50:49 +00:00
committed by GitHub
parent 740717673f 411e2bce49
commit 6cd0e8e405
86 changed files with 498 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cri/cri.go
View File

@@ -26,10 +26,10 @@ import (
"github.com/containerd/containerd/v2/pkg/cri/server"
nriservice "github.com/containerd/containerd/v2/pkg/nri"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/log"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"k8s.io/klog/v2"

4
pkg/cri/server/podsandbox/controller.go
View File

@@ -34,11 +34,11 @@ import (
ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
osinterface "github.com/containerd/containerd/v2/pkg/os"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
)
func init() {

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

@@ -18,9 +18,9 @@ package plugin
import (
"github.com/containerd/containerd/v2/pkg/nri"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
)
func init() {