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

update kubernetes vendor for new CRI change

Browse Source 
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
This commit is contained in:
Crazykev
2017-05-23 19:31:47 +08:00
parent 6ce1dc0167
commit 49e7ef2153
48 changed files with 1567 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/events_test.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd/api/types/container"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"github.com/kubernetes-incubator/cri-containerd/pkg/metadata"
servertesting "github.com/kubernetes-incubator/cri-containerd/pkg/server/testing"