From 7dfeee8460191a629a70ef6389dcabfc1943cf15 Mon Sep 17 00:00:00 2001 From: Rob Murray Date: Tue, 5 Aug 2025 10:30:55 +0100 Subject: [PATCH] Drop FirewallCleanerSetter interface Signed-off-by: Rob Murray --- daemon/libnetwork/drivers/bridge/bridge_store.go | 6 +++--- .../drivers/bridge/internal/firewaller/firewaller.go | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/daemon/libnetwork/drivers/bridge/bridge_store.go b/daemon/libnetwork/drivers/bridge/bridge_store.go index 92a7dc20d1..78dce7e53d 100644 --- a/daemon/libnetwork/drivers/bridge/bridge_store.go +++ b/daemon/libnetwork/drivers/bridge/bridge_store.go @@ -13,7 +13,7 @@ import ( "github.com/containerd/log" "github.com/moby/moby/v2/daemon/internal/otelutil" "github.com/moby/moby/v2/daemon/libnetwork/datastore" - "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/internal/firewaller" + "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge/internal/nftabler" "github.com/moby/moby/v2/daemon/libnetwork/portmapperapi" "github.com/moby/moby/v2/daemon/libnetwork/types" "go.opentelemetry.io/otel" @@ -43,8 +43,8 @@ func (d *driver) initStore() error { // If there's a firewall cleaner, it's done its job by cleaning up rules // belonging to the restored networks. So, drop it. - if fcs, ok := d.firewaller.(firewaller.FirewallCleanerSetter); ok { - fcs.SetFirewallCleaner(nil) + if nft, ok := d.firewaller.(*nftabler.Nftabler); ok { + nft.SetFirewallCleaner(nil) } return nil diff --git a/daemon/libnetwork/drivers/bridge/internal/firewaller/firewaller.go b/daemon/libnetwork/drivers/bridge/internal/firewaller/firewaller.go index 743b03c23e..ce24ee5092 100644 --- a/daemon/libnetwork/drivers/bridge/internal/firewaller/firewaller.go +++ b/daemon/libnetwork/drivers/bridge/internal/firewaller/firewaller.go @@ -110,12 +110,6 @@ type Network interface { DelLink(ctx context.Context, parentIP, childIP netip.Addr, ports []types.TransportPort) } -// FirewallCleanerSetter is an optional interface for a Firewaller. -type FirewallCleanerSetter interface { - // SetFirewallCleaner replaces the FirewallCleaner (possibly with 'nil'). - SetFirewallCleaner(FirewallCleaner) -} - // FirewallCleaner is used to delete rules created by previous incarnations of // the daemon. On startup, once a Firewaller implementation has been selected, if // rules may have been left behind by a different Firewaller implementation, get