ci: bump cilium to v1.15.0

Signed-off-by: zhangzujian <[email protected]>
kubeovn · Feb 4, 2024 · 28237df · 28237df
1 parent cee108a
commit 28237df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ KUBEVIRT_OPERATOR_YAML = https://github.com/kubevirt/kubevirt/releases/download/
 KUBEVIRT_CR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-cr.yaml
 KUBEVIRT_TEST_YAML = https://kubevirt.io/labs/manifests/vm.yaml
 
-CILIUM_VERSION = 1.14.5
+CILIUM_VERSION = 1.15.0
 CILIUM_IMAGE_REPO = quay.io/cilium/cilium
 
 CERT_MANAGER_VERSION = v1.14.1
@@ -804,6 +804,7 @@ kind-install-cilium-chaining: kind-load-image kind-untaint-control-plane
 		--set k8sServicePort=6443 \
 		--set tunnel=disabled \
 		--set sessionAffinity=true \
+		--set routingMode=native \
 		--set enableIPv4Masquerade=false \
 		--set cni.chainingMode=generic-veth \
 		--set cni.customConf=true \

diff --git a/yamls/cilium-chaining.yaml b/yamls/cilium-chaining.yaml
@@ -11,22 +11,17 @@ data:
       "plugins": [
         {
           "type": "kube-ovn",
-          "log_level": "info",
-          "datastore_type": "kubernetes",
-          "mtu": 1400,
           "server_socket": "/run/openvswitch/kube-ovn-daemon.sock",
-          "ipam": {
-              "type": "kube-ovn",
-              "server_socket": "/run/openvswitch/kube-ovn-daemon.sock"
-          }
         },
         {
-          "type": "portmap",
-          "snat": true,
-          "capabilities": {"portMappings": true}
+          "type":"portmap",
+          "capabilities":{
+            "portMappings":true
+          }
         },
         {
-          "type": "cilium-cni"
+          "type": "cilium-cni",
+          "chaining-mode": "generic-veth"
         }
       ]
     }