From 732698953161685d9a029989c49070a04bc3665c Mon Sep 17 00:00:00 2001
From: "huanqing.shao" <shaohq@foxmail.com>
Date: Sun, 6 Sep 2020 19:45:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=20kubernetes=20v1.19.x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vuepress/public/install-script/calico/calico-3.13.1.yaml  | 2 --
 .vuepress/public/install-script/v1.19.x/install-kubelet.sh | 5 +----
 .vuepress/public/install-script/v1.19.x/install_kubelet.sh | 5 +----
 install/install-dashboard.md                               | 1 +
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.vuepress/public/install-script/calico/calico-3.13.1.yaml b/.vuepress/public/install-script/calico/calico-3.13.1.yaml
index 9585d82..7c6a92c 100644
--- a/.vuepress/public/install-script/calico/calico-3.13.1.yaml
+++ b/.vuepress/public/install-script/calico/calico-3.13.1.yaml
@@ -790,5 +790,3 @@ metadata:
 
 ---
 # Source: calico/templates/configure-canal.yaml
-
-
diff --git a/.vuepress/public/install-script/v1.19.x/install-kubelet.sh b/.vuepress/public/install-script/v1.19.x/install-kubelet.sh
index 76c423f..eccc723 100644
--- a/.vuepress/public/install-script/v1.19.x/install-kubelet.sh
+++ b/.vuepress/public/install-script/v1.19.x/install-kubelet.sh
@@ -33,6 +33,7 @@ mkdir /etc/docker || true
 
 cat > /etc/docker/daemon.json <<EOF
 {
+  "registry-mirrors": ["https://registry.cn-hangzhou.aliyuncs.com"],
   "exec-opts": ["native.cgroupdriver=systemd"],
   "log-driver": "json-file",
   "log-opts": {
@@ -109,10 +110,6 @@ yum remove -y kubelet kubeadm kubectl
 # 将 ${1} 替换为 kubernetes 版本号，例如 1.19.0
 yum install -y kubelet-${1} kubeadm-${1} kubectl-${1}
 
-# 设置 docker 镜像，提高 docker 镜像下载速度和稳定性
-# 如果您访问 https://hub.docker.io 速度非常稳定，亦可以跳过这个步骤
-curl -sSL https://kuboard.cn/install-script/set_mirror.sh | sh -s https://registry.cn-hangzhou.aliyuncs.com
-
 # 重启 docker，并启动 kubelet
 systemctl daemon-reload
 systemctl restart docker
diff --git a/.vuepress/public/install-script/v1.19.x/install_kubelet.sh b/.vuepress/public/install-script/v1.19.x/install_kubelet.sh
index 38e2953..32d0170 100644
--- a/.vuepress/public/install-script/v1.19.x/install_kubelet.sh
+++ b/.vuepress/public/install-script/v1.19.x/install_kubelet.sh
@@ -33,6 +33,7 @@ mkdir /etc/docker || true
 
 cat > /etc/docker/daemon.json <<EOF
 {
+  "registry-mirrors": ["${REGISTRY_MIRROR}"],
   "exec-opts": ["native.cgroupdriver=systemd"],
   "log-driver": "json-file",
   "log-opts": {
@@ -109,10 +110,6 @@ yum remove -y kubelet kubeadm kubectl
 # 将 ${1} 替换为 kubernetes 版本号，例如 1.19.0
 yum install -y kubelet-${1} kubeadm-${1} kubectl-${1}
 
-# 设置 docker 镜像，提高 docker 镜像下载速度和稳定性
-# 如果您访问 https://hub.docker.io 速度非常稳定，亦可以跳过这个步骤
-curl -sSL https://kuboard.cn/install-script/set_mirror.sh | sh -s ${REGISTRY_MIRROR}
-
 # 重启 docker，并启动 kubelet
 systemctl daemon-reload
 systemctl restart docker
diff --git a/install/install-dashboard.md b/install/install-dashboard.md
index 7e298fe..a938943 100644
--- a/install/install-dashboard.md
+++ b/install/install-dashboard.md
@@ -39,6 +39,7 @@ Kuboard 是 Kubernetes 的一款图形化管理界面。
 
 | Kubernetes 版本 | Kuboard 版本   | 兼容性 | 说明                                                         |
 | --------------- | -------------- | ------ | ------------------------------------------------------------ |
+| v1.19           | v2.0.x          | <span style="font-size: 24px;">😄</span>      | 已验证                            |
 | v1.18           | v1.0.x， v2.0.x | <span style="font-size: 24px;">😄</span>      | 已验证                            |
 | v1.17           | v1.0.x， v2.0.x | <span style="font-size: 24px;">😄</span>      | 已验证                            |
 | v1.16           | v1.0.x， v2.0.x | <span style="font-size: 24px;">😄</span>      | 已验证                            |