github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6144 from dmcgowan/prepare-v1.6.0-beta.1

Browse Source 
Prepare v1.6.0-beta.1
This commit is contained in:
Derek McGowan
2021-10-22 14:39:38 -07:00
committed by GitHub
parent fc5c51d5f4 0ccc386c86
commit 45c5298700
6 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.mailmap
View File

@@ -62,6 +62,7 @@ Justin Terry <juterry@microsoft.com>
Justin Terry <juterry@microsoft.com> <jterry75@users.noreply.github.com> Justin Terry <juterry@microsoft.com> <jterry75@users.noreply.github.com>
Kenfe-Mickaël Laventure <mickael.laventure@gmail.com> Kenfe-Mickaël Laventure <mickael.laventure@gmail.com>
Kevin Kern <kaiwentan@harmonycloud.cn> Kevin Kern <kaiwentan@harmonycloud.cn>
Kevin Parsons <kevpar@microsoft.com> <kevpar@users.noreply.github.com>
Kevin Xu <cming.xu@gmail.com> Kevin Xu <cming.xu@gmail.com>
Kitt Hsu <kitt.hsu@gmail.com> Kitt Hsu <kitt.hsu@gmail.com>
Kohei Tokunaga <ktokunaga.mail@gmail.com> Kohei Tokunaga <ktokunaga.mail@gmail.com>
@@ -71,6 +72,7 @@ Lantao Liu <lantaol@google.com> <taotaotheripper@gmail.com>
Li Yuxuan <liyuxuan04@baidu.com> <darfux@163.com> Li Yuxuan <liyuxuan04@baidu.com> <darfux@163.com>
Lifubang <lifubang@aliyun.com> <lifubang@acmcoder.com> Lifubang <lifubang@aliyun.com> <lifubang@acmcoder.com>
Lu Jingxiao <lujingxiao@huawei.com> Lu Jingxiao <lujingxiao@huawei.com>
Maksym Pavlenko <pavlenko.maksym@gmail.com> <865334+mxpv@users.noreply.github.com>
Maksym Pavlenko <pavlenko.maksym@gmail.com> <makpav@amazon.com> Maksym Pavlenko <pavlenko.maksym@gmail.com> <makpav@amazon.com>
Maksym Pavlenko <pavlenko.maksym@gmail.com> <mxpv@apple.com> Maksym Pavlenko <pavlenko.maksym@gmail.com> <mxpv@apple.com>
Mario Hros <spam@k3a.me> Mario Hros <spam@k3a.me>
@@ -130,4 +132,5 @@ Zhiyu Li <payall4u@qq.com> <404977848@qq.com>
Zhongming Chang<zhongming.chang@daocloud.io> Zhongming Chang<zhongming.chang@daocloud.io>
Zhoulin Xie <zhoulin.xie@daocloud.io> Zhoulin Xie <zhoulin.xie@daocloud.io>
Zhoulin Xie <zhoulin.xie@daocloud.io> <42261994+JoeWrightss@users.noreply.github.com> Zhoulin Xie <zhoulin.xie@daocloud.io> <42261994+JoeWrightss@users.noreply.github.com>
zounengren <zouyee1989@gmail.com> <zounengren@cmss.chinamobile.com>
张潇 <xiaozhang0210@hotmail.com> 张潇 <xiaozhang0210@hotmail.com>

2
go.mod
View File

