easzlab
/
kubeasz
mirror of https://github.com/easzlab/kubeasz.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor changes, prepare release

pull/641/head
gjmzj 2019-07-04 20:49:34 +08:00
parent 2d182a4f32
commit fc37c0c930
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -3,9 +3,9 @@
项目致力于提供快速部署高可用`k8s`集群的工具, 同时也努力成为`k8s`实践、使用的参考书；基于二进制方式部署和利用`ansible-playbook`实现自动化；既提供一键安装脚本, 也可以根据`安装指南`分步执行安装各个组件。 项目致力于提供快速部署高可用`k8s`集群的工具, 同时也努力成为`k8s`实践、使用的参考书；基于二进制方式部署和利用`ansible-playbook`实现自动化；既提供一键安装脚本, 也可以根据`安装指南`分步执行安装各个组件。
- **集群特性** `TLS`双向认证、`RBAC`授权、[多Master高可用](docs/setup/00-planning_and_overall_intro.md#ha-architecture)、支持`Network Policy`、备份恢复、[离线安装](docs/setup/offline_install.md) - **集群特性** `TLS`双向认证、`RBAC`授权、[多Master高可用](docs/setup/00-planning_and_overall_intro.md#ha-architecture)、支持`Network Policy`、备份恢复、[离线安装](docs/setup/offline_install.md)
- **集群版本** kubernetes v1.11, v1.12, v1.13, v1.14 - **集群版本** kubernetes v1.11, v1.12, v1.13, v1.14, v1.15
- **操作系统** Ubuntu 16.04+, CentOS/RedHat 7 - **操作系统** Ubuntu 16.04+, CentOS/RedHat 7
- **运行时** docker 17.03.x-ce, 18.06.x-ce, 18.09.x, [containerd](docs/guide/containerd.md) 1.2.6 - **运行时** docker 18.06.x-ce, 18.09.x, [containerd](docs/guide/containerd.md) 1.2.6
- **网络** [calico](docs/setup/network-plugin/calico.md), [cilium](docs/setup/network-plugin/cilium.md), [flannel](docs/setup/network-plugin/flannel.md), [kube-ovn](docs/setup/network-plugin/kube-ovn.md), [kube-router](docs/setup/network-plugin/kube-router.md) - **网络** [calico](docs/setup/network-plugin/calico.md), [cilium](docs/setup/network-plugin/cilium.md), [flannel](docs/setup/network-plugin/flannel.md), [kube-ovn](docs/setup/network-plugin/kube-ovn.md), [kube-router](docs/setup/network-plugin/kube-router.md)
请阅读[项目分支说明](docs/mixes/branch.md), 欢迎提[Issues](https://github.com/easzlab/kubeasz/issues)和[PRs](docs/mixes/HowToContribute.md)参与维护项目！感谢您的关注与支持！ 请阅读[项目分支说明](docs/mixes/branch.md), 欢迎提[Issues](https://github.com/easzlab/kubeasz/issues)和[PRs](docs/mixes/HowToContribute.md)参与维护项目！感谢您的关注与支持！

3
docs/setup/quickStart.md
View File

@ -85,3 +85,6 @@ $ umount /var/run/docker/netns/default
$ umount /var/lib/docker/overlay $ umount /var/lib/docker/overlay
$ rm -rf /var/lib/docker /var/run/docker $ rm -rf /var/lib/docker /var/run/docker
``` ```
上述清理脚本执行成功后，建议重启节点，以确保清理残留的虚拟网卡、路由等信息。

8
roles/clean/tasks/clean_node.yml
View File

@ -120,10 +120,10 @@
ip link del ovs-system" ip link del ovs-system"
ignore_errors: true ignore_errors: true
- name: cleanup networks2 #- name: cleanup networks2
shell: "systemctl restart networking; \ # shell: "systemctl restart networking; \
systemctl restart network" # systemctl restart network"
ignore_errors: true # ignore_errors: true
- name: cleanup 'calico' routes - name: cleanup 'calico' routes
shell: "for rt in `ip route|grep bird|sed 's/blackhole //'|awk '{print $1}'`;do ip route del $rt;done;" shell: "for rt in `ip route|grep bird|sed 's/blackhole //'|awk '{print $1}'`;do ip route del $rt;done;"

2
tools/easzup
View File

@ -15,7 +15,7 @@ set -o errexit
# default version, can be overridden by cmd line options # default version, can be overridden by cmd line options
export DOCKER_VER=18.09.6 export DOCKER_VER=18.09.6
export KUBEASZ_VER=2.0.0 export KUBEASZ_VER=2.0.1
export K8S_BIN_VER=v1.14.3 export K8S_BIN_VER=v1.14.3
export EXT_BIN_VER=0.3.0 export EXT_BIN_VER=0.3.0
export SYS_PKG_VER=0.2.1 export SYS_PKG_VER=0.2.1