update k8s 1.9.6 && minor fix

README.md

@@ -16,10 +16,10 @@
 
 ## 组件版本
 
-- kubernetes	v1.9.4
+- kubernetes	v1.9.6
 - etcd		v3.3.2
-- docker	17.12.0-ce
+- docker	18.03.0-ce
-- calico/node	v3.0.3
+- calico/node	v3.0.4
 - flannel	v0.10.0
   - 附：集群用到的所有二进制文件已打包好供下载 [https://pan.baidu.com/s/1c4RFaA](https://pan.baidu.com/s/1c4RFaA)
   - 注：`Kubernetes v1.8.x` 版本请切换到项目分支 `v1.8`, 若你需要从v1.8 升级至 v1.9，请参考 [升级注意](docs/upgrade.md)

bin/VERSION.md

@@ -1,5 +1,5 @@
 # 主要组件版本
 
-+ kubernetes	v1.9.4
++ kubernetes	v1.9.6
 + etcd		v3.3.2
-+ docker	17.12.0-ce
++ docker	18.03.0-ce

down/download.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 #主要组件版本如下
-export K8S_VER=v1.9.4
+export K8S_VER=v1.9.6
 export ETCD_VER=v3.3.2
-export DOCKER_VER=17.12.0-ce
+export DOCKER_VER=18.03.0-ce
 export CNI_VER=v0.7.0
 export DOCKER_COMPOSE=1.18.0
 export HARBOR=v1.2.2

roles/calico/tasks/main.yml

@@ -42,11 +42,6 @@
 - name: 删除默认cni配置
   file: path=/etc/cni/net.d/10-default.conf state=absent
 
-# 删除原有cni插件网卡mynet0
-- name: 删除默认cni插件网卡mynet0
-  shell: "ip link del mynet0"
-  ignore_errors: true
-
 # [可选]cni calico plugins 已经在calico.yaml完成自动安装
 - name: 下载calicoctl 客户端
   copy: src={{ base_dir }}/bin/{{ item }} dest={{ bin_dir }}/{{ item }} mode=0755

roles/calico/templates/calico.yaml.j2

@@ -1,9 +1,9 @@
-# Calico Version v3.0.3
+# Calico Version v3.0.4
-# https://docs.projectcalico.org/v3.0/releases#v3.0.3
+# https://docs.projectcalico.org/v3.0/releases#v3.0.4
 # This manifest includes the following component versions:
-#   calico/node:v3.0.3
+#   calico/node:v3.0.4
-#   calico/cni:v2.0.1
+#   calico/cni:v2.0.3
-#   calico/kube-controllers:v2.0.1
+#   calico/kube-controllers:v2.0.2
 
 # This ConfigMap is used to configure a self-hosted Calico installation.
 kind: ConfigMap
@@ -96,8 +96,8 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          #image: quay.io/calico/node:v3.0.3
+          #image: quay.io/calico/node:v3.0.4
-          image: calico/node:v3.0.3
+          image: calico/node:v3.0.4
           env:
             # The location of the Calico etcd cluster.
             - name: ETCD_ENDPOINTS
@@ -193,8 +193,8 @@ spec:
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          #image: quay.io/calico/cni:v2.0.1
+          #image: quay.io/calico/cni:v2.0.3
-          image: calico/cni:v2.0.1
+          image: calico/cni:v2.0.3
           command: ["/install-cni.sh"]
           env:
             # Name of the CNI config file to create.
@@ -276,8 +276,8 @@ spec:
       serviceAccountName: calico-kube-controllers
       containers:
         - name: calico-kube-controllers
-          #image: quay.io/calico/kube-controllers:v2.0.1
+          #image: quay.io/calico/kube-controllers:v2.0.2
-          image: calico/kube-controllers:v2.0.1
+          image: calico/kube-controllers:v2.0.2
           env:
             # The location of the Calico etcd cluster.
             - name: ETCD_ENDPOINTS

roles/kube-node/tasks/main.yml

@@ -60,7 +60,7 @@
   shell: "systemctl status kubelet.service|grep Active"
   register: kubelet_status
   until: '"running" in kubelet_status.stdout'
-  retries: 3
+  retries: 8
   delay: 2
 
 - name: 获取csr 请求信息
@@ -78,5 +78,5 @@
   shell: "{{ bin_dir }}/kubectl get node|grep {{ NODE_IP }}|awk '{print $2}'"
   register: node_status
   until: node_status.stdout == "Ready" or node_status.stdout == "Ready,SchedulingDisabled"
-  retries: 5
+  retries: 8
   delay: 5