diff --git a/bin/VERSION.md b/bin/VERSION.md index b4f6a9a..932e12e 100644 --- a/bin/VERSION.md +++ b/bin/VERSION.md @@ -1,6 +1,5 @@ # 主要组件版本 -+ kubernetes v1.9.0 -+ etcd v3.2.11 -+ docker 17.09.1-ce -+ calico/node v2.6.3 ++ kubernetes v1.9.1 ++ etcd v3.2.13 ++ docker 17.12.0-ce diff --git a/roles/prepare/tasks/main.yml b/roles/prepare/tasks/main.yml index fd74800..52eb296 100644 --- a/roles/prepare/tasks/main.yml +++ b/roles/prepare/tasks/main.yml @@ -64,3 +64,4 @@ - name: 生效系统参数 shell: "sysctl -p /etc/sysctl.d/95-k8s-sysctl.conf" + ignore_errors: true