From fc37c0c93023b6da670ecdb3f158bb438c78e377 Mon Sep 17 00:00:00 2001 From: gjmzj Date: Thu, 4 Jul 2019 20:49:34 +0800 Subject: [PATCH] minor changes, prepare release --- README.md | 4 ++-- docs/setup/quickStart.md | 3 +++ roles/clean/tasks/clean_node.yml | 8 ++++---- tools/easzup | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7357c25..ec8b132 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ 项目致力于提供快速部署高可用`k8s`集群的工具, 同时也努力成为`k8s`实践、使用的参考书；基于二进制方式部署和利用`ansible-playbook`实现自动化；既提供一键安装脚本, 也可以根据`安装指南`分步执行安装各个组件。 - **集群特性** `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 -- **运行时** 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) 请阅读[项目分支说明](docs/mixes/branch.md), 欢迎提[Issues](https://github.com/easzlab/kubeasz/issues)和[PRs](docs/mixes/HowToContribute.md)参与维护项目！感谢您的关注与支持！ diff --git a/docs/setup/quickStart.md b/docs/setup/quickStart.md index 3429ee2..deb80f4 100644 --- a/docs/setup/quickStart.md +++ b/docs/setup/quickStart.md @@ -85,3 +85,6 @@ $ umount /var/run/docker/netns/default $ umount /var/lib/docker/overlay $ rm -rf /var/lib/docker /var/run/docker ``` + +上述清理脚本执行成功后，建议重启节点，以确保清理残留的虚拟网卡、路由等信息。 + diff --git a/roles/clean/tasks/clean_node.yml b/roles/clean/tasks/clean_node.yml index d3d11fa..711acd0 100644 --- a/roles/clean/tasks/clean_node.yml +++ b/roles/clean/tasks/clean_node.yml @@ -120,10 +120,10 @@ ip link del ovs-system" ignore_errors: true - - name: cleanup networks2 - shell: "systemctl restart networking; \ - systemctl restart network" - ignore_errors: true + #- name: cleanup networks2 + # shell: "systemctl restart networking; \ + # systemctl restart network" + # ignore_errors: true - name: cleanup 'calico' routes shell: "for rt in `ip route|grep bird|sed 's/blackhole //'|awk '{print $1}'`;do ip route del $rt;done;" diff --git a/tools/easzup b/tools/easzup index 5ecf1c5..bb0f362 100755 --- a/tools/easzup +++ b/tools/easzup @@ -15,7 +15,7 @@ set -o errexit # default version, can be overridden by cmd line options 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 EXT_BIN_VER=0.3.0 export SYS_PKG_VER=0.2.1