From 938016aef9a9a731ae8b311fdf0a9bb0d7369716 Mon Sep 17 00:00:00 2001 From: jmgao Date: Tue, 26 Dec 2017 15:52:35 +0800 Subject: [PATCH] fix --- 99.clean.yml | 7 +++++-- docs/quickStart.md | 2 +- example/hosts.allinone.example | 6 +++++- example/hosts.m-masters.example | 2 +- example/hosts.s-master.example | 6 +++++- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/99.clean.yml b/99.clean.yml index ebd7d22..432968a 100644 --- 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 index 25ed5ac..b6a6b37 100644 --- 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 index f17ba23..8387308 100644 --- 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 index fa76e7e..f262ec7 100644 --- 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 index 690ba37..29c7fb0 100644 --- 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] # ---------集群主要参数---------------