Merge pull request #9669 from johngmyers/new-minor

Update releases.md and alpha channel for 1.18.0 release
kubernetes · Aug 3, 2020 · c61fe51 · c61fe51
2 parents ee35ba8 + 63c4cf0
commit c61fe51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/channels/alpha b/channels/alpha
@@ -91,7 +91,7 @@ spec:
     #requiredVersion: 1.19.0
     kubernetesVersion: 1.19.0-rc.1
   - range: ">=1.18.0-alpha.1"
-    recommendedVersion: "1.18.0-beta.2"
+    recommendedVersion: "1.18.0"
     #requiredVersion: 1.18.0
     kubernetesVersion: 1.18.6
   - range: ">=1.17.0-alpha.1"

diff --git a/docs/welcome/releases.md b/docs/welcome/releases.md
@@ -13,13 +13,13 @@ support Kubernetes 1.16.5, 1.15.2, and several previous Kubernetes versions.
 
 ## Compatibility Matrix
 
-| kops version  | k8s 1.13.x | k8s 1.14.x | k8s 1.15.x | k8s 1.16.x | k8s 1.17.x |
+| kops version  | k8s 1.14.x | k8s 1.15.x | k8s 1.16.x | k8s 1.17.x | k8s 1.18.x |
 |---------------|------------|------------|------------|------------|------------|
-| 1.17.0        | ✔          | ✔          | ✔          | ✔          | ✔          |
-| 1.16.x        | ✔          | ✔          | ✔          | ✔          | ⚫         |
-| 1.15.x        | ✔          | ✔          | ✔          | ⚫         | ⚫         |
-| ~~1.14.x~~    | ✔          | ✔          | ⚫         | ⚫         | ⚫         |
-| ~~1.13.x~~    | ✔          | ⚫         | ⚫         | ⚫         | ⚫         |
+| 1.18.0        | ✔          | ✔          | ✔          | ✔          | ✔          |
+| 1.17.x        | ✔          | ✔          | ✔          | ✔          | ⚫         |
+| 1.16.x        | ✔          | ✔          | ✔          | ⚫         | ⚫         |
+| ~~1.15.x~~    | ✔          | ✔          | ⚫         | ⚫         | ⚫         |
+| ~~1.14.x~~    | ✔          | ⚫         | ⚫         | ⚫         | ⚫         |
 
 
 Use the latest version of kops for all releases of Kubernetes, with the caveat