diff options
| author | baude <bbaude@redhat.com> | 2021-01-25 13:58:04 -0600 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-01-29 15:23:24 -0500 |
| commit | 2393dd304de3453fabfb7eac99ef6b2fb308bd29 (patch) | |
| tree | b76826b786cde795aa0a52bcc0aad25969dd1edb /libpod | |
| parent | b4aa54c7561f7093f795093a72c75248018f3517 (diff) | |
| download | podman-2393dd304de3453fabfb7eac99ef6b2fb308bd29.tar.gz podman-2393dd304de3453fabfb7eac99ef6b2fb308bd29.tar.bz2 podman-2393dd304de3453fabfb7eac99ef6b2fb308bd29.zip | |
Add default net info in container inspect
when inspecting a container that is only connected to the default
network, we should populate the default network in the container inspect
information.
Fixes: #6618
Signed-off-by: baude <bbaude@redhat.com>
MH: Small fixes, added another test
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/networking_linux.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index addf1814c..94b8563fe 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -955,7 +955,7 @@ func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, e if c.state.NetNS == nil { // We still want to make dummy configurations for each CNI net // the container joined. - if len(networks) > 0 && !isDefault { + if len(networks) > 0 { settings.Networks = make(map[string]*define.InspectAdditionalNetwork, len(networks)) for _, net := range networks { cniNet := new(define.InspectAdditionalNetwork) @@ -976,7 +976,7 @@ func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, e } // If we have CNI networks - handle that here - if len(networks) > 0 && !isDefault { + if len(networks) > 0 { if len(networks) != len(c.state.NetworkStatus) { return nil, errors.Wrapf(define.ErrInternal, "network inspection mismatch: asked to join %d CNI network(s) %v, but have information on %d network(s)", len(networks), networks, len(c.state.NetworkStatus)) } @@ -1006,7 +1006,9 @@ func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, e settings.Networks[name] = addedNet } - return settings, nil + if !isDefault { + return settings, nil + } } // If not joining networks, we should have at most 1 result |