fix

fjibj · Dec 26, 2017 · 938016a · 938016a
1 parent e6ee0e4
commit 938016a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/99.clean.yml b/99.clean.yml
@@ -1,7 +1,9 @@
-# 警告：此脚本将清理真个K8S集群，包括所有POD、ETCD数据等
+# 警告：此脚本将清理整个K8S集群，包括所有POD、ETCD数据等
 # 请三思后运行此脚本 ansible-playbook 99.clean.yml
 
-- hosts: kube-node
+- hosts:
+  - kube-node
+  - new-node
   tasks:
   - name: stop kube-node service
     shell: "systemctl stop kubelet kube-proxy"
@@ -37,6 +39,7 @@
 
 - hosts:
   - kube-cluster
+  - new-node
   - deploy
   tasks:
   - name: stop calico-node service

diff --git a/docs/quickStart.md b/docs/quickStart.md
@@ -91,7 +91,7 @@ kubectl create -f /etc/ansible/manifests/heapster
 # 安装dashboard
 kubectl create -f /etc/ansible/manifests/dashboard
 ```
-+ 更新后`dashboard`已经默认关闭非安全端口访问，请使用`https://10.100.80.30:6443/api/v1/namespaces/kube-system/services/kubernetes-dashboard/proxy`访问，并用默认用户 `admin:test1234` 登陆，更多内容请查阅[dashboard文档](guide/dashboard.md)
++ 更新后`dashboard`已经默认关闭非安全端口访问，请使用`https://xx.xx.xx.xx:6443/api/v1/namespaces/kube-system/services/kubernetes-dashboard/proxy`访问，并用默认用户 `admin:test1234` 登陆，更多内容请查阅[dashboard文档](guide/dashboard.md)
 
 ### 7.清理集群
 

diff --git a/example/hosts.allinone.example b/example/hosts.allinone.example
@@ -20,7 +20,11 @@ kube-master
 
 # 如果启用harbor，请配置后面harbor相关参数
 [harbor]
-#10.100.97.44 NODE_IP="192.168.1.8"
+#192.168.1.8 NODE_IP="192.168.1.8"
+
+# 预留组，后续添加node节点使用
+[new-node]
+#192.168.1.xx NODE_ID=node6 NODE_IP="192.168.1.xx"
 
 [all:vars]
 # ---------集群主要参数---------------

diff --git a/example/hosts.m-masters.example b/example/hosts.m-masters.example
@@ -36,7 +36,7 @@ kube-master
 
 # 如果启用harbor，请配置后面harbor相关参数
 [harbor]
-#10.100.97.44 NODE_IP="192.168.1.8"
+#192.168.1.8 NODE_IP="192.168.1.8"
 
 # 预留组，后续添加node节点使用
 [new-node]

diff --git a/example/hosts.s-master.example b/example/hosts.s-master.example
@@ -24,7 +24,11 @@ kube-master
 
 # 如果启用harbor，请配置后面harbor相关参数
 [harbor]
-#10.100.97.44 NODE_IP="192.168.1.8"
+#192.168.1.8 NODE_IP="192.168.1.8"
+
+# 预留组，后续添加node节点使用
+[new-node]
+#192.168.1.xx NODE_ID=node6 NODE_IP="192.168.1.xx"
 
 [all:vars]
 # ---------集群主要参数---------------