fix 节点角色删除时/opt/kube/bin被误删 #837

roles/clean/tasks/main.yml

@@ -32,8 +32,10 @@
   with_items:
   - "/opt/kube/bin"
   - "/opt/kube/images"
+  when: 'DEL_ETCD == "yes" and DEL_NODE == "yes" and DEL_MASTER == "yes"'
 
 - name: 重启提示 WARNNING
   debug:
     msg: "[重要]: 请重启节点以确保清除系统残留的虚拟网卡、路由信息、iptalbes|ipvs规则等 \
           [IMPORTANT]: please reboot nodes, makesure to clean out net interfaces, routes and iptables/ipvs rules"
+  when: 'DEL_ETCD == "yes" and DEL_NODE == "yes" and DEL_MASTER == "yes"'

tools/easzup

@@ -14,9 +14,9 @@ set -o errexit
 #set -o xtrace
 
 # default version, can be overridden by cmd line options
-export DOCKER_VER=19.03.5
+export DOCKER_VER=19.03.8
 export KUBEASZ_VER=2.2.0
-export K8S_BIN_VER=v1.17.2
+export K8S_BIN_VER=v1.18.2
 export EXT_BIN_VER=0.4.0
 export SYS_PKG_VER=0.3.3
 
@@ -183,11 +183,11 @@ function get_sys_pkg() {
 
 function get_offline_image() {
   # images needed by k8s cluster
-  calicoVer=v3.8.4
+  calicoVer=v3.8.8
   corednsVer=1.6.7
-  dashboardVer=v2.0.0-rc3
-  dashboardMetricsScraperVer=v1.0.3
-  flannelVer=v0.11.0-amd64
+  dashboardVer=v2.0.0
+  dashboardMetricsScraperVer=v1.0.4
+  flannelVer=v0.12.0-amd64
   metricsVer=v0.3.6
   pauseVer=3.2
   traefikVer=v1.7.20