update k8s1.9.4 & minor fix

whoisxiang · Mar 19, 2018 · 65f0d5e · 65f0d5e
1 parent b0f8d90
commit 65f0d5e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -16,8 +16,8 @@
 
 ## 组件版本
 
-- kubernetes	v1.9.3
-- etcd		v3.3.1
+- kubernetes	v1.9.4
+- etcd		v3.3.2
 - docker	17.12.0-ce
 - calico/node	v3.0.3
 - flannel	v0.10.0

diff --git a/bin/VERSION.md b/bin/VERSION.md
@@ -1,5 +1,5 @@
 # 主要组件版本
 
-+ kubernetes	v1.9.3
-+ etcd		v3.3.1
++ kubernetes	v1.9.4
++ etcd		v3.3.2
 + docker	17.12.0-ce
diff --git a/down/download.sh b/down/download.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #主要组件版本如下
-export K8S_VER=v1.9.3
-export ETCD_VER=v3.3.1
+export K8S_VER=v1.9.4
+export ETCD_VER=v3.3.2
 export DOCKER_VER=17.12.0-ce
 export CNI_VER=v0.7.0
 export DOCKER_COMPOSE=1.18.0

diff --git a/pics/alipay.png b/pics/alipay.png
diff --git a/roles/prepare/tasks/main.yml b/roles/prepare/tasks/main.yml
@@ -45,14 +45,12 @@
   - lxc-common
 
 - block:
-  when: ansible_distribution == "CentOS"
     - name: 删除centos默认安装
       yum: name={{ item }} state=absent
       with_items:
         - firewalld
         - python-firewall
         - firewalld-filesystem
-
     - name: 安装基础软件包
       yum: name={{ item }}  state=installed
       with_items:
@@ -62,16 +60,15 @@
         - psmisc # 安装psmisc 才能使用命令killall，它在keepalive的监测脚本中使用到
         - net-tools
         - bash-completion
-
     - name: 临时关闭 selinux
       shell: "setenforce 0" 
       failed_when: false
-
     - name: 永久关闭 selinux
       lineinfile:
         dest: /etc/selinux/config
         regexp: "^SELINUX"
         line: "SELINUX=disabled"
+  when: ansible_distribution == "CentOS"
 
 - name: 添加 kubectl 命令自动补全
   shell: "sed -i '/kubectl completion/d' ~/.bashrc && \