aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-03 06:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

runtime: use containerd package instead of cri-containerd

Browse Source 
cri-containerd project has been merged into containerd repo, and
we should not reference it any more in code and docs.

This commit will use containerd package instead of cri-containerd
package.

Fixes: #2791

Signed-off-by: bin <bin@hyper.sh>
This commit is contained in:
bin
2021-10-06 08:24:38 +08:00
parent 6d55b1bafa
commit 76f16fd1a7
11 changed files with 68 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime/pkg/containerd-shim-v2/create.go
View File

@@ -27,10 +27,11 @@ import (
"github.com/pkg/errors"
// only register the proto type
crioption "github.com/containerd/containerd/pkg/runtimeoptions/v1"
_ "github.com/containerd/containerd/runtime/linux/runctypes"
_ "github.com/containerd/containerd/runtime/v2/runc/options"
oldcrioption "github.com/containerd/cri-containerd/pkg/api/runtimeoptions/v1"
crioption "github.com/containerd/containerd/pkg/runtimeoptions/v1"
oldcrioption "github.com/containerd/containerd/pkg/runtimeoptions/v1"
"github.com/kata-containers/kata-containers/src/runtime/pkg/katautils"
"github.com/kata-containers/kata-containers/src/runtime/pkg/katautils/katatrace"

2
src/runtime/pkg/containerd-shim-v2/create_test.go
View File

@@ -16,8 +16,8 @@ import (
"testing"
"github.com/containerd/containerd/namespaces"
crioption "github.com/containerd/containerd/pkg/runtimeoptions/v1"
taskAPI "github.com/containerd/containerd/runtime/v2/task"
crioption "github.com/containerd/cri-containerd/pkg/api/runtimeoptions/v1"
"github.com/containerd/typeurl"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert"