diff --git a/channels/alpha b/channels/alpha index 814f8e4ba5ea2..88650867239f0 100644 --- 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 index f04c4d19283b3..a1b7d6abae16e 100644 --- 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