opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-04 18:27:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5348 from baude/cninetfix

Browse Source 
Cninetfix
This commit is contained in:
OpenShift Merge Robot
2020-02-27 23:40:03 +01:00
committed by GitHub
parent 52876dc821 6c97e0d5c1
commit baf27fa25e
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,9 @@
"portMappings": true "portMappings": true
} }
}, },
{
"type": "firewall"
},
{ {
"type": "tuning" "type": "tuning"
} }

1
pkg/adapter/network.go
View File

@ -209,6 +209,7 @@ 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

1
pkg/network/netconflist.go
View File

@ -110,7 +110,6 @@ func NewPortMapPlugin() PortMapConfig {
func NewFirewallPlugin() FirewallConfig { func NewFirewallPlugin() FirewallConfig {
return FirewallConfig{ return FirewallConfig{
PluginType: "firewall", PluginType: "firewall",
Backend: "iptables",
} }
} }