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

Merge pull request #1215 from Random-Liu/update-kubernetes

Browse Source 
Update kubernetes
This commit is contained in:
Lantao Liu
2019-08-01 10:28:25 -07:00
committed by GitHub
parent fe5eb76cb4 8a5b6b8dff
commit f636fb0519
183 changed files with 7514 additions and 3672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/container_create.go
View File

@@ -34,7 +34,7 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
"github.com/containerd/cri/pkg/annotations"
customopts "github.com/containerd/cri/pkg/containerd/opts"