update kubernetes vendor for new CRI change

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

View File

@@ -21,6 +21,7 @@ import (
"os"
"testing"
"github.com/containerd/containerd/api/services/execution"
"github.com/docker/docker/pkg/truncindex"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -32,9 +33,7 @@ import (
"github.com/kubernetes-incubator/cri-containerd/pkg/registrar"
servertesting "github.com/kubernetes-incubator/cri-containerd/pkg/server/testing"
"github.com/containerd/containerd/api/services/execution"
"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
)
type nopReadWriteCloser struct{}
@@ -100,7 +99,6 @@ func TestSandboxOperations(t *testing.T) {
Network: &runtime.PodSandboxNetworkStatus{},
Linux: &runtime.LinuxPodSandboxStatus{
Namespaces: &runtime.Namespace{
Network: netns,
Options: &runtime.NamespaceOption{
HostNetwork: false,
HostPid: false,