Upgrade Kubernetes to v1.24.12

wise2c-devops · Mar 18, 2023 · bd41792 · bd41792
1 parent 0ddb1ff
commit bd41792
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 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.24.11/docker-compose.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.11/docker-compose-centos.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.11/docker-compose-ubuntu.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.12/docker-compose.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.12/docker-compose-centos.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.12/docker-compose-ubuntu.yml -o docker-compose.yml
 ```
 
 国内用户可以使用阿里云镜像站点文件，部署所用的image将从阿里云拉取：
 
 ```
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.11/docker-compose-aliyun.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.11/docker-compose-centos-aliyun.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.11/docker-compose-ubuntu-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.12/docker-compose-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.12/docker-compose-centos-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.24.12/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.24.11
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.24.12
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.24.11
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.24.12
     ports:
     - 2009:2009 
     restart: always
   apt-source:
     container_name: deploy-aptsource
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.24.11
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.24.12
     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.24.11
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.24.12
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.24.11
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/yum-repo:v1.24.12
     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.24.11
+    image: wise2c/playbook:v1.24.12
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: wise2c/yum-repo:v1.24.11
+    image: wise2c/yum-repo:v1.24.12
     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.24.11
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/playbook:v1.24.12
     volumes:
     - playbook:/workspace
   apt-source:
     container_name: deploy-aptsource
-    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.24.11
+    image: registry.cn-shenzhen.aliyuncs.com/breeze-project/apt-source:v1.24.12
     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.24.11
+    image: wise2c/playbook:v1.24.12
     volumes:
     - playbook:/workspace
   apt-source:
     container_name: deploy-aptsource
-    image: wise2c/apt-source:v1.24.11
+    image: wise2c/apt-source:v1.24.12
     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.24.11
+    image: wise2c/playbook:v1.24.12
     volumes:
     - playbook:/workspace
   yum-repo:
     container_name: deploy-yumrepo
-    image: wise2c/yum-repo:v1.24.11
+    image: wise2c/yum-repo:v1.24.12
     ports:
     - 2009:2009 
     restart: always
   apt-source:
     container_name: deploy-aptsource
-    image: wise2c/apt-source:v1.24.11
+    image: wise2c/apt-source:v1.24.12
     ports:
     - 2008:2008
     restart: always

diff --git a/init.sh b/init.sh
@@ -4,7 +4,7 @@ set -e
 
 path=`dirname $0`
 
-kubernetes_version=1.24.11
+kubernetes_version=1.24.12
 harbor_version=2.7.1
 docker_version=23.0.1
 crio_version=1.24.4
@@ -17,13 +17,13 @@ kube_prometheus_version=0.12.0
 metrics_server_version=0.6.2
 dashboard_version=2.6.1
 metrics_scraper_version=1.0.8
-flannel_version=0.21.2
+flannel_version=0.21.3
 flannel_cni_plugin_version=1.1.2
 calico_version=3.25.0
-helm_version=3.11.1
+helm_version=3.11.2
 istio_version=1.17.1
-contour_version=1.24.1
-contour_envoyproxy_version=1.25.1
+contour_version=1.24.2
+contour_envoyproxy_version=1.25.2
 elastic_cloud_version=2.6.1
 elastic_stack_version=8.6.2