From 4fdb884644ecdd6a4b4b0d1bd85b8f6ccc1995c6 Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Mon, 26 Jul 2021 15:38:18 -0500 Subject: [PATCH] add CRI support matrix to RELEASES.md Signed-off-by: Mike Brown --- RELEASES.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 89d45877a..70664a695 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -89,7 +89,7 @@ whichever is longer. Additionally, releases may have an extended security suppor period after the end of the active period to accept security backports. This timeframe will be decided by maintainers before the end of the active status. -The current state is available in the following table: +The current state is available in the following tables: | Release | Status | Start | End of Life | |---------|-------------|------------------|-------------------| @@ -106,7 +106,19 @@ The current state is available in the following table: Note that branches and release from before 1.0 may not follow these rules. -This table should be updated as part of the release preparation process. +| 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 | 1.19+ | v1alpha2 | +| | v1.5 | 1.20+ | v1alpha2 | + +**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. + +These tables should be updated as part of the release preparation process. ### Backporting