diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-04-15 14:16:34 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-08-19 16:16:06 +0200 |
| commit | 99983e20bbd6af8b88ae11ba53110438d666046b (patch) | |
| tree | 895c7029f2924621cf028ace13cff182e20124a5 /libpod/runtime.go | |
| parent | bd0b05f13860b62de389ec67eadd0df6b44d4f4f (diff) | |
| download | podman-99983e20bbd6af8b88ae11ba53110438d666046b.tar.gz podman-99983e20bbd6af8b88ae11ba53110438d666046b.tar.bz2 podman-99983e20bbd6af8b88ae11ba53110438d666046b.zip | |
networking: use firewall plugin
drop the pkg/firewall module and start using the firewall CNI plugin.
It requires an updated package for CNI plugins.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 2fa8dd424..ffc4c0cbc 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -23,7 +23,6 @@ import ( "github.com/containers/libpod/libpod/events" "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/libpod/lock" - "github.com/containers/libpod/pkg/firewall" sysreg "github.com/containers/libpod/pkg/registries" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/util" @@ -108,7 +107,6 @@ type Runtime struct { netPlugin ocicni.CNIPlugin conmonPath string imageRuntime *image.Runtime - firewallBackend firewall.FirewallBackend lockManager lock.Manager configuredFrom *runtimeConfiguredFrom @@ -1110,17 +1108,6 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) { runtime.netPlugin = netPlugin } - // Set up a firewall backend - backendType := "" - if rootless.IsRootless() { - backendType = "none" - } - fwBackend, err := firewall.GetBackend(backendType) - if err != nil { - return err - } - runtime.firewallBackend = fwBackend - // We now need to see if the system has restarted // We check for the presence of a file in our tmp directory to verify this // This check must be locked to prevent races |