Merge pull request cncamp#5 from nevill/develop

Fix the installation process

Author: mfanjie

1.1.kubeadmin-setup.md

@@ -81,37 +81,36 @@ $ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 ### Add Docker repositry
 ```
 $ sudo add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+   "deb [arch=amd64] https://mirrors.ustc.edu.cn/docker-ce/linux/ubuntu \
    $(lsb_release -cs) \
    stable"
 ```
 
 ### Update the apt package index, and install the latest version of Docker Engine and containerd, or go to the next step to install a specific version:
 ```
 $ sudo apt-get update
-$ sudo apt-get install docker-ce docker-ce-cli containerd.io
+$ sudo apt-get install -y docker-ce docker-ce-cli containerd.io
 ```	
 ## install kubernetes
 ### Installing kubeadm, kubelet and kubectl 
 ```
 $ cat <<EOF > /etc/apt/sources.list.d/kubernetes.list
- deb http://mirrors.ustc.edu.cn/kubernetes/apt kubernetes-xenial main
+ deb https://mirrors.aliyun.com/kubernetes/apt kubernetes-xenial main
  EOF
 ```
 ```
-$ gpg --keyserver keyserver.ubuntu.com --recv-keys BA07F4FB
-$ gpg --export --armor BA07F4FB | sudo apt-key add -
+$ curl -s https://mirrors.aliyun.com/kubernetes/apt/doc/apt-key.gpg | sudo apt-key add
 ```
 ```
 $ sudo apt-get update
-$ sudo apt-get install -y kubelet kubeadm kubectl
+$ sudo apt-get install -y kubelet=1.19.15-00 kubeadm=1.19.15-00 kubectl=1.19.15-00
 $ sudo apt-mark hold kubelet kubeadm kubectl
 ```
 ### kubeadm init
 ```
-$ kubeadm init \
+$ sudo kubeadm init \
  --image-repository registry.aliyuncs.com/google_containers \
- --kubernetes-version v1.19.3 \
+ --kubernetes-version v1.19.15 \
  --apiserver-advertise-address=192.168.34.2
 ```
 
@@ -151,4 +150,4 @@ $ kubectl create -f https://docs.projectcalico.org/manifests/custom-resources.ya
 
 ```
 for i in `kubectl api-resources | grep true | awk '{print \$1}'`; do echo $i;kubectl get $i -n rook-ceph; done
-```
+```