Merge pull request #5348 from baude/cninetfix

Cninetfix
This commit is contained in:
OpenShift Merge Robot
2020-02-27 23:40:03 +01:00
committed by GitHub
3 changed files with 4 additions and 1 deletions

View File

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

View File

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

View File

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