Skip to content

Commit a044b04

Browse files
estespestesp
authored
Merge pull request containerd#2430 from Random-Liu/update-cri-to-v1.11.0
Update cri to v1.11.0.
2 parents e51ddf4 + f530a3c commit a044b04

File tree

267 files changed

+23296
-15460
lines changed

Some content is hidden

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

267 files changed

+23296
-15460
lines changed

‎vendor.conf‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
4242
gotest.tools v2.1.0
4343
github.com/google/go-cmp v0.1.0
4444

45-
github.com/containerd/cri 8bcb9a95394e8d7845da1d6a994d3ac2a86d22f0
46-
github.com/containerd/go-cni f2d7272f12d045b16ed924f50e91f9f9cecc55a7
45+
# cri dependencies
46+
github.com/containerd/cri v1.11.0
47+
github.com/containerd/go-cni 5882530828ecf62032409b298a3e8b19e08b6534
4748
github.com/blang/semver v3.1.0
4849
github.com/containernetworking/cni v0.6.0
4950
github.com/containernetworking/plugins v0.7.0
@@ -57,22 +58,26 @@ github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed
5758
github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c
5859
github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55
5960
github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f
60-
github.com/json-iterator/go 1.0.4
61-
github.com/opencontainers/runtime-tools 6073aff4ac61897f75895123f7e24135204a404d
61+
github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682
62+
github.com/modern-go/reflect2 05fbef0ca5da472bbf96c9322b84a53edc03c9fd
63+
github.com/modern-go/concurrent 1.0.3
64+
github.com/opencontainers/runtime-tools v0.6.0
6265
github.com/opencontainers/selinux 4a2974bf1ee960774ffd517717f1f45325af0206
6366
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
64-
github.com/spf13/pflag v1.0.0
6567
github.com/tchap/go-patricia 5ad6cdb7538b0097d5598c7e57f0a24072adf7dc
68+
github.com/xeipuuv/gojsonpointer 4e3ac2762d5f479393488629ee9370b50873b3a6
69+
github.com/xeipuuv/gojsonreference bd5ef7bd5415a7ac448318e64f11a24cd21e594b
70+
github.com/xeipuuv/gojsonschema 1d523034197ff1f222f6429836dd36a2457a1874
6671
golang.org/x/crypto 49796115aa4b964c318aad4f3084fdb41e9aa067
6772
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
6873
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
6974
gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77
70-
k8s.io/api 7e796de92438aede7cb5d6bcf6c10f4fa65db560
71-
k8s.io/apimachinery fcb9a12f7875d01f8390b28faedc37dcf2e713b9
72-
k8s.io/apiserver 4a8377c547bbff4576a35b5b5bf4026d9b5aa763
73-
k8s.io/client-go b9a0cf870f239c4a4ecfd3feb075a50e7cbe1473
74-
k8s.io/kubernetes v1.10.0
75-
k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e
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
7681

7782
# zfs dependencies
7883
github.com/containerd/zfs 9a0b8b8b5982014b729cd34eb7cd7a11062aa6ec

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

Lines changed: 12 additions & 7 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/opts/container.go‎

Lines changed: 0 additions & 9 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/ioutil/write_closer.go‎

Lines changed: 35 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/server/container_create.go‎

Lines changed: 65 additions & 12 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/container_execsync.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/server/container_log_reopen.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)