diff options
author | Matthew Heon <mheon@redhat.com> | 2020-11-20 13:49:40 -0500 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2020-11-20 14:03:24 -0500 |
commit | ce775248ada62c117dd5303989052b268e6594bd (patch) | |
tree | ffec30ad79d2ec8a51d7387ee46d5e1e9be8d517 /libpod/rootless_cni_linux.go | |
parent | 864fe21ed02ca6faa72e6a94f06c9961167aca7d (diff) | |
download | podman-ce775248ada62c117dd5303989052b268e6594bd.tar.gz podman-ce775248ada62c117dd5303989052b268e6594bd.tar.bz2 podman-ce775248ada62c117dd5303989052b268e6594bd.zip |
Make c.networks() list include the default network
This makes things a lot more clear - if we are actually joining a
CNI network, we are guaranteed to get a non-zero length list of
networks.
We do, however, need to know if the network we are joining is the
default network for inspecting containers as it determines how we
populate the response struct. To handle this, add a bool to
indicate that the network listed was the default network, and
only the default network.
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod/rootless_cni_linux.go')
-rw-r--r-- | libpod/rootless_cni_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/rootless_cni_linux.go b/libpod/rootless_cni_linux.go index 1d6158cc2..2c2977f9f 100644 --- a/libpod/rootless_cni_linux.go +++ b/libpod/rootless_cni_linux.go @@ -40,7 +40,7 @@ const ( // // AllocRootlessCNI does not lock c. c should be already locked. func AllocRootlessCNI(ctx context.Context, c *Container) (ns.NetNS, []*cnitypes.Result, error) { - networks, err := c.networks() + networks, _, err := c.networks() if err != nil { return nil, nil, err } @@ -81,7 +81,7 @@ func AllocRootlessCNI(ctx context.Context, c *Container) (ns.NetNS, []*cnitypes. // // DeallocRootlessCNI does not lock c. c should be already locked. func DeallocRootlessCNI(ctx context.Context, c *Container) error { - networks, err := c.networks() + networks, _, err := c.networks() if err != nil { return err } |