Merge pull request #5137 from kyrtapz/fix_mark_chain_cleanup

trozet · web-flow · commit ef2228d7a216 · 2025-07-23T14:14:41.000-04:00
Fix UDN nftables mark chain cleanup
diff --git a/go-controller/pkg/node/gateway_udn.go b/go-controller/pkg/node/gateway_udn.go
@@ -162,7 +162,9 @@ func (udng *UserDefinedNetworkGateway) delMarkChain() error {
 	chain := &knftables.Chain{
 		Name: GetUDNMarkChain(fmt.Sprintf("0x%x", udng.pktMark)),
 	}
-	tx.Flush(chain)
+	// Delete would return an error if we tried to delete a chain that didn't exist, so
+	// we do an Add first (which is a no-op if the chain already exists) and then Delete.
+	tx.Add(chain)
 	tx.Delete(chain)
 	return nft.Run(context.TODO(), tx)
 }

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,9 @@ func (udng *UserDefinedNetworkGateway) delMarkChain() error {`
`162`	`162`	`chain := &knftables.Chain{`
`163`	`163`	`Name: GetUDNMarkChain(fmt.Sprintf("0x%x", udng.pktMark)),`
`164`	`164`	`}`
`165`		`- tx.Flush(chain)`
	`165`	`+ // Delete would return an error if we tried to delete a chain that didn't exist, so`
	`166`	`+ // we do an Add first (which is a no-op if the chain already exists) and then Delete.`
	`167`	`+ tx.Add(chain)`
`166`	`168`	`tx.Delete(chain)`
`167`	`169`	`return nft.Run(context.TODO(), tx)`
`168`	`170`	`}`