@@ -10,7 +10,7 @@ require (
github.com/containerd/btrfs v1.0.0 github.com/containerd/btrfs v1.0.0
github.com/containerd/cgroups v1.0.2 github.com/containerd/cgroups v1.0.2
github.com/containerd/console v1.0.3 github.com/containerd/console v1.0.3
github.com/containerd/containerd/api v0.0.0 github.com/containerd/containerd/api v1.6.0-beta.1
github.com/containerd/continuity v0.2.0 github.com/containerd/continuity v0.2.0
github.com/containerd/fifo v1.0.0 github.com/containerd/fifo v1.0.0
github.com/containerd/go-cni v1.1.0 github.com/containerd/go-cni v1.1.0

2
integration/client/go.mod
View File

@@ -8,7 +8,7 @@ require (
github.com/containerd/cgroups v1.0.2 github.com/containerd/cgroups v1.0.2
// the actual version of containerd is replaced with the code at the root of this repository // the actual version of containerd is replaced with the code at the root of this repository
github.com/containerd/containerd v1.5.7 github.com/containerd/containerd v1.5.7
github.com/containerd/containerd/api v0.0.0 github.com/containerd/containerd/api v1.6.0-beta.1
github.com/containerd/go-runc v1.0.0 github.com/containerd/go-runc v1.0.0
github.com/containerd/ttrpc v1.0.2 github.com/containerd/ttrpc v1.0.2
github.com/containerd/typeurl v1.0.2 github.com/containerd/typeurl v1.0.2

35
releases/v1.6.0-beta.toml
View File

@@ -18,33 +18,36 @@ support to increase overall compatibility and stability.
#### Runtime #### Runtime
* **Add runtime label to metrics** [#5744](https://github.com/containerd/containerd/pull/5744) * **Add runtime label to metrics** ([#5744](https://github.com/containerd/containerd/pull/5744))
* **Cleanup task delete logic in v2 shim** [#5813](https://github.com/containerd/containerd/pull/5813) * **Cleanup task delete logic in v2 shim** ([#5813](https://github.com/containerd/containerd/pull/5813))
* **Add support for shim plugins** [#5817](https://github.com/containerd/containerd/pull/5817) * **Add support for shim plugins** ([#5817](https://github.com/containerd/containerd/pull/5817))
* **Add runc shim support for core scheduling** [#6011](https://github.com/containerd/containerd/pull/6011) * **Add runc shim support for core scheduling** ([#6011](https://github.com/containerd/containerd/pull/6011))
* **Update shim client connect attempt to fail fast when shim errors** [#6031](https://github.com/containerd/containerd/pull/6031) * **Update shim client connect attempt to fail fast when shim errors** ([#6031](https://github.com/containerd/containerd/pull/6031))
#### Windows #### Windows
* **Add support for Windows HostProcess containers** [#5131](https://github.com/containerd/containerd/pull/5131) * **Add support for Windows HostProcess containers** ([#5131](https://github.com/containerd/containerd/pull/5131))
* **Add support for Windows resource limits** ([#5778](https://github.com/containerd/containerd/pull/5778))
#### CRI #### CRI
* **Add CNI configuration based on runtime class** [#4695](https://github.com/containerd/containerd/pull/4695) * **Add CNI configuration based on runtime class** ([#4695](https://github.com/containerd/containerd/pull/4695))
* **Add support for CRI v1 and v1alpha in parallel** [#5619](https://github.com/containerd/containerd/pull/5619) * **Add support for CRI v1 and v1alpha in parallel** ([#5619](https://github.com/containerd/containerd/pull/5619))
* **Add support for unified resources field for cgroups v2** [#5627](https://github.com/containerd/containerd/pull/5627) * **Add support for unified resources field for cgroups v2** ([#5627](https://github.com/containerd/containerd/pull/5627))
* **Add IP preference configuration for reporting pod IP** [#5964](https://github.com/containerd/containerd/pull/5964) * **Add IP preference configuration for reporting pod IP** ([#5964](https://github.com/containerd/containerd/pull/5964))
* **Add namespace to ttrpc and grpc plugin connections** ([#6130](https://github.com/containerd/containerd/pull/6130))
#### Other #### Other
* **Add a shared namespace label for cross-namespace content sharing** [#5043](https://github.com/containerd/containerd/pull/5043) * **Add a shared namespace label for cross-namespace content sharing** ([#5043](https://github.com/containerd/containerd/pull/5043))
* **Add support for client TLS Auth for grpc** [#5606](https://github.com/containerd/containerd/pull/5606) * **Add support for client TLS Auth for grpc** ([#5606](https://github.com/containerd/containerd/pull/5606))
* **Add xfs support for devicemapper snapshotter** [#5610](https://github.com/containerd/containerd/pull/5610) * **Add xfs support for devicemapper snapshotter** ([#5610](https://github.com/containerd/containerd/pull/5610))
* **Add metric exposing build version and revision** [#5965](https://github.com/containerd/containerd/pull/5965) * **Add metric exposing build version and revision** ([#5965](https://github.com/containerd/containerd/pull/5965))
* **Add OpenTelemetry trace injection to grpc client** ([#5992](https://github.com/containerd/containerd/pull/5992))
#### Client #### Client
* **Allow WithServices to use custom implementations** [#5709](https://github.com/containerd/containerd/pull/5709) * **Allow WithServices to use custom implementations** ([#5709](https://github.com/containerd/containerd/pull/5709))
* **Support custom compressor for walking differ** [#5735](https://github.com/containerd/containerd/pull/5735) * **Support custom compressor for walking differ** ([#5735](https://github.com/containerd/containerd/pull/5735))
See the changelog for complete list of changes""" See the changelog for complete list of changes"""

2
vendor/modules.txt vendored
View File

@@ -78,7 +78,7 @@ github.com/containerd/cgroups/v2/stats
# github.com/containerd/console v1.0.3 # github.com/containerd/console v1.0.3
## explicit ## explicit
github.com/containerd/console github.com/containerd/console
# github.com/containerd/containerd/api v0.0.0 => ./api # github.com/containerd/containerd/api v1.6.0-beta.1 => ./api
## explicit ## explicit
github.com/containerd/containerd/api/events github.com/containerd/containerd/api/events
github.com/containerd/containerd/api/services/containers/v1 github.com/containerd/containerd/api/services/containers/v1

2
version/version.go
View File

@@ -23,7 +23,7 @@ var (
Package = "github.com/containerd/containerd" Package = "github.com/containerd/containerd"
// Version holds the complete version number. Filled in at linking time. // Version holds the complete version number. Filled in at linking time.
Version = "1.6.0-beta.0+unknown" Version = "1.6.0-beta.1+unknown"
// Revision is filled with the VCS (e.g. git) revision being used to build // Revision is filled with the VCS (e.g. git) revision being used to build
// the program at linking time. // the program at linking time.