Upgrade Kubernetes to v1.26.1

wise2c-devops · Jan 20, 2023 · 9bb8ce7 · 9bb8ce7
1 parent 405a5ac
commit 9bb8ce7
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/BreezeManual-CN.md b/BreezeManual-CN.md
@@ -90,17 +90,17 @@ systemctl enable docker
 (4) 下载用于部署某个Kubernetes版本的docker-compose文件并使部署程序运行起来，例如：
 
 ```
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.0/docker-compose.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.0/docker-compose-centos.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.0/docker-compose-ubuntu.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.1/docker-compose.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.1/docker-compose-centos.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.1/docker-compose-ubuntu.yml -o docker-compose.yml
 ```
 
 国内用户可以使用阿里云镜像站点文件，部署所用的image将从阿里云拉取：
 
 ```
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.0/docker-compose-aliyun.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.0/docker-compose-centos-aliyun.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.0/docker-compose-ubuntu-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.1/docker-compose-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.1/docker-compose-centos-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.26.1/docker-compose-ubuntu-aliyun.yml -o docker-compose.yml
 ```
 
 然后：

diff --git a/docker-compose-aliyun.yml b/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.26.0
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.26.1
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.26.0
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.26.1
     ports:
     - 2009:2009 
     restart: always
   apt-source:
     container_name: deploy-aptsource
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.26.0
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.26.1
     ports:
     - 2008:2008
     restart: always

diff --git a/docker-compose-centos-aliyun.yml b/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.26.0
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.26.1
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.26.0
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.26.1
     ports:
     - 2009:2009 
     restart: always

diff --git a/docker-compose-centos.yml b/docker-compose-centos.yml
@@ -23,12 +23,12 @@ services:
     network_mode: "service:deploy"
   playbook:
     container_name: deploy-playbook
-    image: wise2c/playbook:v1.26.0
+    image: wise2c/playbook:v1.26.1
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: wise2c/yum-repo:v1.26.0
+    image: wise2c/yum-repo:v1.26.1
     ports:
     - 2009:2009 
     restart: always

diff --git a/docker-compose-ubuntu-aliyun.yml b/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.26.0
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.26.1
     volumes:
     - playbook:/workspace
   apt-source:
     container_name: deploy-aptsource
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.26.0
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.26.1
     ports:
     - 2008:2008
     restart: always

diff --git a/docker-compose-ubuntu.yml b/docker-compose-ubuntu.yml
@@ -23,12 +23,12 @@ services:
     network_mode: "service:deploy"
   playbook:
     container_name: deploy-playbook
-    image: wise2c/playbook:v1.26.0
+    image: wise2c/playbook:v1.26.1
     volumes:
     - playbook:/workspace
   apt-source:
     container_name: deploy-aptsource
-    image: wise2c/apt-source:v1.26.0
+    image: wise2c/apt-source:v1.26.1
     ports:
     - 2008:2008
     restart: always

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,18 +23,18 @@ services:
     network_mode: "service:deploy"
   playbook:
     container_name: deploy-playbook
-    image: wise2c/playbook:v1.26.0
+    image: wise2c/playbook:v1.26.1
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: wise2c/yum-repo:v1.26.0
+    image: wise2c/yum-repo:v1.26.1
     ports:
     - 2009:2009 
     restart: always
   apt-source:
     container_name: deploy-aptsource
-    image: wise2c/apt-source:v1.26.0
+    image: wise2c/apt-source:v1.26.1
     ports:
     - 2008:2008
     restart: always

diff --git a/init.sh b/init.sh
@@ -4,10 +4,10 @@ set -e
 
 path=`dirname $0`
 
-kubernetes_version=1.26.0
+kubernetes_version=1.26.1
 harbor_version=2.7.0
 docker_version=20.10.18
-crio_version=1.25.1
+crio_version=1.26.1
 haproxy_version=2.0.0
 keepalived_version=1.3.5
 loadbalancer_version=HAProxy-${haproxy_version}_Keepalived-${keepalived_version}
@@ -19,13 +19,13 @@ dashboard_version=2.7.0
 metrics_scraper_version=1.0.8
 flannel_version=0.20.2
 flannel_cni_plugin_version=1.1.2
-calico_version=3.24.5
-helm_version=3.10.3
+calico_version=3.25.0
+helm_version=3.11.0
 istio_version=1.16.1
 contour_version=1.23.2
 contour_envoyproxy_version=1.24.1
-elastic_cloud_version=2.5.0
-elastic_stack_version=8.5.3
+elastic_cloud_version=2.6.1
+elastic_stack_version=8.6.0
 
 mv ${path}/kubernetes-playbook/version ${path}/kubernetes-playbook/v${kubernetes_version}
 mv ${path}/harbor-playbook/version ${path}/harbor-playbook/v${harbor_version}