0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46245 from thaJeztah/firewalld_dont_fail_on_removal

Browse source 
libnetwork/iptables: ProgramChain: don't fail if interface not found
This commit is contained in:
Sebastiaan van Stijn 2023-08-23 19:58:18 +02:00 • committed by GitHub
commit 0e3b2ec267
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnetwork/iptables/firewalld.go
View file

@ -273,7 +273,7 @@ func DelInterfaceFirewalld(intf string) error {
}
// Remove interface if it exists
if !contains(intfs, intf) {
return fmt.Errorf("Firewalld: unable to find interface %s in %s zone", intf, dockerZone)
return &interfaceNotFound{fmt.Errorf("firewalld: interface %q not found in %s zone", intf, dockerZone)}
}
log.G(context.TODO()).Debugf("Firewalld: removing %s interface from %s zone", intf, dockerZone)
@ -284,6 +284,10 @@ func DelInterfaceFirewalld(intf string) error {
return nil
}
type interfaceNotFound struct{ error }
func (interfaceNotFound) NotFound() {}
func contains(list []string, val string) bool {
for _, v := range list {
if v == val {

3
libnetwork/iptables/iptables.go
View file

@ -15,6 +15,7 @@ import (
"time"
"github.com/containerd/containerd/log"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/pkg/rootless"
)
@ -209,7 +210,7 @@ func (iptable IPTable) ProgramChain(c *ChainInfo, bridgeName string, hairpinMode
return err
}
} else {
if err := DelInterfaceFirewalld(bridgeName); err != nil {
if err := DelInterfaceFirewalld(bridgeName); err != nil && !errdefs.IsNotFound(err) {
return err
}
}