update cilium 1.12.2

README.md

@@ -3,9 +3,9 @@
 项目致力于提供快速部署高可用`k8s`集群的工具, 同时也努力成为`k8s`实践、使用的参考书；基于二进制方式部署和利用`ansible-playbook`实现自动化；既提供一键安装脚本, 也可以根据`安装指南`分步执行安装各个组件。
 
 - **集群特性** `TLS`双向认证、`RBAC`授权、[Master高可用](docs/setup/00-planning_and_overall_intro.md#ha-architecture)、支持`Network Policy`、[离线安装](docs/setup/offline_install.md)
-- **集群版本** kubernetes v1.21, v1.22, v1.23, v1.24
+- **集群版本** kubernetes v1.22, v1.23, v1.24, v1.25
-- **操作系统** CentOS/RedHat 7, Debian 9/10, Ubuntu 16.04/18.04/20.04
+- **操作系统** CentOS/RedHat 7, Debian 9/10, Ubuntu 16.04/18.04/20.04/22.04
-- **运行时** [containerd](docs/setup/03-container_runtime.md) v1.6.4, docker 20.10.x (k8s < 1.24)
+- **运行时** [containerd](docs/setup/03-container_runtime.md) v1.6.8, docker 20.10.x (k8s < 1.24)
 - **网络** [calico](docs/setup/network-plugin/calico.md), [cilium](docs/setup/network-plugin/cilium.md), [flannel](docs/setup/network-plugin/flannel.md), [kube-ovn](docs/setup/network-plugin/kube-ovn.md), [kube-router](docs/setup/network-plugin/kube-router.md)
 
 
@@ -17,23 +17,23 @@
   <thead>
     <tr>
       <td>Kubernetes version</td>
-      <td>1.19</td>
       <td>1.20</td>
       <td>1.21</td>
       <td>1.22</td>
       <td>1.23</td>
       <td>1.24</td>
+      <td>1.25</td>
     </tr>
   </thead>
   <tbody>
     <tr>
       <td>kubeasz version</td>
-      <td>2.2.2</td>
       <td>3.0.1</td>
       <td>3.1.0</td>
       <td>3.1.1</td>
       <td>3.2.0</td>
       <td>3.3.1</td>
+      <td>3.4.0</td>
     </tr>
   </tbody>
 </table>

ezdown

@@ -14,9 +14,9 @@ set -o errexit
 
 # default settings, can be overridden by cmd line options, see usage
 DOCKER_VER=20.10.16
-KUBEASZ_VER=3.3.1
+KUBEASZ_VER=3.4.0
-K8S_BIN_VER=v1.25.0
+K8S_BIN_VER=v1.25.1
-EXT_BIN_VER=1.2.2
+EXT_BIN_VER=1.3.0
 SYS_PKG_VER=0.4.3
 HARBOR_VER=v2.1.3
 REGISTRY_MIRROR=CN
@@ -31,7 +31,7 @@ metricsVer=v0.5.2
 pauseVer=3.8
 
 # images not downloaded by default(only download  with '-X')
-ciliumVer=1.12.1
+ciliumVer=1.12.2
 flannelVer=v0.19.2
 nfsProvisionerVer=v4.0.2
 promChartVer=39.11.0
@@ -415,15 +415,15 @@ function get_extra_images() {
     docker pull "cilium/cilium:v$ciliumVer" && \
     docker pull "cilium/operator-generic:v$ciliumVer" && \
     docker pull "cilium/hubble-relay:v$ciliumVer" && \
-    docker pull cilium/hubble-ui-backend:v0.9.1 && \
+    docker pull cilium/hubble-ui-backend:v0.9.2 && \
-    docker pull cilium/hubble-ui:v0.9.1 && \
+    docker pull cilium/hubble-ui:v0.9.2 && \
     docker pull cilium/json-mock:v1.3.0 && \
     docker pull centos:7 && \
     docker save -o "$imageDir/cilium_$ciliumVer.tar" "cilium/cilium:v$ciliumVer" \
 		"cilium/operator-generic:v$ciliumVer" \
 		"cilium/hubble-relay:v$ciliumVer" \
-		cilium/hubble-ui-backend:v0.9.1 \
+		cilium/hubble-ui-backend:v0.9.2 \
-		cilium/hubble-ui:v0.9.1 \
+		cilium/hubble-ui:v0.9.2 \
 		cilium/json-mock:v1.3.0 \
 		centos:7
   else
@@ -435,10 +435,10 @@ function get_extra_images() {
   docker push "easzlab.io.local:5000/cilium/operator-generic:v$ciliumVer"
   docker tag "cilium/hubble-relay:v$ciliumVer" "easzlab.io.local:5000/cilium/hubble-relay:v$ciliumVer"
   docker push "easzlab.io.local:5000/cilium/hubble-relay:v$ciliumVer"
-  docker tag cilium/hubble-ui-backend:v0.9.1 easzlab.io.local:5000/cilium/hubble-ui-backend:v0.9.1
+  docker tag cilium/hubble-ui-backend:v0.9.2 easzlab.io.local:5000/cilium/hubble-ui-backend:v0.9.2
-  docker push easzlab.io.local:5000/cilium/hubble-ui-backend:v0.9.1
+  docker push easzlab.io.local:5000/cilium/hubble-ui-backend:v0.9.2
-  docker tag cilium/hubble-ui:v0.9.1 easzlab.io.local:5000/cilium/hubble-ui:v0.9.1
+  docker tag cilium/hubble-ui:v0.9.2 easzlab.io.local:5000/cilium/hubble-ui:v0.9.2
-  docker push easzlab.io.local:5000/cilium/hubble-ui:v0.9.1
+  docker push easzlab.io.local:5000/cilium/hubble-ui:v0.9.2
   docker tag cilium/json-mock:v1.3.0 easzlab.io.local:5000/cilium/json-mock:v1.3.0
   docker push easzlab.io.local:5000/cilium/json-mock:v1.3.0
   docker tag centos:7 easzlab.io.local:5000/centos:7

roles/cilium/templates/values.yaml.j2

@@ -42,11 +42,11 @@ hubble:
     backend:
       image:
         repository: "easzlab.io.local:5000/cilium/hubble-ui-backend"
-        tag: "v0.9.1"
+        tag: "v0.9.2"
     frontend:
       image:
         repository: "easzlab.io.local:5000/cilium/hubble-ui"
-        tag: "v0.9.1"
+        tag: "v0.9.2"
 {% endif %}
 
 identityAllocationMode: "crd"