Merge pull request #1459 from Starnop/cri-doc

doc: Modify the document about Kubernetes&pouch to make it friendly

Author: YaoZengzeng

docs/kubernetes/pouch_with_kubernetes_deploying.md

@@ -1,17 +1,17 @@
 # Deploy Kubernetes With Pouch
 
-Updated: 2018.3.30
+Updated: 2018.6.1
 
 - [Pouch deploying](#pouch-with-kubernetes-deploying)
   - [Overview](#overview)
   - [Restriction](#restriction)
   - [Install and Configure](#install-and-configure)
     - [Install Pouch](#install-pouch)
-    - [Install CNI](#install-cni)
+    - [Setup Repo](#setup-repo)
     - [Install Kubernetes Components](#install-kubernetes-components)
+    - [Install CNI](#install-cni)
     - [Setting up the master node](#setting-up-the-master-node)
     - [Setting up the minion nodes](#setting-up-the-minion-nodes)
-    - [Setting up CNI network routes](#setting-up-cni-network-routes)
   - [Run and Verify](#run-and-verify)
   - [Troubleshooting](#troubleshooting)
 
@@ -25,15 +25,14 @@ This document shows how to easily install a Kubernetes cluster with Pouch as the
 
 Kubernetes: Version 1.5+ is recommanded.
 
-Pouch: Version 0.4.0 is recommended.
+NOTE: PouchContainer version prior to 0.5.x (including version 0.5.0) did not support configuring  CNI network plugin with flannel. If you want to do that, use the latest code from the branch of master, refer to  [Developer Quick-Start](https://github.com/alibaba/pouch/blob/master/INSTALLATION.md#developer-quick-start)
 
 ## Install and Configure
 
 An all-in-one kubernetes cluster with pouch runtime could be deployed by running:
 
 ```
 hack/kubernetes/allinone.sh
-
 ```
 
 Please refer to [allinone](https://github.com/alibaba/pouch/blob/master/hack/kubernetes/allinone.sh) .
@@ -46,21 +45,27 @@ You can easily setup a basic Pouch environment, see [INSTALLATION.md](../../INST
 
 On Ubuntu 16.04+:
 
+NOTE: If you'd like to use Kubernetes 1.10+, CRI_VERSION should be "v1alpha2"
+
 ```
-sed -i 's/ExecStart=\/usr\/bin\/pouchd/ExecStart=\/usr\/bin\/pouchd --enable-cri=true/g' /usr/lib/systemd/system/pouch.service
+CRI_VERSION="v1alpha1"
+sed -i 's/ExecStart=\/usr\/bin\/pouchd/ExecStart=\/usr\/bin\/pouchd --enable-cri=true --cri-version=${CRI_VERSION}/g' /usr/lib/systemd/system/pouch.service
 systemctl daemon-reload
 systemctl restart pouch
 ```
 
 On CentOS 7:
 
+NOTE: If you'd like to use Kubernetes 1.10+, CRI_VERSION should be "v1alpha2"
+
 ```
-sed -i 's/ExecStart=\/usr\/local\/bin\/pouchd/ExecStart=\/usr\/local\/bin\/pouchd --enable-cri=true/g' /lib/systemd/system/pouch.service
+CRI_VERSION="v1alpha1"
+sed -i 's/ExecStart=\/usr\/local\/bin\/pouchd/ExecStart=\/usr\/local\/bin\/pouchd --enable-cri=true --cri-version=${CRI_VERSION}/g' /lib/systemd/system/pouch.service
 systemctl daemon-reload
 systemctl restart pouch
 ```
 
-### Install CNI
+### Setup Repo
 
 On Ubuntu 16.04+:
 
@@ -71,7 +76,6 @@ cat <<EOF > /etc/apt/sources.list.d/kubernetes.list
 deb http://apt.kubernetes.io/ kubernetes-xenial main
 EOF
 apt-get update
-apt-get install -y kubernetes-cni
 ```
 
 On CentOS 7:
@@ -87,55 +91,22 @@ repo_gpgcheck=1
 gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
        https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
 EOF
-setenforce 0
-yum install -y kubernetes-cni
-```
-
-Configure CNI networks:
-
-- If you want to use CNI plugins like Flannel, Weave, Calico etc, please skip this section.
-- Otherwise, you can use **bridge** network plugin, it's the simplest way.
-  - Subnets should be different on different nodes. e.g. `10.244.1.0/24` for the master node and `10.244.2.0/24` for the first minion node.
-
-```sh
-mkdir -p /etc/cni/net.d
-cat >/etc/cni/net.d/10-mynet.conf <<-EOF
-{
-    "cniVersion": "0.3.0",
-    "name": "mynet",
-    "type": "bridge",
-    "bridge": "cni0",
-    "isGateway": true,
-    "ipMasq": true,
-    "ipam": {
-        "type": "host-local",
-        "subnet": "10.244.1.0/24",
-        "routes": [
-            { "dst": "0.0.0.0/0"  }
-        ]
-    }
-}
-EOF
-cat >/etc/cni/net.d/99-loopback.conf <<-EOF
-{
-    "cniVersion": "0.3.0",
-    "type": "loopback"
-}
-EOF
 ```
 
 ### Install Kubernetes Components
 
 On Ubuntu 16.04+:
 
 ```sh
-apt-get install -y kubelet kubeadm kubectl
+RELEASE="1.9.4-00"
+apt-get -y install kubelet=${RELEASE} kubeadm=${RELEASE} kubectl=${RELEASE}
 ```
 
 On CentOS 7:
 
 ```sh
-yum install -y kubelet kubeadm kubectl
+RELEASE="1.9.4-0.x86_64"
+yum install -y kubelet-${RELEASE} kubeadm-${RELEASE} kubectl-${RELEASE}
 ```
 
 Configure kubelet with Pouch as its runtime:
@@ -147,20 +118,46 @@ systemctl daemon-reload
 
 For more details, please check [install kubelet](https://kubernetes.io/docs/setup/independent/install-kubeadm/#installing-kubeadm-kubelet-and-kubectl).
 
+### Install CNI
+
+On Ubuntu 16.04+:
+
+```
+apt-get install -y kubernetes-cni
+```
+
+On CentOS 7:
+
+```
+setenforce 0
+yum install -y kubernetes-cni
+```
+
 ### Setting up the master node
 
 For more detailed Kubernetes cluster installation, please check [Using kubeadm to Create a Cluster](https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/)
 
 ```
-kubeadm init
+kubeadm init --pod-network-cidr 10.244.0.0/16 --ignore-preflight-errors=all
+```
+
+Set the KUBECONFIG environment variable
+
+```sh
+export KUBECONFIG=/etc/kubernetes/admin.conf
+```
+
+Configure CNI network plugin with [flannel](https://github.com/coreos/flannel)
+
+```
+kubectl create -f https://github.com/coreos/flannel/raw/master/Documentation/kube-flannel.yml
 ```
 
-NOTE: If you want to use CNI plugin other than bridge, please check [Installing a pod network](https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/#pod-network).
+NOTE: For other plugins, please check [Installing a pod network](https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/#pod-network).
 
 Optional: enable schedule pods on the master node
 
 ```sh
-export KUBECONFIG=/etc/kubernetes/admin.conf
 kubectl taint nodes --all node-role.kubernetes.io/master:NoSchedule-
 ```
 
@@ -175,27 +172,9 @@ as root:
   kubeadm join --token $token ${master_ip:port} --discovery-token-ca-cert-hash $ca-cert
 ```
 
-Copy & Run it in all your minion nodes.
-
-### Setting up CNI network routes
-
-If your CNI plugin is bridge, you could use direct routes to connect the containers across multi-node.Suppose you have one master node and one minion node:
-
-```
-NODE   IP_ADDRESS   CONTAINER_CIDR
-master 10.148.0.1  10.244.1.0/24
-minion 10.148.0.2  10.244.2.0/24
-```
-
-Setting up routes:
+NOTE: Because kubeadm still assumes docker as the only container runtime ,Use the flag `--ignore-preflight-errors=all` to skip the check.
 
-```
-# master node
-ip route add 10.244.2.0/24 via 10.148.0.2
-
-# minion node
-ip route add 10.244.1.0/24 via 10.148.0.1
-```
+Copy & Run it in all your minion nodes.
 
 ## Run and Verify
 
@@ -220,7 +199,9 @@ spec:
     spec:
       containers:
       - name: pouch
-        image: docker.io/library/busybox:latest
+        image: docker.io/library/nginx:latest
+        ports:
+        - containerPort: 80
 
 # kubectl create -f pouch.yaml
 deployment "pouch" created
@@ -232,21 +213,37 @@ Confirm the pod of deployment is really running:
 # kubectl get pods -o wide
 NAME                     READY     STATUS    RESTARTS   AGE       IP           NODE
 pouch-7dcd875d69-gq5r9   1/1       Running   0          44m       10.244.1.4   master
-# ping 10.244.1.4
-PING 10.244.1.4 (10.244.1.4) 56(84) bytes of data.
-64 bytes from 10.244.1.4: icmp_seq=1 ttl=64 time=0.065 ms
-64 bytes from 10.244.1.4: icmp_seq=2 ttl=64 time=0.068 ms
-64 bytes from 10.244.1.4: icmp_seq=3 ttl=64 time=0.041 ms
-64 bytes from 10.244.1.4: icmp_seq=4 ttl=64 time=0.047 ms
-^C
---- 10.244.1.4 ping statistics ---
-4 packets transmitted, 4 received, 0% packet loss, time 3048ms
-rtt min/avg/max/mdev = 0.041/0.055/0.068/0.012 ms
+# curl 10.244.1.4
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to nginx!</title>
+<style>
+    body {
+        width: 35em;
+        margin: 0 auto;
+        font-family: Tahoma, Verdana, Arial, sans-serif;
+    }
+</style>
+</head>
+<body>
+<h1>Welcome to nginx!</h1>
+<p>If you see this page, the nginx web server is successfully installed and
+working. Further configuration is required.</p>
+
+<p>For online documentation and support please refer to
+<a href="http://nginx.org/">nginx.org</a>.<br/>
+Commercial support is available at
+<a href="http://nginx.com/">nginx.com</a>.</p>
+
+<p><em>Thank you for using nginx.</em></p>
+</body>
+</html>
 ```
 
 ## Troubleshooting
 
-- Because `kubeadm` still assumes docker as the only container runtime which can be used with kubernetes. When you use `kubeadm` to initialize the master node or join the minion node to the cluster, you may encounter the following error message:`[ERROR SystemVerification]: failed to get docker info: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?`. Use the flag `--skip-preflight-checks` to skip the check, like `kubeadm init --skip-preflight-checks`.
+- Because `kubeadm` still assumes docker as the only container runtime which can be used with kubernetes. When you use `kubeadm` to initialize the master node or join the minion node to the cluster, you may encounter the following error message:`[ERROR SystemVerification]: failed to get docker info: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?`. Use the flag `--ignore-preflight-errors=all` to skip the check, like `kubeadm init --ignore-preflight-errors=all`.
 
 - By default Pouch will support CRI v1alpha2,which means that using a version of Kubernetes prior to 1.10 will not work. As the NOTE mentioned above, we could start pouchd with the configuration like `pouchd --cri-version v1alpha1` to specify the version of CRI to support the version of Kubernetes below 1.10.