diff --git a/.gitignore b/.gitignore index 794d7ec..d37dbd6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,17 +6,12 @@ down/* bin/* !bin/readme.md -# kube-dns controller -manifests/kubedns/kubedns.yaml -manifests/coredns/coredns.yaml - # ansible hosts hosts # k8s storage manifests manifests/storage/* !manifests/storage/test.yaml -!manifests/storage/alicloud-nas/alicloud-disk.yaml # k8s backup directory roles/cluster-backup/files/* diff --git a/22.upgrade.yml b/22.upgrade.yml index f16190f..73552da 100644 --- a/22.upgrade.yml +++ b/22.upgrade.yml @@ -6,8 +6,6 @@ - kube-master - kube-node - deploy - - etcd - - lb roles: - prepare @@ -19,17 +17,23 @@ # docker更新,为保证不中断业务,不自动重启docker服务 - hosts: - kube-master + - new-master - kube-node + - new-node roles: - docker # 更新master节点 -- hosts: kube-master +- hosts: + - kube-master + - new-master roles: - kube-master - kube-node # 更新node节点 -- hosts: kube-node +- hosts: + - kube-node + - new-node roles: - { role: kube-node, when: "DEPLOY_MODE != 'allinone'" } diff --git a/manifests/coredns/readme.md b/manifests/coredns/readme.md deleted file mode 100644 index 10b2d90..0000000 --- a/manifests/coredns/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -### 说明 - -+ 本目录为k8s集群的插件 coredns的配置目录,初始为空目录 -+ 因coredns.yaml文件中参数(CLUSTER_DNS_SVC_IP, CLUSTER_DNS_DOMAIN)根据hosts文件设置而定,需要使用ansible template模块替换参数后生成 -+ 运行 `ansible-playbook 07.cluster-addon.yml`后会生成该目录下的coredns.yaml 文件 -+ coredns.yaml [模板文件](../../roles/cluster-addon/templates/coredns.yaml.j2) diff --git a/manifests/kubedns/readme.md b/manifests/kubedns/readme.md deleted file mode 100644 index f1f21d0..0000000 --- a/manifests/kubedns/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -### 说明 - -+ 本目录为k8s集群的插件 kubedns的配置目录,初始为空目录 -+ 因kubedns.yaml文件中参数(CLUSTER_DNS_SVC_IP, CLUSTER_DNS_DOMAIN)根据hosts文件设置而定,需要使用ansible template模块替换参数后生成 -+ 运行 `ansible-playbook 07.cluster-addon.yml`后会生成该目录下的kubedns.yaml 文件 -+ kubedns.yaml [模板文件](../../roles/cluster-addon/templates/kubedns.yaml.j2)