update cilium v1.15.5

docs/setup/network-plugin/cilium.md

@@ -18,9 +18,9 @@ kubeasz 3.3.1 更新重写了cilium 安装流程，使用helm charts 方式，
 - https://docs.cilium.io/en/stable/installation/k8s-install-helm/#k8s-install-helm
 - 相关镜像已经离线打包并推送到本地镜像仓库，通过 `ezdown -X` 命令下载cilium等额外镜像
 
-### 0.升级内核并重启
+### 0.检查系统内核版本
 
-- Linux kernel >= 4.9.17，请阅读文档[升级内核](guide/kernel_upgrade.md)
+- Linux kernel >= 4.9.17，如需升级请阅读文档[升级内核](guide/kernel_upgrade.md)
 - etcd >= 3.1.0 or consul >= 0.6.4
 
 ### 1.选择cilium网络后安装
@@ -29,12 +29,12 @@ kubeasz 3.3.1 更新重写了cilium 安装流程，使用helm charts 方式，
 - 下载额外镜像 `./ezdown -X cilium 和 ./ezdown -X network-check`
 - 执行集群安装 `dk ezctl setup xxx all`
 
-注意默认安装后集成了cilium_connectivity_check 和 cilium_hubble，可以在`/etc/kubeasz/clusters/xxx/config.yml`配置关闭
+注意默认设置未集成cilium_hubble，可以在`/etc/kubeasz/clusters/xxx/config.yml`配置启用后再开始安装。
 
 - cilium_connectivity_check：检查集群cilium网络是否工作正常，非常实用
 - cilium_hubble：很酷很实用的监控、策略追踪排查工具
 
-Cilium CLI 和 Hubble CLI 二进制已经默认包含在kubeasz-ext-bin 1.2.0版本中 https://github.com/kubeasz/dockerfiles/blob/master/kubeasz-ext-bin/Dockerfile
+Cilium CLI 和 Hubble CLI 二进制已经默认包含在kubeasz-ext-bin 1.2.0及之后的版本中 https://github.com/kubeasz/dockerfiles/blob/master/kubeasz-ext-bin/Dockerfile
 
 ### 2.验证
 

ezdown

@@ -38,7 +38,8 @@ pauseVer=3.9
 
 # images not downloaded by default(only download  with 'ezdown -X ***')
 # https://github.com/cilium/cilium
-ciliumVer=1.14.5
+# https://docs.cilium.io/en/stable/installation/k8s-install-helm/
+ciliumVer=1.15.5
 # https://github.com/flannel-io/flannel
 flannelVer=v0.22.2
 # https://github.com/cloudnativelabs/kube-router
@@ -424,13 +425,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.12.1 && \
+        docker pull cilium/hubble-ui-backend:v0.13.0 && \
-        docker pull cilium/hubble-ui:v0.12.1 && \
+        docker pull cilium/hubble-ui:v0.13.0 && \
         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.12.1 \
+    		"cilium/hubble-ui-backend:v0.13.0" \
-    		cilium/hubble-ui:v0.12.1
+    		"cilium/hubble-ui:v0.13.0"
       else
         docker load -i "$imageDir/cilium_$ciliumVer.tar"
       fi
@@ -440,10 +441,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.12.1 easzlab.io.local:5000/cilium/hubble-ui-backend:v0.12.1
+      docker tag cilium/hubble-ui-backend:v0.13.0 easzlab.io.local:5000/cilium/hubble-ui-backend:v0.13.0
-      docker push easzlab.io.local:5000/cilium/hubble-ui-backend:v0.12.1
+      docker push easzlab.io.local:5000/cilium/hubble-ui-backend:v0.13.0
-      docker tag cilium/hubble-ui:v0.12.1 easzlab.io.local:5000/cilium/hubble-ui:v0.12.1
+      docker tag cilium/hubble-ui:v0.13.0 easzlab.io.local:5000/cilium/hubble-ui:v0.13.0
-      docker push easzlab.io.local:5000/cilium/hubble-ui:v0.12.1
+      docker push easzlab.io.local:5000/cilium/hubble-ui:v0.13.0
       ;;
 
     # flannel image

roles/cilium/templates/values.yaml.j2

@@ -35,12 +35,12 @@ hubble:
     backend:
       image:
         repository: "easzlab.io.local:5000/cilium/hubble-ui-backend"
-        tag: "v0.12.1"
+        tag: "v0.13.0"
         useDigest: false
     frontend:
       image:
         repository: "easzlab.io.local:5000/cilium/hubble-ui"
-        tag: "v0.12.1"
+        tag: "v0.13.0"
         useDigest: false
 {% endif %}
 
@@ -70,8 +70,6 @@ tls:
   enabled: true
   secretsBackend: local
 
-tunnel: "vxlan"
-
 etcd:
   enabled: false