Skip to content

Commit b755f03

Browse files
committed
keep releases.md in sync with containerd/containerd
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
1 parent 7ffe3c0 commit b755f03

1 file changed

Lines changed: 21 additions & 7 deletions

File tree

content/releases.md

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,27 @@ The current state is available in the following tables:
107107
| [1.6](https://github.com/containerd/containerd/releases/tag/v1.6.4) | Active | February 15, 2022 | max(February 15, 2023 or release of 1.7.0 + 6 months) |
108108
| [1.7](https://github.com/containerd/containerd/milestone/42) | Next | TBD | TBD |
109109

110-
Note that branches and release from before 1.0 may not follow these rules.
110+
111+
### Kubernetes Support
112+
113+
The Kubernetes version matrix represents the versions of containerd which are
114+
recommended for a Kubernetes release. Any actively supported version of
115+
containerd may receive patches to fix bugs encountered in any version of
116+
Kubernetes, however, our recommendation is based on which versions have been
117+
the most thoroughly tested. See the [Kubernetes test grid](https://testgrid.k8s.io/sig-node-containerd)
118+
for the list of actively tested versions. Kubernetes only supports n-3 minor
119+
release versions and containerd will ensure there is always a supported version
120+
of containerd for every supported version of Kubernetes.
121+
122+
| Kubernetes Version | containerd Version | CRI Version |
123+
|--------------------|--------------------|--------------|
124+
| 1.20 | 1.5 | v1alpha2 |
125+
| 1.21 | 1.5 | v1alpha2 |
126+
| 1.22 | 1.5.5+ | v1alpha2 |
127+
| 1.23 | 1.6.0+, 1,5.8+ | v1, v1alpha2 |
128+
| 1.24 | 1.6.4+, 1.5.11+ | v1, v1alpha2 |
129+
130+
Deprecated containerd and kubernetes versions
111131

112132
| CRI-Containerd Version | Containerd Version | Kubernetes Version | CRI Version |
113133
|------------------------|--------------------|--------------------|--------------|
@@ -117,12 +137,6 @@ Note that branches and release from before 1.0 may not follow these rules.
117137
| | v1.2 (End-Of-Life) | 1.10+ | v1alpha2 |
118138
| | v1.3 (End-Of-Life) | 1.12+ | v1alpha2 |
119139
| | v1.4 (End-of-Life) | 1.19+ | v1alpha2 |
120-
| | v1.5 | 1.20+ | v1alpha2 |
121-
| | v1.6 | 1.23+ | v1, v1alpha2 |
122-
123-
**Note:** The support table above specifies the Kubernetes Version that was supported at time of release of the containerd - cri integration and Kubernetes only supports n-3 minor release versions.
124-
125-
These tables should be updated as part of the release preparation process.
126140

127141
### Backporting
128142

0 commit comments

Comments
 (0)