From 3426a1ac2a22f988ae2116b0aa38eab4f59cea77 Mon Sep 17 00:00:00 2001 From: Barry Melbourne <9964974+bmelbourne@users.noreply.github.com> Date: Sat, 5 Dec 2020 19:23:09 +0000 Subject: [PATCH 1/2] Add K8s Docker support deprecation release note --- docs/releases/1.19-NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/releases/1.19-NOTES.md b/docs/releases/1.19-NOTES.md index 6175610a0f408..5111cffd70d1f 100644 --- a/docs/releases/1.19-NOTES.md +++ b/docs/releases/1.19-NOTES.md @@ -115,6 +115,9 @@ has been updated by a newer version of kOps unless it is given the `--allow-kops * Support for Kubernetes versions 1.11 and 1.12 are deprecated and will be removed in kOps 1.20. +* As of kOps 1.20, the default container runtime will be `containerd` instead of Docker for new clusters. For existing clusters the default behaviour can be overridden using either the `--container-runtime` flag or add `spec.containerRuntime` to the cluster spec. This change closely tracks the upstream deprecation of Docker in Kubernetes 1.20 and will be removed in a future release. + For more information see [this page](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG/CHANGELOG-1.20.md#deprecation). + * Support for Terraform version 0.11 has been deprecated and will be removed in kOps 1.20. * Support for feature flag `Terraform-0.12` has been deprecated and will be removed in kOps 1.20. All generated Terraform HCL2/JSON files will support versions `0.12.26+` and `0.13.0+`. From ceeb0635cdd4c67c6b4eca12f770e840c1596fe6 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 6 Jan 2021 08:30:23 +0200 Subject: [PATCH 2/2] Apply suggestions from code review --- docs/releases/1.19-NOTES.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/releases/1.19-NOTES.md b/docs/releases/1.19-NOTES.md index 5111cffd70d1f..a8408cda38bae 100644 --- a/docs/releases/1.19-NOTES.md +++ b/docs/releases/1.19-NOTES.md @@ -113,10 +113,9 @@ has been updated by a newer version of kOps unless it is given the `--allow-kops # Deprecations -* Support for Kubernetes versions 1.11 and 1.12 are deprecated and will be removed in kOps 1.20. +* Support for Kubernetes versions 1.11 and 1.12 has been deprecated and will be removed in kOps 1.20. -* As of kOps 1.20, the default container runtime will be `containerd` instead of Docker for new clusters. For existing clusters the default behaviour can be overridden using either the `--container-runtime` flag or add `spec.containerRuntime` to the cluster spec. This change closely tracks the upstream deprecation of Docker in Kubernetes 1.20 and will be removed in a future release. - For more information see [this page](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG/CHANGELOG-1.20.md#deprecation). +* Support for Docker container runtime has been deprecated and will be replaced with containerd for new clusters as of kOps 1.20. For existing clusters the default behaviour can be overridden by setting `spec.containerRuntime: containerd` in the cluster spec. This change closely tracks the upstream [deprecation of Docker](https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker). * Support for Terraform version 0.11 has been deprecated and will be removed in kOps 1.20.