containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5292 from baude/nofirewallpluginisgood 

disable generation of cni firewall plugin
This commit is contained in:
OpenShift Merge Robot 2020-02-21 15:09:29 -05:00 committed by GitHub
parent 75ea3b67c6 a86f3e88d0
commit ed6264c28e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cni/87-podman-bridge.conflist
View File

@ -26,10 +26,6 @@
"portMappings": true "portMappings": true
} }
}, },
{
"type": "firewall",
"backend": "iptables"
},
{ {
"type": "tuning" "type": "tuning"
} }

1
pkg/adapter/network.go
View File

@ -209,7 +209,6 @@ func (r *LocalRuntime) NetworkCreateBridge(cli *cliconfig.NetworkCreateValues) (
bridge := network.NewHostLocalBridge(bridgeDeviceName, isGateway, false, ipMasq, ipamConfig) bridge := network.NewHostLocalBridge(bridgeDeviceName, isGateway, false, ipMasq, ipamConfig)
plugins = append(plugins, bridge) plugins = append(plugins, bridge)
plugins = append(plugins, network.NewPortMapPlugin()) plugins = append(plugins, network.NewPortMapPlugin())
plugins = append(plugins, network.NewFirewallPlugin())
// if we find the dnsname plugin, we add configuration for it // if we find the dnsname plugin, we add configuration for it
if network.HasDNSNamePlugin(runtimeConfig.CNIPluginDir) && !cli.DisableDNS { if network.HasDNSNamePlugin(runtimeConfig.CNIPluginDir) && !cli.DisableDNS {
// Note: in the future we might like to allow for dynamic domain names // Note: in the future we might like to allow for dynamic domain names