Upgrade K8s to v1.18.17

BreezeManual-CN.md

@@ -88,17 +88,17 @@ systemctl enable docker
 (4) 下载用于部署某个Kubernetes版本的docker-compose文件并使部署程序运行起来，例如：
 
 ```
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.16/docker-compose.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.16/docker-compose-centos.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.16/docker-compose-ubuntu.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.17/docker-compose.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.17/docker-compose-centos.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.17/docker-compose-ubuntu.yml -o docker-compose.yml
 ```
 
 国内用户可以使用阿里云镜像站点文件，部署所用的image将从阿里云拉取：
 
 ```
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.16/docker-compose-aliyun.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.16/docker-compose-centos-aliyun.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.16/docker-compose-ubuntu-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.17/docker-compose-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.17/docker-compose-centos-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.18.17/docker-compose-ubuntu-aliyun.yml -o docker-compose.yml
 ```
 
 然后：

docker-compose-aliyun.yml

@@ -23,18 +23,18 @@ services:
     network_mode: "service:deploy"
   playbook:
     container_name: deploy-playbook
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.18.16
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.18.17
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.18.16
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.18.17
     ports:
     - 2009:2009 
     restart: always
   apt-source:
     container_name: deploy-aptsource
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.18.16
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.18.17
     ports:
     - 2008:2008
     restart: always

docker-compose-centos-aliyun.yml

@@ -23,12 +23,12 @@ services:
     network_mode: "service:deploy"
   playbook:
     container_name: deploy-playbook
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.18.16
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.18.17
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.18.16
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.18.17
     ports:
     - 2009:2009 
     restart: always

docker-compose-centos.yml

@@ -23,12 +23,12 @@ services:
     network_mode: "service:deploy"
   playbook:
     container_name: deploy-playbook
-    image: wise2c/playbook:v1.18.16
+    image: wise2c/playbook:v1.18.17
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: wise2c/yum-repo:v1.18.16
+    image: wise2c/yum-repo:v1.18.17
     ports:
     - 2009:2009 
     restart: always

docker-compose-ubuntu-aliyun.yml

@@ -23,12 +23,12 @@ services:
     network_mode: "service:deploy"
   playbook:
     container_name: deploy-playbook
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.18.16
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.18.17
     volumes:
     - playbook:/workspace
   apt-source:
     container_name: deploy-aptsource
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.18.16
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.18.17
     ports:
     - 2008:2008
     restart: always

docker-compose-ubuntu.yml

@@ -23,12 +23,12 @@ services:
     network_mode: "service:deploy"
   playbook:
     container_name: deploy-playbook
-    image: wise2c/playbook:v1.18.16
+    image: wise2c/playbook:v1.18.17
     volumes:
     - playbook:/workspace
   apt-source:
     container_name: deploy-aptsource
-    image: wise2c/apt-source:v1.18.16
+    image: wise2c/apt-source:v1.18.17
     ports:
     - 2008:2008
     restart: always

docker-compose.yml

@@ -23,18 +23,18 @@ services:
     network_mode: "service:deploy"
   playbook:
     container_name: deploy-playbook
-    image: wise2c/playbook:v1.18.16
+    image: wise2c/playbook:v1.18.17
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: wise2c/yum-repo:v1.18.16
+    image: wise2c/yum-repo:v1.18.17
     ports:
     - 2009:2009 
     restart: always
   apt-source:
     container_name: deploy-aptsource
-    image: wise2c/apt-source:v1.18.16
+    image: wise2c/apt-source:v1.18.17
     ports:
     - 2008:2008
     restart: always

init.sh

@@ -4,9 +4,9 @@ set -e
 
 path=`dirname $0`
 
-kubernetes_version=1.18.16
-harbor_version=2.1.3
-docker_version=19.03.13
+kubernetes_version=1.18.17
+harbor_version=2.2.1
+docker_version=19.03.15
 haproxy_version=2.0.0
 keepalived_version=1.3.5
 loadbalancer_version=HAProxy-${haproxy_version}_Keepalived-${keepalived_version}
@@ -17,13 +17,13 @@ metrics_server_version=0.4.2
 dashboard_version=2.0.3
 metrics_scraper_version=1.0.4
 flannel_version=0.13.0
-calico_version=3.17.2
-helm_version=3.5.2
-istio_version=1.9.0
-contour_version=1.12.0
-contour_envoyproxy_version=1.17.0
-elastic_cloud_version=1.4.0
-elastic_stack_version=7.11.1
+calico_version=3.18.1
+helm_version=3.5.3
+istio_version=1.9.2
+contour_version=1.14.0
+contour_envoyproxy_version=1.17.1
+elastic_cloud_version=1.5.0
+elastic_stack_version=7.12.0
 
 mv ${path}/kubernetes-playbook/version ${path}/kubernetes-playbook/v${kubernetes_version}
 mv ${path}/harbor-playbook/version ${path}/harbor-playbook/v${harbor_version}