diff --git a/01.prepare.yml b/01.prepare.yml index d1b252e..29abcee 100644 --- a/01.prepare.yml +++ b/01.prepare.yml @@ -6,8 +6,8 @@ # 集群节点的公共配置任务 - hosts: - kube-cluster + - deploy - etcd - - lb roles: - prepare diff --git a/03.kubectl.yml b/03.kubectl.yml index 53e0579..bdd0c01 100644 --- a/03.kubectl.yml +++ b/03.kubectl.yml @@ -1,5 +1,5 @@ - hosts: - kube-cluster - - lb + - deploy roles: - kubectl diff --git a/95.clean.yml b/99.clean.yml similarity index 95% rename from 95.clean.yml rename to 99.clean.yml index 284a3a0..4afe264 100644 --- a/95.clean.yml +++ b/99.clean.yml @@ -1,3 +1,5 @@ +# 警告:此脚本将清理真个K8S集群,包括所有POD、ETCD数据等 +# 请三思后运行改脚本 ansible-playbook 99.clean.yml - hosts: kube-cluster tasks: - name: stop calico-node service diff --git a/roles/calico/templates/cni-calico.conf.j2 b/roles/calico/templates/cni-calico.conf.j2 index be24b26..0216b01 100644 --- a/roles/calico/templates/cni-calico.conf.j2 +++ b/roles/calico/templates/cni-calico.conf.j2 @@ -12,7 +12,7 @@ "type": "calico-ipam" }, "policy": { - "type": "k8s", + "type": "k8s" }, "kubernetes": { "kubeconfig": "/root/.kube/config"