From d1ce97f4c2b9e12529ab26a23f80adbc6d901d89 Mon Sep 17 00:00:00 2001
From: yan xuean <yan.xuean@zte.com.cn>
Date: Fri, 24 Aug 2018 02:32:07 +0800
Subject: [PATCH] add doc for supporting containerd in minikube (#10037)

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
---
 content/en/docs/setup/minikube.md | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/content/en/docs/setup/minikube.md b/content/en/docs/setup/minikube.md
index af305b714c..45847927ef 100644
--- a/content/en/docs/setup/minikube.md
+++ b/content/en/docs/setup/minikube.md
@@ -17,7 +17,7 @@ Minikube is a tool that makes it easy to run Kubernetes locally. Minikube runs a
   * NodePorts
   * ConfigMaps and Secrets
   * Dashboards
-  * Container Runtime: Docker, [rkt](https://github.com/rkt/rkt) and [CRI-O](https://github.com/kubernetes-incubator/cri-o)
+  * Container Runtime: Docker, [rkt](https://github.com/rkt/rkt), [CRI-O](https://github.com/kubernetes-incubator/cri-o) and [containerd](https://github.com/containerd/containerd)
   * Enabling CNI (Container Network Interface)
   * Ingress
 
@@ -80,6 +80,28 @@ Stopping "minikube"...
 
 ### Alternative Container Runtimes
 
+#### containerd
+
+To use [containerd](https://github.com/containerd/containerd) as the container runtime, run:
+
+```bash
+$ minikube start \
+    --network-plugin=cni \
+    --container-runtime=containerd \
+    --bootstrapper=kubeadm
+```
+
+Or you can use the extended version:
+
+```bash
+$ minikube start \
+    --network-plugin=cni \
+    --extra-config=kubelet.container-runtime=remote \
+    --extra-config=kubelet.container-runtime-endpoint=unix:///run/containerd/containerd.sock \
+    --extra-config=kubelet.image-service-endpoint=unix:///run/containerd/containerd.sock \
+    --bootstrapper=kubeadm
+```
+
 #### CRI-O
 
 To use [CRI-O](https://github.com/kubernetes-incubator/cri-o) as the container runtime, run: