From 8b7a90da34921c6c3546dd9de73545d522ee96b4 Mon Sep 17 00:00:00 2001
From: gjmzj <gaojianming.zj@139.com>
Date: Tue, 26 Dec 2017 15:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0k8s1.8.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                              |  8 ++++----
 bin/VERSION.md                                         |  9 +++++----
 ...345\217\202\346\225\260\350\256\276\345\256\232.md" |  2 +-
 ...6\211\350\243\205docker\346\234\215\345\212\241.md" |  2 +-
 ...347\275\221\347\273\234\347\273\204\344\273\266.md" |  6 +++---
 docs/quickStart.md                                     |  2 +-
 down/download.sh                                       | 10 +++++-----
 example/hosts.allinone.example                         |  6 +++++-
 example/hosts.m-masters.example                        |  2 +-
 example/hosts.s-master.example                         |  6 +++++-
 roles/calico/templates/calico-node.service.j2          |  2 +-
 roles/kube-node/files/rbac.yaml                        |  4 ++--
 .../templates/calico-kube-controllers.yaml.j2          | 10 +++++-----
 13 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index ca28e8c..813903f 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,10 @@
 
 ## 缁勪欢鐗堟湰
 
-1. kubernetes	v1.8.4
-1. etcd		v3.2.10
-1. docker	17.09.0-ce
-1. calico/node	v2.6.2
+1. kubernetes	v1.8.6
+1. etcd		v3.2.11
+1. docker	17.09.1-ce
+1. calico/node	v2.6.3
 
 闄勶細闆嗙兢鐢ㄥ埌鐨勬墍鏈変簩杩涘埗鏂囦欢宸叉墦鍖呭ソ渚涗笅杞� [https://pan.baidu.com/s/1c4RFaA](https://pan.baidu.com/s/1c4RFaA) 
 
diff --git a/bin/VERSION.md b/bin/VERSION.md
index c7c0518..b4f6a9a 100644
--- a/bin/VERSION.md
+++ b/bin/VERSION.md
@@ -1,5 +1,6 @@
 # 涓昏缁勪欢鐗堟湰
-kubernetes	v1.8.4
-etcd		v3.2.10
-docker		17.09.0-ce
-calico/node	v2.6.2
+
++ kubernetes	v1.9.0
++ etcd		v3.2.11
++ docker	17.09.1-ce
++ calico/node	v2.6.3
diff --git "a/docs/00-\351\233\206\347\276\244\350\247\204\345\210\222\345\222\214\345\237\272\347\241\200\345\217\202\346\225\260\350\256\276\345\256\232.md" "b/docs/00-\351\233\206\347\276\244\350\247\204\345\210\222\345\222\214\345\237\272\347\241\200\345\217\202\346\225\260\350\256\276\345\256\232.md"
index fe10b81..72517bc 100644
--- "a/docs/00-\351\233\206\347\276\244\350\247\204\345\210\222\345\222\214\345\237\272\347\241\200\345\217\202\346\225\260\350\256\276\345\256\232.md"
+++ "b/docs/00-\351\233\206\347\276\244\350\247\204\345\210\222\345\222\214\345\237\272\347\241\200\345\217\202\346\225\260\350\256\276\345\256\232.md"
@@ -134,7 +134,7 @@ mv kubeasz /etc/ansible
 # 涓嬭浇宸叉墦鍖呭ソ鐨刡inaries锛屽苟涓旇В鍘嬬缉鍒�/etc/ansible/bin鐩綍
 # 鍥藉唴璇蜂粠鎴戝垎浜殑鐧惧害浜戦摼鎺ヤ笅杞� https://pan.baidu.com/s/1c4RFaA 
 # 濡傛灉浣犳湁鍚堥€傜綉缁滅幆澧冧篃鍙互鎸夌収/down/download.sh鑷浠庡畼缃戜笅杞藉悇绉峵ar鍖呭埌 ./down鐩綍锛屽苟鎵цdownload.sh
-tar zxvf k8s.184.tar.gz
+tar zxvf k8s.186.tar.gz
 mv bin/* /etc/ansible/bin
 # 閰嶇疆ansible鐨刪osts鏂囦欢锛屽苟涓旀牴鎹笂鏂囧疄闄呰鍒掍慨鏀规hosts鏂囦欢
 cd /etc/ansible
diff --git "a/docs/04-\345\256\211\350\243\205docker\346\234\215\345\212\241.md" "b/docs/04-\345\256\211\350\243\205docker\346\234\215\345\212\241.md"
index e29158c..a0f5ea1 100644
--- "a/docs/04-\345\256\211\350\243\205docker\346\234\215\345\212\241.md"
+++ "b/docs/04-\345\256\211\350\243\205docker\346\234\215\345\212\241.md"
@@ -52,7 +52,7 @@ WantedBy=multi-user.target
 }
 ```
 
-杩欏皢鍦ㄥ悗缁儴缃瞔alico涓嬭浇 calico/node:v2.6.2闀滃儚鍜宬ubedns/heapster/dashboard闀滃儚鏃惰捣鍒伴噸瑕佸姞閫熸晥鏋溿€�
+杩欏皢鍦ㄥ悗缁儴缃瞔alico涓嬭浇 calico/node:v2.6闀滃儚鍜宬ubedns/heapster/dashboard闀滃儚鏃惰捣鍒伴噸瑕佸姞閫熸晥鏋溿€�
 
 鐢变簬K8S鐨勫畼鏂归暅鍍忓瓨鏀惧湪`gcr.io`浠撳簱锛屽洜姝よ繖涓暅鍍忓姞閫熷K8S鐨勫畼鏂归暅鍍忔病鏈夋晥鏋滐紱濂藉湪`Docker Hub`涓婃湁寰堝K8S闀滃儚鐨勮浆瀛橈紝鑰宍Docker Hub`涓婄殑闀滃儚鏄浗鍐呭彲浠ュ姞閫熺殑銆�
 杩欓噷鎺ㄨ崘[mirrorgooglecontainers](https://hub.docker.com/u/mirrorgooglecontainers/)鍑犱箮鑳芥壘鍒版墍鏈塊8S鐩稿叧鐨刧oogle闀滃儚锛岃€屼笖鏇存柊鍙婃椂锛屾劅璋㈢淮鎶よ€呯殑杈涘嫟浠樺嚭锛佸悗鏂囧皢鐪嬪埌閮ㄧ讲闄勫姞缁勪欢鏃跺熀鏈兘鏄敤浠栦滑鐨勯暅鍍忋€�
diff --git "a/docs/05-\345\256\211\350\243\205calico\347\275\221\347\273\234\347\273\204\344\273\266.md" "b/docs/05-\345\256\211\350\243\205calico\347\275\221\347\273\234\347\273\204\344\273\266.md"
index 799dbde..1b5217d 100644
--- "a/docs/05-\345\256\211\350\243\205calico\347\275\221\347\273\234\347\273\204\344\273\266.md"
+++ "b/docs/05-\345\256\211\350\243\205calico\347\275\221\347\273\234\347\273\204\344\273\266.md"
@@ -102,7 +102,7 @@ ExecStart={{ bin_dir }}/docker run --net=host --privileged --name=calico-node \
   -v /run/docker/plugins:/run/docker/plugins \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -v /var/log/calico:/var/log/calico \
-  calico/node:v2.6.2
+  calico/node:v2.6.3
 ExecStop={{ bin_dir }}/docker rm -f calico-node
 Restart=always
 RestartSec=10
@@ -162,12 +162,12 @@ spec:
 
 ### 楠岃瘉calico缃戠粶
 
-鎵цcalico瀹夎 `ansible-playbook 05.calico.yml` 鎴愬姛鍚庡彲浠ラ獙璇佸涓嬶細(闇€瑕佺瓑寰卌alico/node:v2.6.2 闀滃儚涓嬭浇瀹屾垚锛屾湁鏃跺€欏嵆渚夸笂涓€姝ュ凡缁忛厤缃簡docker鍥藉唴鍔犻€燂紝杩樻槸鍙兘姣旇緝鎱紝寤鸿纭浠ヤ笅瀹瑰櫒杩愯璧锋潵浠ュ悗锛屽啀鎵ц鍚庣画姝ラ)
+鎵цcalico瀹夎 `ansible-playbook 05.calico.yml` 鎴愬姛鍚庡彲浠ラ獙璇佸涓嬶細(闇€瑕佺瓑寰卌alico/node:v2.6.x 闀滃儚涓嬭浇瀹屾垚锛屾湁鏃跺€欏嵆渚夸笂涓€姝ュ凡缁忛厤缃簡docker鍥藉唴鍔犻€燂紝杩樻槸鍙兘姣旇緝鎱紝寤鸿纭浠ヤ笅瀹瑰櫒杩愯璧锋潵浠ュ悗锛屽啀鎵ц鍚庣画姝ラ)
 
 ``` bash
 docker ps 
 CONTAINER ID        IMAGE                COMMAND             CREATED             STATUS              PORTS               NAMES
-631dde89eada        calico/node:v2.6.2   "start_runit"       10 minutes ago      Up 10 minutes                           calico-node
+631dde89eada        calico/node:v2.6.x   "start_runit"       10 minutes ago      Up 10 minutes                           calico-node
 ```
 
 **鏌ョ湅缃戝崱鍜岃矾鐢变俊鎭�**
diff --git a/docs/quickStart.md b/docs/quickStart.md
index 55878a3..a6a2b8b 100644
--- a/docs/quickStart.md
+++ b/docs/quickStart.md
@@ -53,7 +53,7 @@ mv kubeasz /etc/ansible
 # 涓嬭浇宸叉墦鍖呭ソ鐨刡inaries锛屽苟涓旇В鍘嬬缉鍒�/etc/ansible/bin鐩綍
 # 鍥藉唴璇蜂粠鎴戝垎浜殑鐧惧害浜戦摼鎺ヤ笅杞� https://pan.baidu.com/s/1c4RFaA 
 # 濡傛灉浣犳湁鍚堥€傜綉缁滅幆澧冧篃鍙互鎸夌収/down/download.sh鑷浠庡畼缃戜笅杞藉悇绉峵ar鍖呭埌 ./down鐩綍锛屽苟鎵цdownload.sh
-tar zxvf k8s.184.tar.gz
+tar zxvf k8s.186.tar.gz
 mv bin/* /etc/ansible/bin
 # 閰嶇疆ansible鐨刪osts鏂囦欢
 cd /etc/ansible
diff --git a/down/download.sh b/down/download.sh
index 9bb53d3..bee4ffe 100644
--- a/down/download.sh
+++ b/down/download.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 #涓昏缁勪欢鐗堟湰濡備笅
-export K8S_VER=v1.8.4
-export ETCD_VER=v3.2.10
-export DOCKER_VER=17.09.0-ce
-export CALICO_VER=v2.6.2
+export K8S_VER=v1.8.6
+export ETCD_VER=v3.2.11
+export DOCKER_VER=17.09.1-ce
+export CALICO_VER=v2.6.3
 export DOCKER_COMPOSE=1.18.0
 export HARBOR=v1.2.2
 
-echo "\n寤鸿鐩存帴涓嬭浇鏈汉鎵撳寘濂界殑鎵€鏈夊繀瑕佷簩杩涘埗鍖卥8s-184.all.tar.gz锛岀劧鍚庤В鍘嬪埌bin鐩綍"
+echo "\n寤鸿鐩存帴涓嬭浇鏈汉鎵撳寘濂界殑鎵€鏈夊繀瑕佷簩杩涘埗鍖卥8s-190.all.tar.gz锛岀劧鍚庤В鍘嬪埌bin鐩綍"
 echo "\n寤鸿涓嶄娇鐢ㄦ鑴氭湰锛屽鏋滀綘鎯冲崌绾х粍浠舵垨鑰呭疄楠岋紝璇烽€氳璇ヨ剼鏈紝蹇呰鏃堕€傚綋淇敼鍚庝娇鐢�"
 echo "\n娉ㄦ剰1锛氬洜涓虹綉缁滃師鍥犱笉杩涜鑷姩涓嬭浇,璇锋寜鐓т互涓嬮摼鎺ユ墜鍔ㄤ笅杞戒簩杩涘埗鍖呭埌down鐩綍涓�"
 echo "\n娉ㄦ剰2锛氬鏋滆繕娌℃湁鎵嬪伐涓嬭浇tar鍖咃紝璇稢trl-c缁撴潫姝よ剼鏈�"
diff --git a/example/hosts.allinone.example b/example/hosts.allinone.example
index f17ba23..8387308 100644
--- a/example/hosts.allinone.example
+++ b/example/hosts.allinone.example
@@ -20,7 +20,11 @@ kube-master
 
 # 濡傛灉鍚敤harbor锛岃閰嶇疆鍚庨潰harbor鐩稿叧鍙傛暟
 [harbor]
-#10.100.97.44 NODE_IP="192.168.1.8"
+#192.168.1.8 NODE_IP="192.168.1.8"
+
+# 棰勭暀缁勶紝鍚庣画娣诲姞node鑺傜偣浣跨敤
+[new-node]
+#192.168.1.xx NODE_ID=node6 NODE_IP="192.168.1.xx"
 
 [all:vars]
 # ---------闆嗙兢涓昏鍙傛暟---------------
diff --git a/example/hosts.m-masters.example b/example/hosts.m-masters.example
index fa76e7e..f262ec7 100644
--- a/example/hosts.m-masters.example
+++ b/example/hosts.m-masters.example
@@ -36,7 +36,7 @@ kube-master
 
 # 濡傛灉鍚敤harbor锛岃閰嶇疆鍚庨潰harbor鐩稿叧鍙傛暟
 [harbor]
-#10.100.97.44 NODE_IP="192.168.1.8"
+#192.168.1.8 NODE_IP="192.168.1.8"
 
 # 棰勭暀缁勶紝鍚庣画娣诲姞node鑺傜偣浣跨敤
 [new-node]
diff --git a/example/hosts.s-master.example b/example/hosts.s-master.example
index 690ba37..29c7fb0 100644
--- a/example/hosts.s-master.example
+++ b/example/hosts.s-master.example
@@ -24,7 +24,11 @@ kube-master
 
 # 濡傛灉鍚敤harbor锛岃閰嶇疆鍚庨潰harbor鐩稿叧鍙傛暟
 [harbor]
-#10.100.97.44 NODE_IP="192.168.1.8"
+#192.168.1.8 NODE_IP="192.168.1.8"
+
+# 棰勭暀缁勶紝鍚庣画娣诲姞node鑺傜偣浣跨敤
+[new-node]
+#192.168.1.xx NODE_ID=node6 NODE_IP="192.168.1.xx"
 
 [all:vars]
 # ---------闆嗙兢涓昏鍙傛暟---------------
diff --git a/roles/calico/templates/calico-node.service.j2 b/roles/calico/templates/calico-node.service.j2
index aa0c7f0..1beb4db 100644
--- a/roles/calico/templates/calico-node.service.j2
+++ b/roles/calico/templates/calico-node.service.j2
@@ -28,7 +28,7 @@ ExecStart={{ bin_dir }}/docker run --net=host --privileged --name=calico-node \
   -v /run/docker/plugins:/run/docker/plugins \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -v /var/log/calico:/var/log/calico \
-  calico/node:v2.6.2
+  calico/node:v2.6.3
 ExecStop={{ bin_dir }}/docker rm -f calico-node
 Restart=always
 RestartSec=10
diff --git a/roles/kube-node/files/rbac.yaml b/roles/kube-node/files/rbac.yaml
index e1398ef..8d2377d 100644
--- a/roles/kube-node/files/rbac.yaml
+++ b/roles/kube-node/files/rbac.yaml
@@ -1,5 +1,5 @@
-# Calico Version v2.6.2
-# https://docs.projectcalico.org/v2.6/releases#v2.6.2
+# Calico Version v2.6.x
+# https://docs.projectcalico.org/v2.6/releases
 
 ---
 
diff --git a/roles/kube-node/templates/calico-kube-controllers.yaml.j2 b/roles/kube-node/templates/calico-kube-controllers.yaml.j2
index 5854b0f..43ccec2 100644
--- a/roles/kube-node/templates/calico-kube-controllers.yaml.j2
+++ b/roles/kube-node/templates/calico-kube-controllers.yaml.j2
@@ -1,7 +1,7 @@
-# Calico Version v2.6.2
-# https://docs.projectcalico.org/v2.6/releases#v2.6.2
+# Calico Version v2.6.x
+# https://docs.projectcalico.org/v2.6/releases
 # This manifest includes the following component versions:
-#   calico/kube-controllers:v1.0.0
+#   calico/kube-controllers:v1.0.1
 
 # Create this manifest using kubectl to deploy
 # the Calico Kubernetes controllers.
@@ -31,8 +31,8 @@ spec:
       serviceAccountName: calico-kube-controllers
       containers:
         - name: calico-kube-controllers
-          #image: quay.io/calico/kube-controllers:v1.0.0
-          image: calico/kube-controllers:v1.0.0
+          #image: quay.io/calico/kube-controllers:v1.0.1
+          image: calico/kube-controllers:v1.0.1
           env:
             # Configure the location of your etcd cluster.
             - name: ETCD_ENDPOINTS
-- 
GitLab