Skip to content

Commit 88bfc17

Browse files
Random-LiuRandom-Liu
committed
Update cri to 8506fe836677cc3bb23a16b68145128243d843b5.
Signed-off-by: Lantao Liu <[email protected]>
1 parent 0c5f8f6 commit 88bfc17

19 files changed

Lines changed: 1028 additions & 895 deletions

File tree

‎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=f37a5a1edb69ee742c6e42c57413fe6b63788085
24+
CRITEST_COMMIT=v1.12.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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ github.com/google/go-cmp v0.1.0
4343
go.etcd.io/bbolt v1.3.1-etcd.8
4444

4545
# cri dependencies
46-
github.com/containerd/cri 9f39e3289533fc228c5e5fcac0a6dbdd60c6047b # release/1.2 branch
46+
github.com/containerd/cri 8506fe836677cc3bb23a16b68145128243d843b5 # release/1.2 branch
4747
github.com/containerd/go-cni 6d7b509a054a3cb1c35ed1865d4fde2f0cb547cd
4848
github.com/blang/semver v3.1.0
4949
github.com/containernetworking/cni v0.6.0
@@ -73,12 +73,12 @@ golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4
7373
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
7474
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
7575
gopkg.in/yaml.v2 v2.2.1
76-
k8s.io/api 012f271b5d41baad56190c5f1ae19bff16df0fd8
77-
k8s.io/apimachinery 6429050ef506887d121f3e7306e894f8900d8a63
78-
k8s.io/apiserver e9312c15296b6c2c923ebd5031ff5d1d5fd022d7
79-
k8s.io/client-go 37c3c02ec96533daec0dbda1f39a6b1d68505c79
80-
k8s.io/kubernetes v1.12.0-beta.1
81-
k8s.io/utils 982821ea41da7e7c15f3d3738921eb2e7e241ccd
76+
k8s.io/api kubernetes-1.12.0
77+
k8s.io/apimachinery kubernetes-1.12.0
78+
k8s.io/apiserver kubernetes-1.12.0
79+
k8s.io/client-go kubernetes-1.12.0
80+
k8s.io/kubernetes v1.12.0
81+
k8s.io/utils cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb
8282

8383
# zfs dependencies
8484
github.com/containerd/zfs 9a0b8b8b5982014b729cd34eb7cd7a11062aa6ec

‎vendor/github.com/containerd/cri/pkg/server/events.go‎

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

‎vendor/github.com/containerd/cri/pkg/server/helpers.go‎

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

‎vendor/github.com/containerd/cri/pkg/server/image_load.go‎

Lines changed: 5 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/pkg/server/image_pull.go‎

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

‎vendor/github.com/containerd/cri/pkg/server/restart.go‎

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

‎vendor/github.com/containerd/cri/pkg/server/service.go‎

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

‎vendor/github.com/containerd/cri/pkg/store/image/fake_image.go‎

Lines changed: 1 addition & 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)