Merge pull request #8242 from dmcgowan/prepare-v1.7.0

dmcgowan · web-flow · commit 1fbd70374134 · 2023-03-10T10:05:05.000-08:00
Prepare release notes for v1.7.0
diff --git a/RELEASES.md b/RELEASES.md
@@ -103,19 +103,20 @@ convert to a regular _Active_ release with stricter backport criteria.
 
 The current state is available in the following tables:
 
-| Release                                                              | Status        | Start              | End of Life                                   |
-| ---------                                                            | ------------- | ------------------ | -------------------                           |
-| [0.0](https://github.com/containerd/containerd/releases/tag/0.0.5)   | End of Life   | Dec 4, 2015        | -                                             |
-| [0.1](https://github.com/containerd/containerd/releases/tag/v0.1.0)  | End of Life   | Mar 21, 2016       | -                                             |
-| [0.2](https://github.com/containerd/containerd/tree/v0.2.x)          | End of Life   | Apr 21, 2016       | December 5, 2017                              |
-| [1.0](https://github.com/containerd/containerd/releases/tag/v1.0.3)  | End of Life   | December 5, 2017   | December 5, 2018                              |
-| [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.13) | End of Life   | August 17, 2020    | March 3, 2022                                 |
-| [1.5](https://github.com/containerd/containerd/releases/tag/v1.5.17) | End of Life   | May 3, 2021        | February 28, 2023                             |
-| [1.6](https://github.com/containerd/containerd/releases/tag/v1.6.16) | LTS           | February 15, 2022  | max(February 15, 2025 or next LTS + 6 months) |
-| [1.7](https://github.com/containerd/containerd/milestone/42)         | Next          | TBD                | TBD                                           |
+| Release                                                              | Status        | Start              | End of Life                                      |
+| ---------                                                            | ------------- | ------------------ | -------------------                              |
+| [0.0](https://github.com/containerd/containerd/releases/tag/0.0.5)   | End of Life   | Dec 4, 2015        | -                                                |
+| [0.1](https://github.com/containerd/containerd/releases/tag/v0.1.0)  | End of Life   | Mar 21, 2016       | -                                                |
+| [0.2](https://github.com/containerd/containerd/tree/v0.2.x)          | End of Life   | Apr 21, 2016       | December 5, 2017                                 |
+| [1.0](https://github.com/containerd/containerd/releases/tag/v1.0.3)  | End of Life   | December 5, 2017   | December 5, 2018                                 |
+| [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.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.19) | LTS           | February 15, 2022  | max(February 15, 2025 or next LTS + 6 months)    |
+| [1.7](https://github.com/containerd/containerd/releases/tag/v1.7.0)  | Active        | March 10, 2023     | max(March 10, 2024 or release of 2.0 + 6 months) |
+| [2.0](https://github.com/containerd/containerd/milestone/35)         | Next          | TBD                | TBD                                              |
 
 
 ### Kubernetes Support
@@ -131,26 +132,22 @@ of containerd for every supported version of Kubernetes.
 
 | Kubernetes Version | containerd Version | CRI Version     |
 |--------------------|--------------------|-----------------|
-| 1.20               | 1.5.0+             | v1alpha2        |
-| 1.21               | 1.5.0+             | v1alpha2        |
-| 1.22               | 1.5.5+             | v1alpha2        |
-| 1.23               | 1.6.0+, 1,5.8+     | v1, v1alpha2    |
-| 1.24               | 1.6.4+, 1.5.11+    | v1, v1alpha2    |
-| 1.25               | 1.6.4+, 1.5.11+    | v1, v1alpha2 ** |
-| 1.26               | 1.6.tbd, 1.7.tbd   | v1              |
+| 1.24               | 1.7.0+, 1.6.4+     | v1, v1alpha2    |
+| 1.25               | 1.7.0+, 1.6.4+     | v1, v1alpha2 ** |
+| 1.26               | 1.7.0+, 1.6.15+    | v1              |
 
-** Note: containerd v.1.5._, v1.6._, and v1.7.* will support CRI v1 and v1alpha2 through EOL as those releases will continue to support older versions of k8s, cloud providers, and other clients using CRI v1alpha2. CRI v1alpha2 will be deprecated in v1.7 and removed in containerd v2.
+** Note: containerd v1.6.*, and v1.7.* support CRI v1 and v1alpha2 through EOL as those releases continue to support older versions of k8s, cloud providers, and other clients using CRI v1alpha2. CRI v1alpha2 is deprecated in v1.7 and will be removed in containerd v2.0.
 
 Deprecated containerd and kubernetes versions
 
-| CRI-Containerd Version | Containerd Version | Kubernetes Version | CRI Version  |
-|------------------------|--------------------|--------------------|--------------|
-| v1.0.0-alpha.x         |                    | 1.7, 1.8           | v1alpha1     |
-| v1.0.0-beta.x          |                    | 1.9                | v1alpha1     |
-| End-Of-Life            | v1.1 (End-Of-Life) | 1.10+              | v1alpha2     |
-|                        | v1.2 (End-Of-Life) | 1.10+              | v1alpha2     |
-|                        | v1.3 (End-Of-Life) | 1.12+              | v1alpha2     |
-|                        | v1.4 (End-of-Life) | 1.19+              | v1alpha2     |
+| Containerd Version       | Kubernetes Version | CRI Version          |
+|--------------------------|--------------------|----------------------|
+| v1.0 (w/ cri-containerd) | 1.7, 1.8, 1.9      | v1alpha1             |
+| v1.1                     | 1.10+              | v1alpha2             |
+| v1.2                     | 1.10+              | v1alpha2             |
+| v1.3                     | 1.12+              | v1alpha2             |
+| v1.4                     | 1.19+              | v1alpha2             |
+| v1.5                     | 1.20+              | v1 (1.23+), v1alpha2 |
 
 ### Backporting
 
diff --git a/releases/v1.7.0.toml b/releases/v1.7.0.toml
@@ -8,7 +8,7 @@ match_deps = "^github.com/(containerd/[a-zA-Z0-9-]+)$"
 # previous release
 previous = "v1.6.0"
 
-pre_release = true
+pre_release = false
 
 preface = """\
 The eighth major release of containerd includes new functionality alongside many improvements.
diff --git 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.7.0-rc.3+unknown"
+	Version = "1.7.0+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.
