Skip to content

Commit aba2013

Browse files
crosbymichaelcrosbymichael
authored
Merge pull request #3675 from Random-Liu/update-cri-release-1.3
Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be.
2 parents 9c10bf8 + cbbb6a2 commit aba2013

139 files changed

Lines changed: 48230 additions & 25855 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.

‎releases/v1.3.0-rc.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ This version of containerd is validated against v1.15, but it is also compatible
6767
* **Added tcp endpoint for CRI service.** The tcp service can be disabled with the `disable_tcp_service` option, and it is disabled by default. (https://github.com/containerd/cri/issues/1181)
6868
* **Added `max_concurrent_downloads` option to restrict the number of concurrent downloads for each image.** The default concurrency is `3`. (https://github.com/containerd/cri/pull/1211)
6969
* **Added `privileged_without_host_devices` runtime option to disable host devices for privileged pods for the runtime.** This is especially useful for runtimes like kata. (https://github.com/containerd/cri/issues/1213)
70+
* **Supported IPv4/IPv6 dualstack.** See Kubernetes [dual-stack doc](https://kubernetes.io/docs/concepts/services-networking/dual-stack) for more information. To enable dual-stack, your CNI plugin needs to support it. If you are using the CNI config template, see [how to configure it to support dual-stack](https://github.com/containerd/cri/blob/release/1.3/docs/config.md#cni-config-template).
7071
7172
#### Enhancements
7273
* Avoided `Status` lockup when CNI network setup/teardown is slow. (https://github.com/containerd/cri/issues/1078)

‎vendor.conf‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,34 +51,34 @@ github.com/cpuguy83/go-md2man v1.0.10
5151
github.com/russross/blackfriday v1.5.2
5252

5353
# cri dependencies
54-
github.com/containerd/cri f4d75d321c89b8d89bae570a7d2da1b3846c096f # release/1.3
54+
github.com/containerd/cri 4ea022f82a55c449bf15bfc62ac8b0de968d81be # release/1.3
5555
github.com/containerd/go-cni 49fbd9b210f3c8ee3b7fd3cd797aabaf364627c1
5656
github.com/containernetworking/cni v0.7.1
5757
github.com/containernetworking/plugins v0.7.6
5858
github.com/davecgh/go-spew v1.1.1
5959
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
6060
github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
6161
github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
62-
github.com/emicklei/go-restful v2.2.1
63-
github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1
64-
github.com/json-iterator/go 1.1.5
62+
github.com/emicklei/go-restful v2.9.5
63+
github.com/google/gofuzz v1.0.0
64+
github.com/json-iterator/go v1.1.7
6565
github.com/modern-go/reflect2 1.0.1
6666
github.com/modern-go/concurrent 1.0.3
6767
github.com/opencontainers/selinux v1.2.2
6868
github.com/seccomp/libseccomp-golang v0.9.1
6969
github.com/tchap/go-patricia v2.2.6
70-
golang.org/x/crypto 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
71-
golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a
72-
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
70+
golang.org/x/crypto 5c40567a22f818bd14a1ea7245dad9f8ef0691aa
71+
golang.org/x/oauth2 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33
72+
golang.org/x/time 85acf8d2951cb2a3bde7632f9ff273ef0379bcbd
7373
gopkg.in/inf.v0 v0.9.0
74-
gopkg.in/yaml.v2 v2.2.1
75-
k8s.io/api kubernetes-1.15.0
76-
k8s.io/apimachinery kubernetes-1.15.0
77-
k8s.io/apiserver kubernetes-1.15.0
78-
k8s.io/cri-api kubernetes-1.15.0
79-
k8s.io/client-go kubernetes-1.15.0
80-
k8s.io/klog v0.3.1
81-
k8s.io/kubernetes v1.15.0
74+
gopkg.in/yaml.v2 v2.2.2
75+
k8s.io/api kubernetes-1.16.0-rc.2
76+
k8s.io/apimachinery kubernetes-1.16.0-rc.2
77+
k8s.io/apiserver kubernetes-1.16.0-rc.2
78+
k8s.io/cri-api kubernetes-1.16.0-rc.2
79+
k8s.io/client-go kubernetes-1.16.0-rc.2
80+
k8s.io/klog v0.4.0
81+
k8s.io/kubernetes v1.16.0-rc.2
8282
k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c
8383
sigs.k8s.io/yaml v1.1.0
8484

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

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

Lines changed: 1 addition & 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/sandbox_run.go‎

Lines changed: 36 additions & 16 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/sandbox_status.go‎

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

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

Lines changed: 56 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/store/sandbox/metadata.go‎

Lines changed: 2 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)