Merge pull request #747 from l1b0k/fix/egress_filter

Fix/egress filter

Author: BSWANG

Diff for: deploy/images/terway-controlplane/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1-labs
-ARG TERWAY_POLICY_IMAGE=registry-cn-zhangjiakou.ack.aliyuncs.com/acs/terway:policy-f8917871@sha256:2824419b5a87dd83f12a27aa5994b293c4f6013d8ab575f2fd781ad8997925b5
+ARG TERWAY_POLICY_IMAGE=registry-cn-zhangjiakou.ack.aliyuncs.com/acs/terway:policy-19db2f16@sha256:b174a7f4878b9690c49470403409adc46e08217be57d702ba124c453bf08872d
 
 FROM --platform=$TARGETPLATFORM ${TERWAY_POLICY_IMAGE} AS policy-dist
 

Diff for: deploy/images/terway/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1-labs
-ARG TERWAY_POLICY_IMAGE=registry-cn-zhangjiakou.ack.aliyuncs.com/acs/terway:policy-f8917871@sha256:2824419b5a87dd83f12a27aa5994b293c4f6013d8ab575f2fd781ad8997925b5
+ARG TERWAY_POLICY_IMAGE=registry-cn-zhangjiakou.ack.aliyuncs.com/acs/terway:policy-19db2f16@sha256:b174a7f4878b9690c49470403409adc46e08217be57d702ba124c453bf08872d
 ARG UBUNTU_IMAGE=registry.cn-hangzhou.aliyuncs.com/acs/ubuntu:22.04-update
 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:547db7ec9a750b8f888a506709adb41f135b952e@sha256:4d6fa0aede3556c5fb5a9c71bc6b9585475ac9b1064f516d4c45c8fb691c9d9e
 ARG CILIUM_BPFTOOL_IMAGE=quay.io/cilium/cilium-bpftool:78448c1a37ff2b790d5e25c3d8b8ec3e96e6405f@sha256:99a9453a921a8de99899ef82e0822f0c03f65d97005c064e231c06247ad8597d

Diff for: policy/cilium/0036-fix-egress-filter-check.patch

@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: l1b0k <[email protected]>
+Date: Mon, 30 Dec 2024 10:20:33 +0800
+Subject: fix egress filter check
+
+Signed-off-by: l1b0k <[email protected]>
+---
+ pkg/datapath/loader/netlink.go | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/pkg/datapath/loader/netlink.go b/pkg/datapath/loader/netlink.go
+index 92af541580..bc0ae8539c 100644
+--- a/pkg/datapath/loader/netlink.go
++++ b/pkg/datapath/loader/netlink.go
+@@ -138,7 +138,27 @@ func replaceDatapath(ctx context.Context, ifName, objPath, progSec, progDirectio
+ 							if err != nil {
+ 								l.WithError(err).Error("Remove filter")
+ 							} else {
+-								l.Infof("Remove filter")
++								l.Infof("Remove ingress filter")
++							}
++						}
++					}
++				}
++
++				egressFilters, err := netlink.FilterList(link, netlink.HANDLE_MIN_EGRESS)
++				if err != nil {
++					l.WithError(err).Error("Could get filter")
++				} else {
++					for _, filter := range egressFilters {
++						bpf, ok := filter.(*netlink.BpfFilter)
++						if ok {
++							if bpf.Priority != 1 || !bpf.DirectAction {
++								continue
++							}
++							err = netlink.FilterDel(filter)
++							if err != nil {
++								l.WithError(err).Error("Remove filter")
++							} else {
++								l.Infof("Remove egress filter")
+ 							}
+ 						}
+ 					}
+-- 
+2.39.5 (Apple Git-154)
+