From fc8c9e82bb0bcb939386b64ecb866731b650e0f5 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian.hacman@sematext.com>
Date: Thu, 13 Feb 2020 10:55:14 +0200
Subject: [PATCH] Add release notes and docs for containerd

---
 docs/cluster_spec.md        | 22 ++++++++++++++++++++++
 docs/releases/1.18-NOTES.md | 10 ++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/docs/cluster_spec.md b/docs/cluster_spec.md
index 1b23b803b4..50336e7164 100644
--- a/docs/cluster_spec.md
+++ b/docs/cluster_spec.md
@@ -743,6 +743,28 @@ spec:
     elbSecurityGroup: sg-123445678
 ```
 
+### containerRuntime
+*WARNING: this works only for Kubernetes version above 1.11.0.*
+
+Alternative [container runtimes](https://kubernetes.io/docs/setup/production-environment/container-runtimes/) can be used to run Kubernetes. Docker is still the default container runtime, but [containerd](https://kubernetes.io/blog/2018/05/24/kubernetes-containerd-integration-goes-ga/) can also be selected.
+
+```yaml
+spec:
+  containerRuntime: containerd
+```
+
+### containerd
+
+It is possible to override the [containerd](https://github.com/containerd/containerd/blob/master/README.md) daemon options for all the nodes in the cluster. See the [API docs](https://pkg.go.dev/k8s.io/kops/pkg/apis/kops#ContainerdConfig) for the full list of options.
+
+```yaml
+spec:
+  containerd:
+    version: 1.3.3   
+    logLevel: info
+    configOverride: ""
+```
+
 ### docker
 
 It is possible to override Docker daemon options for all masters and nodes in the cluster. See the [API docs](https://pkg.go.dev/k8s.io/kops/pkg/apis/kops#DockerConfig) for the full list of options.
diff --git a/docs/releases/1.18-NOTES.md b/docs/releases/1.18-NOTES.md
index da21880e2a..9ac6244cff 100644
--- a/docs/releases/1.18-NOTES.md
+++ b/docs/releases/1.18-NOTES.md
@@ -2,6 +2,12 @@
 
 (The kops 1.18 release has not been released yet, this is a document to gather the notes prior to the release).
 
+# Significant changes
+
+* [containerd](https://github.com/containerd/containerd/blob/master/README.md) can now be selected as an alternate container runtime for Kubernetes. Use the `--container-runtime containerd` flag to create such a cluster.
+
+* The default instance type for AWS is now t3.medium. This should provide better performance and reduced costs in clusters where the average CPU usage is low.
+
 # Breaking changes
 
 * Terraform users on AWS may need to rename some resources in their state file in order to prepare for Terraform 0.12 support. See Required Actions below.
@@ -16,10 +22,6 @@
 
 * Please see the notes in the 1.15 release about the apiGroup changing from kops to kops.k8s.io
 
-# Significant changes
-
-* The default instance type for AWS is now t3.medium. This should provide better performance and reduced costs in clusters where the average CPU usage is low.
-
 # Required Actions
 
 * Terraform users on AWS may need to rename resources in their terraform state file in order to prepare for future Terraform 0.12 support.