From ed00765f3c97428e9a1846f528493e023fa919f3 Mon Sep 17 00:00:00 2001
From: Harry Zhang <harryz@hyper.sh>
Date: Wed, 31 May 2017 23:29:14 +0800
Subject: [PATCH 1/3] Add CRI runtime support

---
 docs/admin/kubeadm.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/docs/admin/kubeadm.md b/docs/admin/kubeadm.md
index 56d5218444..58eafd7830 100644
--- a/docs/admin/kubeadm.md
+++ b/docs/admin/kubeadm.md
@@ -421,6 +421,31 @@ export no_proxy="localhost,127.0.0.1,localaddress,.localdomain.com,example.com,1
 Remember to change `proxy_ip` and add a kube master node IP address to
 `no_proxy`.
 
+## Use Kubeadm with other CRI runtimes
+
+Since [Kubernetes 1.6 release](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md#node-components-1), Kubernetes container runtimes have been transferred to using CRI by default. Currently, the build-in container runtime is Docker which is enabled by build-in `dockershim` in `kubelet`.
+
+Using other CRI based runtimes with kubeadm is very simple, and currently supported runtimes are:
+
+- [cri-o](https://github.com/kubernetes-incubator/cri-o)
+- [frakti](https://github.com/kubernetes/frakti)
+- [rkt](https://github.com/kubernetes-incubator/rktlet)
+
+After you have successfully installed `kubeadm` and `kubelet`, please follow these two steps:
+
+1. Install runtime shim on every node. You will need to follow the installation document in the runtime shim project listing above. 
+
+2. Configure kubelet to use remote CRI runtime. Please remember to change `RUNTIME_ENDPOINT` to your own value like `/var/run/{your_runtime}.sock`:
+
+```shell
+  $ cat > /etc/systemd/system/kubelet.service.d/20-cri.conf <<EOF
+Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --container-runtime-endpoint=$RUNTIME_ENDPOINT --feature-gates=AllAlpha=true"
+EOF
+  $ systemctl daemon-reload
+```
+
+Now `kubelet` is ready to use the specified CRI runtime, and you can continue with `kubeadm init` and `kubeadm join` workflow to deploy Kubernetes cluster.
+
 ## Releases and release notes
 
 If you already have kubeadm installed and want to upgrade, run `apt-get update

From 180847596886e654b31ac685944b2f580fb56173 Mon Sep 17 00:00:00 2001
From: Karthik Gaekwad <karthequian@users.noreply.github.com>
Date: Tue, 6 Jun 2017 22:26:37 -0500
Subject: [PATCH 2/3] Fixes issue #3939

Adds comment for per issue #3939
---
 docs/getting-started-guides/ubuntu/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/getting-started-guides/ubuntu/index.md b/docs/getting-started-guides/ubuntu/index.md
index 78926d03c7..ba50e5dd81 100644
--- a/docs/getting-started-guides/ubuntu/index.md
+++ b/docs/getting-started-guides/ubuntu/index.md
@@ -24,6 +24,7 @@ Available for Ubuntu 16.04 and newer:
 
 ```
 sudo snap install conjure-up --classic
+# re-login may be required at that point if you just installed snap utility
 conjure-up kubernetes
 ```
 

From ffc476928561ae7abbfb507293b4dd3491af2a19 Mon Sep 17 00:00:00 2001
From: Alejandro Escobar <jaescobar.cell@gmail.com>
Date: Wed, 7 Jun 2017 10:14:23 -0700
Subject: [PATCH 3/3] fixed the line giving the template for creating
 configmap, should include the word configmap as part of the creation process.

---
 docs/tasks/configure-pod-container/configmap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tasks/configure-pod-container/configmap.md b/docs/tasks/configure-pod-container/configmap.md
index bf5185be87..e22668bba3 100644
--- a/docs/tasks/configure-pod-container/configmap.md
+++ b/docs/tasks/configure-pod-container/configmap.md
@@ -29,7 +29,7 @@ This page shows you how to configure an application using a ConfigMap.
 Use the `kubectl create configmap` command to create configmaps from [directories](#creating-configmaps-from-directories), [files](#creating-configmaps-from-files), or [literal values](#creating-configmaps-from-literal-values):
 
 ```shell
-kubectl create <map-name> <data-source>
+kubectl create configmap <map-name> <data-source>
 ```
 
 where \<map-name> is the name you want to assign to the ConfigMap and \<data-source> is the directory, file, or literal value to draw the data from.