From 37720fc6fdae4daf3c79794ad68f0e2c821f617c Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Fri, 22 Oct 2021 13:37:21 -0700 Subject: [PATCH 1/3] Update api vendor Signed-off-by: Derek McGowan --- go.mod | 2 +- integration/client/go.mod | 2 +- vendor/modules.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 148901748..03f35ab7b 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/containerd/btrfs v1.0.0 github.com/containerd/cgroups v1.0.2 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/fifo v1.0.0 github.com/containerd/go-cni v1.0.2 diff --git a/integration/client/go.mod b/integration/client/go.mod index 6833546ef..07a437d6e 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -8,7 +8,7 @@ require ( github.com/containerd/cgroups v1.0.2 // 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/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/ttrpc v1.0.2 github.com/containerd/typeurl v1.0.2 diff --git a/vendor/modules.txt b/vendor/modules.txt index aae08151c..309cbf8de 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -78,7 +78,7 @@ github.com/containerd/cgroups/v2/stats # github.com/containerd/console v1.0.3 ## explicit 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 github.com/containerd/containerd/api/events github.com/containerd/containerd/api/services/containers/v1 From e5fc3b38ee9f4e1788cac279e56966819f7af920 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 21 Oct 2021 17:24:37 -0700 Subject: [PATCH 2/3] Update mailmap Signed-off-by: Derek McGowan --- .mailmap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 5b67468a8..35a896745 100644 --- a/.mailmap +++ b/.mailmap @@ -62,6 +62,7 @@ Justin Terry Justin Terry Kenfe-Mickaël Laventure Kevin Kern +Kevin Parsons Kevin Xu Kitt Hsu Kohei Tokunaga @@ -71,6 +72,7 @@ Lantao Liu Li Yuxuan Lifubang Lu Jingxiao +Maksym Pavlenko <865334+mxpv@users.noreply.github.com> Maksym Pavlenko Maksym Pavlenko Mario Hros @@ -130,4 +132,5 @@ Zhiyu Li <404977848@qq.com> Zhongming Chang Zhoulin Xie Zhoulin Xie <42261994+JoeWrightss@users.noreply.github.com> +zounengren 张潇 From 0ccc386c86d94314f3c0460be395caadaa69ed49 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 21 Oct 2021 17:28:38 -0700 Subject: [PATCH 3/3] Prepare release notes for v1.6.0-beta.1 Signed-off-by: Derek McGowan --- releases/v1.6.0-beta.toml | 35 +++++++++++++++++++---------------- version/version.go | 2 +- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/releases/v1.6.0-beta.toml b/releases/v1.6.0-beta.toml index e66c9b53f..01e32e814 100644 --- a/releases/v1.6.0-beta.toml +++ b/releases/v1.6.0-beta.toml @@ -18,33 +18,36 @@ support to increase overall compatibility and stability. #### Runtime -* **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) -* **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) -* **Update shim client connect attempt to fail fast when shim errors** [#6031](https://github.com/containerd/containerd/pull/6031) +* **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)) +* **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)) +* **Update shim client connect attempt to fail fast when shim errors** ([#6031](https://github.com/containerd/containerd/pull/6031)) #### 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 -* **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 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 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 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 namespace to ttrpc and grpc plugin connections** ([#6130](https://github.com/containerd/containerd/pull/6130)) #### Other -* **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 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 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 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 OpenTelemetry trace injection to grpc client** ([#5992](https://github.com/containerd/containerd/pull/5992)) #### Client -* **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) +* **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)) See the changelog for complete list of changes""" diff --git a/version/version.go b/version/version.go index 83fb9313f..42e3d9853 100644 --- a/version/version.go +++ b/version/version.go @@ -23,7 +23,7 @@ var ( Package = "github.com/containerd/containerd" // 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 // the program at linking time.