update cilium 1.14.5

README.md

@@ -5,7 +5,7 @@
 **kubeasz** 从每一个单独部件组装到完整的集群，提供最灵活的配置能力，几乎可以设置任何组件的任何参数；同时又为集群创建预置一套运行良好的默认配置，甚至自动化创建适合大规模集群的[BGP Route Reflector网络模式](docs/setup/network-plugin/calico-bgp-rr.md)。
 
 - **集群特性** [Master高可用](docs/setup/00-planning_and_overall_intro.md#ha-architecture)、[离线安装](docs/setup/offline_install.md)、[多架构支持(amd64/arm64)](docs/setup/multi_platform.md)
-- **集群版本** kubernetes v1.24, v1.25, v1.26, v1.27, v1.28
+- **集群版本** kubernetes v1.24, v1.25, v1.26, v1.27, v1.28, v1.29
 - **运行时** [containerd](docs/setup/03-container_runtime.md) v1.6.x
 - **网络** [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)
 
@@ -25,6 +25,7 @@
       <td>1.26</td>
       <td>1.27</td>
       <td>1.28</td>
+      <td>1.29</td>
     </tr>
   </thead>
   <tbody>
@@ -37,6 +38,7 @@
       <td>3.6.2</td>
       <td>3.6.2</td>
       <td>3.6.2</td>
+      <td>3.6.3</td>
     </tr>
   </tbody>
 </table>

docs/setup/network-plugin/cilium.md

@@ -9,12 +9,13 @@
 - 高性能负载均衡，支持DSR
 - 支持事件、策略跟踪和监控集成
 
-cilium 项目当前文档比较完整，建议仔细阅读下[官网文档]()
+cilium 项目文档比较完整，建议仔细阅读[官网文档]()
 
 ## kubeasz 集成安装 cilium
 
 kubeasz 3.3.1 更新重写了cilium 安装流程，使用helm charts 方式，配置文件在 roles/cilium/templates/values.yaml.j2，请阅读原charts中values.yaml 文件后自定义修改。
 
+- https://docs.cilium.io/en/stable/installation/k8s-install-helm/#k8s-install-helm
 - 相关镜像已经离线打包并推送到本地镜像仓库，通过 `ezdown -X` 命令下载cilium等额外镜像
 
 ### 0.升级内核并重启

ezdown

@@ -14,7 +14,7 @@ set -o pipefail
 
 # default settings, can be overridden by cmd line options, see usage
 DOCKER_VER=24.0.7
-KUBEASZ_VER=3.6.2
+KUBEASZ_VER=3.6.3
 K8S_BIN_VER=v1.29.0
 # https://github.com/easzlab/dockerfile-kubeasz-ext-bin
 EXT_BIN_VER=1.9.0
@@ -38,7 +38,7 @@ pauseVer=3.9
 
 # images not downloaded by default(only download  with 'ezdown -X ***')
 # https://github.com/cilium/cilium
-ciliumVer=1.13.6
+ciliumVer=1.14.5
 # https://github.com/flannel-io/flannel
 flannelVer=v0.22.2
 # https://github.com/cloudnativelabs/kube-router
@@ -424,13 +424,13 @@ 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.11.0 && \
-        docker pull cilium/hubble-ui:v0.11.0 && \
+        docker pull cilium/hubble-ui-backend:v0.12.1 && \
+        docker pull cilium/hubble-ui:v0.12.1 && \
         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.11.0 \
-    		cilium/hubble-ui:v0.11.0
+    		cilium/hubble-ui-backend:v0.12.1 \
+    		cilium/hubble-ui:v0.12.1
       else
         docker load -i "$imageDir/cilium_$ciliumVer.tar"
       fi
@@ -440,10 +440,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.11.0 easzlab.io.local:5000/cilium/hubble-ui-backend:v0.11.0
-      docker push easzlab.io.local:5000/cilium/hubble-ui-backend:v0.11.0
-      docker tag cilium/hubble-ui:v0.11.0 easzlab.io.local:5000/cilium/hubble-ui:v0.11.0
-      docker push easzlab.io.local:5000/cilium/hubble-ui:v0.11.0
+      docker tag cilium/hubble-ui-backend:v0.12.1 easzlab.io.local:5000/cilium/hubble-ui-backend:v0.12.1
+      docker push easzlab.io.local:5000/cilium/hubble-ui-backend:v0.12.1
+      docker tag cilium/hubble-ui:v0.12.1 easzlab.io.local:5000/cilium/hubble-ui:v0.12.1
+      docker push easzlab.io.local:5000/cilium/hubble-ui:v0.12.1
       ;;
 
     # flannel image

roles/cilium/tasks/main.yml

@@ -1,3 +1,4 @@
+# https://docs.cilium.io/en/stable/installation/k8s-install-helm/#k8s-install-helm
 - name: 转换内核版本为浮点数
   set_fact:
      KERNEL_VER: "{{ ansible_kernel.split('-')[0].split('.')[0]|int + ansible_kernel.split('-')[0].split('.')[1]|int/100 }}"

roles/cilium/templates/values.yaml.j2

@@ -17,10 +17,6 @@ resources:
     cpu: 100m
     memory: 512Mi
 
-containerRuntime:
-  integration: containerd
-  socketPath: unix:///run/containerd/containerd.sock
-
 {% if cilium_hubble_enabled %}
 hubble:
   enabled: true
@@ -39,11 +35,11 @@ hubble:
     backend:
       image:
         repository: "easzlab.io.local:5000/cilium/hubble-ui-backend"
-        tag: "v0.11.0"
+        tag: "v0.12.1"
     frontend:
       image:
         repository: "easzlab.io.local:5000/cilium/hubble-ui"
-        tag: "v0.11.0"
+        tag: "v0.12.1"
 {% endif %}
 
 identityAllocationMode: "crd"