Skip to content

Commit ab9942c

Browse files
Random-LiuRandom-Liu
committed
Update cri to 9f39e32.
Signed-off-by: Lantao Liu <[email protected]>
1 parent 0dc7636 commit ab9942c

138 files changed

Lines changed: 6971 additions & 4446 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.

‎vendor.conf‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,41 +43,42 @@ 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 v1.11.1
47-
github.com/containerd/go-cni 5882530828ecf62032409b298a3e8b19e08b6534
46+
github.com/containerd/cri 9f39e3289533fc228c5e5fcac0a6dbdd60c6047b # release/1.2 branch
47+
github.com/containerd/go-cni 6d7b509a054a3cb1c35ed1865d4fde2f0cb547cd
4848
github.com/blang/semver v3.1.0
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
5252
github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621
5353
github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
5454
github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
55-
github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46
56-
github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee
55+
github.com/emicklei/go-restful v2.2.1
56+
github.com/ghodss/yaml v1.0.0
5757
github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed
5858
github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c
5959
github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55
6060
github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f
61-
github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682
62-
github.com/modern-go/reflect2 05fbef0ca5da472bbf96c9322b84a53edc03c9fd
61+
github.com/json-iterator/go 1.1.5
62+
github.com/modern-go/reflect2 1.0.1
6363
github.com/modern-go/concurrent 1.0.3
6464
github.com/opencontainers/runtime-tools v0.6.0
65-
github.com/opencontainers/selinux 4a2974bf1ee960774ffd517717f1f45325af0206
65+
github.com/opencontainers/selinux b6fa367ed7f534f9ba25391cc2d467085dbb445a
6666
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
67-
github.com/tchap/go-patricia 5ad6cdb7538b0097d5598c7e57f0a24072adf7dc
67+
github.com/tchap/go-patricia v2.2.6
6868
github.com/xeipuuv/gojsonpointer 4e3ac2762d5f479393488629ee9370b50873b3a6
6969
github.com/xeipuuv/gojsonreference bd5ef7bd5415a7ac448318e64f11a24cd21e594b
7070
github.com/xeipuuv/gojsonschema 1d523034197ff1f222f6429836dd36a2457a1874
7171
golang.org/x/crypto 49796115aa4b964c318aad4f3084fdb41e9aa067
72+
golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4
7273
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
7374
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
7475
gopkg.in/yaml.v2 v2.2.1
75-
k8s.io/api 9e5ffd1f1320950b238cfce291b926411f0af722
76-
k8s.io/apimachinery ed135c5b96450fd24e5e981c708114fbbd950697
77-
k8s.io/apiserver a90e3a95c2e91b944bfca8225c4e0d12e42a9eb5
78-
k8s.io/client-go 03bfb9bdcfe5482795b999f39ca3ed9ad42ce5bb
79-
k8s.io/kubernetes v1.11.0
80-
k8s.io/utils 733eca437aa39379e4bcc25e726439dfca40fcff
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
8182

8283
# zfs dependencies
8384
github.com/containerd/zfs 9a0b8b8b5982014b729cd34eb7cd7a11062aa6ec

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

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/cri.go‎

Lines changed: 16 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/config/config.go‎

Lines changed: 32 additions & 5 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/containerd/importer/importer.go‎

Lines changed: 27 additions & 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/containerd/opts/spec.go‎

Lines changed: 51 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/os/os.go‎

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

0 commit comments

Comments
 (0)