From f2da3fd688adef87716d1ecd9811a7c4deab72fd Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Sun, 3 Nov 2024 23:39:35 -0800 Subject: [PATCH 1/2] Update release docs for v2.0.0 Signed-off-by: Derek McGowan --- README.md | 2 +- RELEASES.md | 11 ++++++----- releases/cri-containerd.DEPRECATED.txt | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 04469f2792..28ee01e7aa 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ containerd is designed to be embedded into a larger system, rather than being us ## Announcements -### containerd v2.0 is coming soon +### containerd v2.0 is now released! See [`docs/containerd-2.0.md`](docs/containerd-2.0.md). ### Now Recruiting diff --git a/RELEASES.md b/RELEASES.md index 5e953331c1..cba41f8b31 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -117,9 +117,10 @@ The current state is available in the following tables: | [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.13) | End of Life | August 17, 2020 | March 3, 2022 | | [1.5](https://github.com/containerd/containerd/releases/tag/v1.5.18) | End of Life | May 3, 2021 | February 28, 2023 | -| [1.6](https://github.com/containerd/containerd/releases/tag/v1.6.23) | LTS | February 15, 2022 | max(February 15, 2025 or next LTS + 6 months) | -| [1.7](https://github.com/containerd/containerd/releases/tag/v1.7.3) | Active | March 10, 2023 | active(release of 2.0 + 6 months), extended(EOL of 1.6) | -| [2.0](https://github.com/containerd/containerd/milestone/35) | Next | TBD | TBD | +| [1.6](https://github.com/containerd/containerd/releases/tag/v1.6.36) | LTS | February 15, 2022 | next LTS + 6 months | +| [1.7](https://github.com/containerd/containerd/releases/tag/v1.7.23) | Active | March 10, 2023 | active(May 5, 2025), extended(EOL of 1.6) | +| [2.0](https://github.com/containerd/containerd/releases/tag/v2.0.0) | Active | November 5, 2024 | max(November 5, 2025 or release of 2.1 + 6 months) | +| [2.1](https://github.com/containerd/containerd/milestone/48) | Next | TBD | TBD | > **_NOTE_** containerd v1.7 will end of life at the same time as v1.6 LTS. Due to > [Minimal Version Selection](https://go.dev/ref/mod#minimal-version-selection) used @@ -141,8 +142,8 @@ of containerd for every supported version of Kubernetes. | Kubernetes Version | containerd Version | CRI Version | |--------------------|-------------------------------|-----------------| | 1.29 | 1.7.11+, 1.6.27+ | v1 | -| 1.30 | 2.0(wip), 1.7.13+, 1.6.28+ | v1 | -| 1.31 | 2.0(wip), 1.7.20+, 1.6.34+ | v1 | +| 1.30 | 2.0.0+, 1.7.13+, 1.6.28+ | v1 | +| 1.31 | 2.0.0+, 1.7.20+, 1.6.34+ | v1 | Deprecated containerd and kubernetes versions diff --git a/releases/cri-containerd.DEPRECATED.txt b/releases/cri-containerd.DEPRECATED.txt index 014103407c..a7d267a698 100644 --- a/releases/cri-containerd.DEPRECATED.txt +++ b/releases/cri-containerd.DEPRECATED.txt @@ -1,5 +1,5 @@ The "cri-containerd-(cni-)-VERSION-OS-ARCH.tar.gz" release bundle has been deprecated since containerd 1.6, -does not work on some Linux distributions, and will be removed in containerd 2.0. +does not work on some Linux distributions, and has been removed in containerd 2.0. Instead of this, install the following components separately, either from the binary or from the source: * containerd: https://github.com/containerd/containerd/releases From 03ba4ce1f7c72e201da3e451fe74d7b4791bd914 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Sun, 3 Nov 2024 23:26:32 -0800 Subject: [PATCH 2/2] Update release notes for v2.0.0 Signed-off-by: Derek McGowan --- releases/{v2.0.0-rc.toml => v2.0.0.toml} | 4 +++- version/version.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) rename releases/{v2.0.0-rc.toml => v2.0.0.toml} (90%) diff --git a/releases/v2.0.0-rc.toml b/releases/v2.0.0.toml similarity index 90% rename from releases/v2.0.0-rc.toml rename to releases/v2.0.0.toml index e9b0e183df..b922df499d 100644 --- a/releases/v2.0.0-rc.toml +++ b/releases/v2.0.0.toml @@ -9,7 +9,7 @@ ignore_deps = [ "github.com/containerd/containerd" ] # previous release previous = "v1.7.0" -pre_release = true +pre_release = false preface = """\ The first major release of containerd 2.x focuses on the continued stability of @@ -18,6 +18,8 @@ release includes the stabilization of new features added in the last 1.x release as well as the removal of features which were deprecated in 1.x. The goal is to support the vast community of containerd users well into the future along with their ever increasing deployment footprints and variety of use cases. + +See [containerd 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for details on what is new and has changed in this release. """ postface = """\ diff --git a/version/version.go b/version/version.go index 51bb642bf5..0293882356 100644 --- a/version/version.go +++ b/version/version.go @@ -23,7 +23,7 @@ var ( Package = "github.com/containerd/containerd/v2" // Version holds the complete version number. Filled in at linking time. - Version = "2.0.0-rc.6+unknown" + Version = "2.0.0+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.