Merge pull request #1986 from thomasferrandiz/bump-knftables-0.0.16

Bump knftables 0.0.16 and fix e2e test
flannel-io · May 31, 2024 · a31091c · a31091c
2 parents 8a6570f + a792033
commit a31091c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/e2e/run-e2e-tests.sh b/e2e/run-e2e-tests.sh
@@ -323,6 +323,7 @@ check_nftables() {
   read -d '' POSTROUTING_RULES_WORKER << EOM
 table ip flannel-ipv4 {
 	chain postrtg {
+		comment "chain to manage traffic masquerading by flannel"
 		type nat hook postrouting priority srcnat; policy accept;
 		meta mark 0x00004000 return
 		ip saddr ${worker_podcidr} ip daddr 10.42.0.0/16 return
@@ -336,6 +337,7 @@ EOM
   read -r -d '' POSTROUTING_RULES_LEADER << EOM
 table ip flannel-ipv4 {
 	chain postrtg {
+		comment "chain to manage traffic masquerading by flannel"
 		type nat hook postrouting priority srcnat; policy accept;
 		meta mark 0x00004000 return
 		ip saddr ${leader_podcidr} ip daddr 10.42.0.0/16 return
@@ -349,6 +351,7 @@ EOM
   read -r -d '' FORWARD_RULES << EOM
 table ip flannel-ipv4 {
 	chain forward {
+		comment "chain to accept flannel traffic"
 		type filter hook forward priority filter; policy accept;
 		ip saddr 10.42.0.0/16 accept
 		ip daddr 10.42.0.0/16 accept

diff --git a/go.mod b/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/avast/retry-go/v4 v4.6.0
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.929
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.924
-	sigs.k8s.io/knftables v0.0.14
+	sigs.k8s.io/knftables v0.0.16
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -776,8 +776,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/knftables v0.0.14 h1:VzKQoDMCGBOH8c85sGrWSXSPCS0XrIpEfOlcCLBXiC0=
-sigs.k8s.io/knftables v0.0.14/go.mod h1:f/5ZLKYEUPUhVjUCg6l80ACdL7CIIyeL0DxfgojGRTk=
+sigs.k8s.io/knftables v0.0.16 h1:ZpTfNsjnidgoXdxxzcZLdSctqkpSO3QB3jo3zQ4PXqM=
+sigs.k8s.io/knftables v0.0.16/go.mod h1:f/5ZLKYEUPUhVjUCg6l80ACdL7CIIyeL0DxfgojGRTk=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=