|
 |
3733b2 |
From 6c97e0d5c140d587e5477d478159e91b8adcfd15 Mon Sep 17 00:00:00 2001
|
|
|
3733b2 |
From: Brent Baude <bbaude@redhat.com>
|
|
|
3733b2 |
Date: Thu, 27 Feb 2020 14:39:31 -0600
|
|
|
3733b2 |
Subject: [PATCH 2/2] network create should use firewall plugin
|
|
|
3733b2 |
|
|
|
3733b2 |
when creating a network, podman should add the firewall plugin to the config but not specify a backend. this will allow cni to determine whether it should use an iptables|firewalld backend.
|
|
|
3733b2 |
|
|
|
3733b2 |
Signed-off-by: Brent Baude <bbaude@redhat.com>
|
|
|
3733b2 |
---
|
|
|
3733b2 |
pkg/adapter/network.go | 1 +
|
|
|
3733b2 |
pkg/network/netconflist.go | 1 -
|
|
|
3733b2 |
2 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
3733b2 |
|
|
|
3733b2 |
diff --git a/pkg/network/netconflist.go b/pkg/network/netconflist.go
|
|
|
3733b2 |
index a8217097ac..34ff000249 100644
|
|
|
3733b2 |
--- a/pkg/network/netconflist.go
|
|
|
3733b2 |
+++ b/pkg/network/netconflist.go
|
|
|
3733b2 |
@@ -110,7 +110,6 @@ func NewPortMapPlugin() PortMapConfig {
|
|
|
3733b2 |
func NewFirewallPlugin() FirewallConfig {
|
|
|
3733b2 |
return FirewallConfig{
|
|
|
3733b2 |
PluginType: "firewall",
|
|
|
3733b2 |
- Backend: "iptables",
|
|
|
3733b2 |
}
|
|
|
3733b2 |
}
|
|
|
3733b2 |
|
|
|
3733b2 |
|
|
|
3733b2 |
From cfd40608907b653a8b05f2e4f4243f8aa677b6e3 Mon Sep 17 00:00:00 2001
|
|
|
3733b2 |
From: Brent Baude <bbaude@redhat.com>
|
|
|
3733b2 |
Date: Thu, 27 Feb 2020 14:35:48 -0600
|
|
|
3733b2 |
Subject: [PATCH 1/2] add firewall plugin (no backend) to default cni config
|
|
|
3733b2 |
|
|
|
3733b2 |
in order for the fall back mechanisms to work in containernetworking-plugins, the firewall plugin must still be called via the cni configuration file. however, no backend w
|
|
|
3733b2 |
|
|
|
3733b2 |
Signed-off-by: Brent Baude <bbaude@redhat.com>
|
|
|
3733b2 |
---
|
|
|
3733b2 |
cni/87-podman-bridge.conflist | 3 +++
|
|
|
3733b2 |
1 file changed, 3 insertions(+)
|
|
|
3733b2 |
|
|
|
3733b2 |
diff -up a/cni/87-podman-bridge.conflist b/cni/87-podman-bridge.conflist
|
|
|
3733b2 |
--- a/cni/87-podman-bridge.conflist
|
|
|
3733b2 |
+++ b/cni/87-podman-bridge.conflist
|
|
|
3733b2 |
@@ -31,8 +31,7 @@
|
|
|
f66184 |
}
|
|
|
3733b2 |
},
|
|
|
3733b2 |
{
|
|
|
f66184 |
- "type": "firewall",
|
|
|
f66184 |
- "backend": "iptables"
|
|
|
3733b2 |
+ "type": "firewall"
|
|
|
3733b2 |
}
|
|
|
3733b2 |
]
|
|
|
f66184 |
}
|