From 857f169e9e894fd5f4e550bcf78a002478ce839d Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Thu, 14 Feb 2019 11:04:02 -0600 Subject: [PATCH] update support statment reflecting eol for k8s 1.10 Signed-off-by: Mike Brown --- README.md | 11 +++++++++++ docs/kube-up.md | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e77abb51f..2e8ed474b 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,17 @@ See [test dashboard](https://k8s-testgrid.appspot.com/sig-node-containerd) | | v1.2 | 1.10+ | v1alpha2 | | | HEAD | 1.10+ | v1alpha2 | +**Note:** The support table above specifies the Kubernetes Version that was supported at time of release of the containerd - cri integration. + +The following is the current support table for containerd CRI integration taking into account that Kubernetes only supports n-3 minor release versions and 1.10 is now end-of-life. + +| Containerd Version | Kubernetes Version | CRI Version | +|:------------------:|:------------------:|:-----------:| +| v1.1 | 1.11+ | v1alpha2 | +| v1.2 | 1.11+ | v1alpha2 | +| HEAD | 1.11+ | v1alpha2 | + + ## Production Quality Cluster on GCE For a production quality cluster on GCE brought up with `kube-up.sh` refer [here](docs/kube-up.md). ## Installing with Ansible and Kubeadm diff --git a/docs/kube-up.md b/docs/kube-up.md index d4d542d5c..b00a08ef1 100644 --- a/docs/kube-up.md +++ b/docs/kube-up.md @@ -15,6 +15,6 @@ tar -C ${CRI_CONTAINERD_PATH} -xzf cri-containerd-${VERSION}.linux-amd64.tar.gz ## Create Kubernetes Cluster on GCE Follow these instructions [here](https://kubernetes.io/docs/setup/turnkey/gce/) to create a production quality Kubernetes cluster on GCE. -**Make sure the Kubernetes version you are using is v1.10 or greater:** +**Make sure the Kubernetes version you are using is v1.11 or greater:** * When using `https://get.k8s.io`, use the environment variable `KUBERNETES_RELEASE` to set version. -* When using a Kubernetes release tarball, make sure to select version 1.10 or greater. +* When using a Kubernetes release tarball, make sure to select version 1.11 or greater.