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

Update CRI to d779e9c9561b732adf06263c5424889e7564fdbd.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2017-06-20 22:19:20 +00:00
parent 166778361e
commit 862d00a21c
54 changed files with 3218 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/metadata/container.go
View File

@@ -20,7 +20,7 @@ import (
"encoding/json"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"github.com/kubernetes-incubator/cri-containerd/pkg/metadata/store"
)

2
pkg/metadata/container_test.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/kubernetes-incubator/cri-containerd/pkg/metadata/store"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)
func TestContainerState(t *testing.T) {

2
pkg/metadata/sandbox.go
View File

@@ -21,7 +21,7 @@ import (
"github.com/kubernetes-incubator/cri-containerd/pkg/metadata/store"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)
// TODO(random-liu): Handle versioning around all marshal/unmarshal.

2
pkg/metadata/sandbox_test.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/kubernetes-incubator/cri-containerd/pkg/metadata/store"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)
func TestSandboxStore(t *testing.T) {