diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-21 11:05:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-21 11:05:16 -0700 |
| commit | 1ff984d509b85d9ededeb5c609bff01210512891 (patch) | |
| tree | c98c31037b8a9dd97eca3b4c0b458b060a83e00c /libpod/runtime.go | |
| parent | 1ad8fe52412c8cef215e5a5af312e5db680c3916 (diff) | |
| parent | 99983e20bbd6af8b88ae11ba53110438d666046b (diff) | |
| download | podman-1ff984d509b85d9ededeb5c609bff01210512891.tar.gz podman-1ff984d509b85d9ededeb5c609bff01210512891.tar.bz2 podman-1ff984d509b85d9ededeb5c609bff01210512891.zip | |
Merge pull request #2940 from giuseppe/drop-firewall
networking: use firewall plugin
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 cbbf667db..4d6a80d0b 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 |