dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-03 22:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop FirewallCleanerSetter interface

Browse Source 
Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2025-08-05 10:30:55 +01:00
parent 200a75b34a
commit 7dfeee8460
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/libnetwork/drivers/bridge/bridge_store.go
View File

@@ -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

6
daemon/libnetwork/drivers/bridge/internal/firewaller/firewaller.go
View File

@@ -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