Skip to content

Commit 28bdb71

Browse files
crosbymichaelcrosbymichael
authored
Merge pull request #3492 from Random-Liu/update-cri
Update cri to b213648
2 parents dce8541 + a5940da commit 28bdb71

160 files changed

Lines changed: 8347 additions & 5340 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/ctr/builtins_cri_linux.go‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎script/setup/install-critools‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
set -eu -o pipefail
2222

2323
go get -u github.com/onsi/ginkgo/ginkgo
24-
CRITEST_COMMIT=v1.13.0
24+
CRITEST_COMMIT=v1.15.0
2525
go get -d github.com/kubernetes-incubator/cri-tools/...
2626
cd $GOPATH/src/github.com/kubernetes-incubator/cri-tools
2727
git checkout $CRITEST_COMMIT

‎vendor.conf‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ github.com/google/go-cmp v0.2.0
4444
go.etcd.io/bbolt 2eb7227adea1d5cf85f0bc2a82b7059b13c2fa68
4545

4646
# cri dependencies
47-
github.com/containerd/cri 2fc62db8146ce66f27b37306ad5fda34207835f3 # master
48-
github.com/containerd/go-cni 891c2a41e18144b2d7921f971d6c9789a68046b2
47+
github.com/containerd/cri b213648c5bd0a1d2ee42709c10dff63fbfee3ad7 # master
48+
github.com/containerd/go-cni 22460c018b64cf8bf4151b3ff9c4d077e6a88cbf
4949
github.com/containernetworking/cni v0.6.0
5050
github.com/containernetworking/plugins v0.7.0
5151
github.com/davecgh/go-spew v1.1.0
@@ -67,12 +67,13 @@ golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4
6767
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
6868
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
6969
gopkg.in/yaml.v2 v2.2.1
70-
k8s.io/api kubernetes-1.15.0-alpha.0
71-
k8s.io/apimachinery kubernetes-1.15.0-alpha.0
72-
k8s.io/apiserver kubernetes-1.15.0-alpha.0
73-
k8s.io/client-go kubernetes-1.15.0-alpha.0
74-
k8s.io/klog 8139d8cb77af419532b33dfa7dd09fbc5f1d344f
75-
k8s.io/kubernetes v1.15.0-alpha.0
70+
k8s.io/api kubernetes-1.15.0
71+
k8s.io/apimachinery kubernetes-1.15.0
72+
k8s.io/apiserver kubernetes-1.15.0
73+
k8s.io/cri-api kubernetes-1.15.0
74+
k8s.io/client-go kubernetes-1.15.0
75+
k8s.io/klog v0.3.1
76+
k8s.io/kubernetes v1.15.0
7677
k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c
7778
sigs.k8s.io/yaml v1.1.0
7879

‎vendor/github.com/containerd/cri/README.md‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/cli/cli.go‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎vendor/github.com/containerd/cri/cri.go‎

Lines changed: 23 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)