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

runtime: Revert "runtime: use containerd package instead of cri-containerd"

Browse Source 
This reverts commit 76f16fd1a7 to bring
back cri-containerd crioptions parsing so that kata works with older
containerd versions like v1.3.9 and v1.4.6.

Fixes: #2999
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Peng Tao
2021-11-10 15:45:33 +08:00
parent b192d388c1
commit eacfcdec19
11 changed files with 666 additions and 68 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,11 +27,10 @@ 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"
crioption "github.com/containerd/containerd/pkg/runtimeoptions/v1"
oldcrioption "github.com/containerd/containerd/pkg/runtimeoptions/v1"
oldcrioption "github.com/containerd/cri-containerd/pkg/api/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

@@ -15,8 +15,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"