diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-27 23:40:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 23:40:03 +0100 |
| commit | baf27fa25eed668b5a73a1d7d4fe16214f1c260f (patch) | |
| tree | 62678ac184652159b7df457e0ae588eb2e61d937 /pkg | |
| parent | 52876dc821a1a97df2ffb7388439662c45e490a3 (diff) | |
| parent | 6c97e0d5c140d587e5477d478159e91b8adcfd15 (diff) | |
| download | podman-baf27fa25eed668b5a73a1d7d4fe16214f1c260f.tar.gz podman-baf27fa25eed668b5a73a1d7d4fe16214f1c260f.tar.bz2 podman-baf27fa25eed668b5a73a1d7d4fe16214f1c260f.zip | |
Merge pull request #5348 from baude/cninetfix
Cninetfix
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/network.go | 1 | ||||
| -rw-r--r-- | pkg/network/netconflist.go | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/pkg/adapter/network.go b/pkg/adapter/network.go index c5bd91534..b25f54a13 100644 --- a/pkg/adapter/network.go +++ b/pkg/adapter/network.go @@ -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 diff --git a/pkg/network/netconflist.go b/pkg/network/netconflist.go index a8217097a..34ff00024 100644 --- a/pkg/network/netconflist.go +++ b/pkg/network/netconflist.go @@ -110,7 +110,6 @@ func NewPortMapPlugin() PortMapConfig { func NewFirewallPlugin() FirewallConfig { return FirewallConfig{ PluginType: "firewall", - Backend: "iptables", } } |