Merge pull request #11922 from johngmyers/release-doc

Update version support matrix for 1.21
kubernetes · Jul 4, 2021 · b81d44b · b81d44b
2 parents 9846517 + 4460fcd
commit b81d44b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/README-ES.md b/README-ES.md
@@ -80,13 +80,13 @@ particular de Kubernetes.
 
 #### Compatibilidad Matrix
 
-| kOps version  | k8s 1.16.x | k8s 1.17.x | k8s 1.18.x | k8s 1.19.x | k8s 1.20.x |
+| kOps version  | k8s 1.17.x | k8s 1.18.x | k8s 1.19.x | k8s 1.20.x | k8s 1.21.x |
 |---------------|------------|------------|------------|------------|------------|
-| 1.20.0        | ✔          | ✔          | ✔          | ✔          | ✔          |
-| 1.19.x        | ✔          | ✔          | ✔          | ✔          | ⚫         |
-| ~~1.18.x~~    | ✔          | ✔          | ✔          | ⚫         | ⚫         |
-| ~~1.17.x~~    | ✔          | ✔          | ⚫         | ⚫         | ⚫         |
-| ~~1.16.x~~    | ✔          | ⚫         | ⚫         | ⚫         | ⚫         |
+| 1.21.0        | ✔          | ✔          | ✔          | ✔          | ✔          |
+| 1.20.x        | ✔          | ✔          | ✔          | ✔          | ⚫         |
+| ~~1.19.x~~    | ✔          | ✔          | ✔          | ⚫         | ⚫         |
+| ~~1.18.x~~    | ✔          | ✔          | ⚫         | ⚫         | ⚫         |
+| ~~1.17.x~~    | ✔          | ⚫         | ⚫         | ⚫         | ⚫         |
 
 Utilice la última versión de kOps para todas las versiones de Kubernetes, con la advertencia de que las versiones más altas de Kubernetes no cuentan con el respaldo _oficial_ de kOps.
 

diff --git a/docs/welcome/releases.md b/docs/welcome/releases.md
@@ -1,3 +1,4 @@
+
 # kOps Releases & Versioning
 
 kOps intends to be backward compatible.  It is always recommended using the
@@ -13,13 +14,13 @@ support Kubernetes 1.16.5, 1.15.2, and several previous Kubernetes versions.
 
 ## Compatibility Matrix
 
-| kOps version  | k8s 1.16.x | k8s 1.17.x | k8s 1.18.x | k8s 1.19.x | k8s 1.20.x |
+| kOps version  | k8s 1.17.x | k8s 1.18.x | k8s 1.19.x | k8s 1.20.x | k8s 1.21.x |
 |---------------|------------|------------|------------|------------|------------|
-| 1.20.0        | ✔          | ✔          | ✔          | ✔          | ✔          |
-| 1.19.x        | ✔          | ✔          | ✔          | ✔          | ⚫         |
-| ~~1.18.x~~    | ✔          | ✔          | ✔          | ⚫         | ⚫         |
-| ~~1.17.x~~    | ✔          | ✔          | ⚫         | ⚫         | ⚫         |
-| ~~1.16.x~~    | ✔          | ⚫         | ⚫         | ⚫         | ⚫         |
+| 1.21.0        | ✔          | ✔          | ✔          | ✔          | ✔          |
+| 1.20.x        | ✔          | ✔          | ✔          | ✔          | ⚫         |
+| ~~1.19.x~~    | ✔          | ✔          | ✔          | ⚫         | ⚫         |
+| ~~1.18.x~~    | ✔          | ✔          | ⚫         | ⚫         | ⚫         |
+| ~~1.17.x~~    | ✔          | ⚫         | ⚫         | ⚫         | ⚫         |
 
 
 Use the latest version of kOps for all releases of Kubernetes, with the caveat