From 8944c12f562590dfbb1ee500ba97524faf8a4a70 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 2 Feb 2022 11:00:45 -0800 Subject: [PATCH 1/2] Update releases document Move 1.4 EOL after 1.6 release. Update latest 1.4 and 1.5 versions. Signed-off-by: Derek McGowan --- RELEASES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index e5b5d10e7..cd7f45327 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -100,8 +100,8 @@ The current state is available in the following tables: | [1.1](https://github.com/containerd/containerd/releases/tag/v1.1.8) | End of Life | April 23, 2018 | October 23, 2019 | | [1.2](https://github.com/containerd/containerd/releases/tag/v1.2.13) | End of Life | October 24, 2018 | October 15, 2020 | | [1.3](https://github.com/containerd/containerd/releases/tag/v1.3.10) | End of Life | September 26, 2019 | March 4, 2021 | -| [1.4](https://github.com/containerd/containerd/releases/tag/v1.4.4) | Extended | August 17, 2020 | November 3, 2021 (Active), February 3, 2022 (Extended) | -| [1.5](https://github.com/containerd/containerd/releases/tag/v1.5.0) | Active | May 3, 2021 | max(May 3, 2022, release of 1.6.0 + 6 months) | +| [1.4](https://github.com/containerd/containerd/releases/tag/v1.4.12) | Extended | August 17, 2020 | November 3, 2021 (Active), March 3, 2022 (Extended) | +| [1.5](https://github.com/containerd/containerd/releases/tag/v1.5.9) | Active | May 3, 2021 | max(May 3, 2022, release of 1.6.0 + 6 months) | | [1.6](https://github.com/containerd/containerd/milestone/34) | Next | TBD | max(TBD+1 year, release of 1.7.0 or 2.0.0 + 6 months) | Note that branches and release from before 1.0 may not follow these rules. From a31e28e2c29361f1474dd69405f1db7ba9fca085 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 2 Feb 2022 11:01:31 -0800 Subject: [PATCH 2/2] Prepare release notes for v1.6.0-rc.2 Signed-off-by: Derek McGowan --- releases/v1.6.0-rc.toml | 1 + version/version.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/releases/v1.6.0-rc.toml b/releases/v1.6.0-rc.toml index 5740f79d3..f8fd59bc5 100644 --- a/releases/v1.6.0-rc.toml +++ b/releases/v1.6.0-rc.toml @@ -21,6 +21,7 @@ support to increase overall compatibility and stability. * **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)) +* **Handle sigint and sigterm in shimv2** ([#5828](https://github.com/containerd/containerd/pull/5828)) * **Decouple shim and task manager** ([#5918](https://github.com/containerd/containerd/pull/5918)) * **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)) diff --git a/version/version.go b/version/version.go index 030448a6b..a6ea4037f 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-rc.1+unknown" + Version = "1.6.0-rc.2+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.