Skip to content

Commit e13a916

Browse files
dmcgowandmcgowan
committed
Prepare release notes for v1.7.0
Signed-off-by: Derek McGowan <derek@mcg.dev>
1 parent e92e692 commit e13a916

3 files changed

Lines changed: 28 additions & 31 deletions

File tree

‎RELEASES.md‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,20 @@ convert to a regular _Active_ release with stricter backport criteria.
103103

104104
The current state is available in the following tables:
105105

106-
| Release | Status | Start | End of Life |
107-
| --------- | ------------- | ------------------ | ------------------- |
108-
| [0.0](https://github.com/containerd/containerd/releases/tag/0.0.5) | End of Life | Dec 4, 2015 | - |
109-
| [0.1](https://github.com/containerd/containerd/releases/tag/v0.1.0) | End of Life | Mar 21, 2016 | - |
110-
| [0.2](https://github.com/containerd/containerd/tree/v0.2.x) | End of Life | Apr 21, 2016 | December 5, 2017 |
111-
| [1.0](https://github.com/containerd/containerd/releases/tag/v1.0.3) | End of Life | December 5, 2017 | December 5, 2018 |
112-
| [1.1](https://github.com/containerd/containerd/releases/tag/v1.1.8) | End of Life | April 23, 2018 | October 23, 2019 |
113-
| [1.2](https://github.com/containerd/containerd/releases/tag/v1.2.13) | End of Life | October 24, 2018 | October 15, 2020 |
114-
| [1.3](https://github.com/containerd/containerd/releases/tag/v1.3.10) | End of Life | September 26, 2019 | March 4, 2021 |
115-
| [1.4](https://github.com/containerd/containerd/releases/tag/v1.4.13) | End of Life | August 17, 2020 | March 3, 2022 |
116-
| [1.5](https://github.com/containerd/containerd/releases/tag/v1.5.17) | End of Life | May 3, 2021 | February 28, 2023 |
117-
| [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) |
118-
| [1.7](https://github.com/containerd/containerd/milestone/42) | Next | TBD | TBD |
106+
| Release | Status | Start | End of Life |
107+
| --------- | ------------- | ------------------ | ------------------- |
108+
| [0.0](https://github.com/containerd/containerd/releases/tag/0.0.5) | End of Life | Dec 4, 2015 | - |
109+
| [0.1](https://github.com/containerd/containerd/releases/tag/v0.1.0) | End of Life | Mar 21, 2016 | - |
110+
| [0.2](https://github.com/containerd/containerd/tree/v0.2.x) | End of Life | Apr 21, 2016 | December 5, 2017 |
111+
| [1.0](https://github.com/containerd/containerd/releases/tag/v1.0.3) | End of Life | December 5, 2017 | December 5, 2018 |
112+
| [1.1](https://github.com/containerd/containerd/releases/tag/v1.1.8) | End of Life | April 23, 2018 | October 23, 2019 |
113+
| [1.2](https://github.com/containerd/containerd/releases/tag/v1.2.13) | End of Life | October 24, 2018 | October 15, 2020 |
114+
| [1.3](https://github.com/containerd/containerd/releases/tag/v1.3.10) | End of Life | September 26, 2019 | March 4, 2021 |
115+
| [1.4](https://github.com/containerd/containerd/releases/tag/v1.4.13) | End of Life | August 17, 2020 | March 3, 2022 |
116+
| [1.5](https://github.com/containerd/containerd/releases/tag/v1.5.18) | End of Life | May 3, 2021 | February 28, 2023 |
117+
| [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) |
118+
| [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) |
119+
| [2.0](https://github.com/containerd/containerd/milestone/35) | Next | TBD | TBD |
119120

120121

121122
### Kubernetes Support
@@ -131,26 +132,22 @@ of containerd for every supported version of Kubernetes.
131132

132133
| Kubernetes Version | containerd Version | CRI Version |
133134
|--------------------|--------------------|-----------------|
134-
| 1.20 | 1.5.0+ | v1alpha2 |
135-
| 1.21 | 1.5.0+ | v1alpha2 |
136-
| 1.22 | 1.5.5+ | v1alpha2 |
137-
| 1.23 | 1.6.0+, 1,5.8+ | v1, v1alpha2 |
138-
| 1.24 | 1.6.4+, 1.5.11+ | v1, v1alpha2 |
139-
| 1.25 | 1.6.4+, 1.5.11+ | v1, v1alpha2 ** |
140-
| 1.26 | 1.6.tbd, 1.7.tbd | v1 |
135+
| 1.24 | 1.7.0+, 1.6.4+ | v1, v1alpha2 |
136+
| 1.25 | 1.7.0+, 1.6.4+ | v1, v1alpha2 ** |
137+
| 1.26 | 1.7.0+, 1.6.15+ | v1 |
141138

142-
** 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.
139+
** 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.
143140

144141
Deprecated containerd and kubernetes versions
145142

146-
| CRI-Containerd Version | Containerd Version | Kubernetes Version | CRI Version |
147-
|------------------------|--------------------|--------------------|--------------|
148-
| v1.0.0-alpha.x | | 1.7, 1.8 | v1alpha1 |
149-
| v1.0.0-beta.x | | 1.9 | v1alpha1 |
150-
| End-Of-Life | v1.1 (End-Of-Life) | 1.10+ | v1alpha2 |
151-
| | v1.2 (End-Of-Life) | 1.10+ | v1alpha2 |
152-
| | v1.3 (End-Of-Life) | 1.12+ | v1alpha2 |
153-
| | v1.4 (End-of-Life) | 1.19+ | v1alpha2 |
143+
| Containerd Version | Kubernetes Version | CRI Version |
144+
|--------------------------|--------------------|----------------------|
145+
| v1.0 (w/ cri-containerd) | 1.7, 1.8, 1.9 | v1alpha1 |
146+
| v1.1 | 1.10+ | v1alpha2 |
147+
| v1.2 | 1.10+ | v1alpha2 |
148+
| v1.3 | 1.12+ | v1alpha2 |
149+
| v1.4 | 1.19+ | v1alpha2 |
150+
| v1.5 | 1.20+ | v1 (1.23+), v1alpha2 |
154151

155152
### Backporting
156153

releases/v1.7.0-rc.toml renamed to releases/v1.7.0.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ match_deps = "^github.com/(containerd/[a-zA-Z0-9-]+)$"
88
# previous release
99
previous = "v1.6.0"
1010

11-
pre_release = true
11+
pre_release = false
1212

1313
preface = """\
1414
The eighth major release of containerd includes new functionality alongside many improvements.

‎version/version.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var (
2323
Package = "github.com/containerd/containerd"
2424

2525
// Version holds the complete version number. Filled in at linking time.
26-
Version = "1.7.0-rc.3+unknown"
26+
Version = "1.7.0+unknown"
2727

2828
// Revision is filled with the VCS (e.g. git) revision being used to build
2929
// the program at linking time.

0 commit comments

Comments
 (0)