diff options
author | Matthew Heon <mheon@redhat.com> | 2020-07-13 14:22:43 -0400 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2020-07-14 12:03:11 -0400 |
commit | 41457b5a28532d410517b1afb1759e2724d03cab (patch) | |
tree | 9d0f6a2e28c8ffdb4366bd3482b2cf5fd255be9e /libpod/networking_linux.go | |
parent | 210f1040d26334457803bc1da74667f70630a620 (diff) | |
download | podman-41457b5a28532d410517b1afb1759e2724d03cab.tar.gz podman-41457b5a28532d410517b1afb1759e2724d03cab.tar.bz2 podman-41457b5a28532d410517b1afb1759e2724d03cab.zip |
Include infra container information in `pod inspect`
We had a field for this in the inspect data, but it was never
being populated. Because of this, `podman pod inspect` stopped
showing port bindings (and other infra container settings). Add
code to populate the infra container inspect data, and add a test
to ensure we don't regress again.
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod/networking_linux.go')
-rw-r--r-- | libpod/networking_linux.go | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 5a8faa7a4..1e79e8732 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -587,21 +587,7 @@ func getContainerNetIO(ctr *Container) (*netlink.LinkStatistics, error) { // network. func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, error) { settings := new(define.InspectNetworkSettings) - settings.Ports = make(map[string][]define.InspectHostPort) - if c.config.PortMappings != nil { - for _, port := range c.config.PortMappings { - key := fmt.Sprintf("%d/%s", port.ContainerPort, port.Protocol) - mapping := settings.Ports[key] - if mapping == nil { - mapping = []define.InspectHostPort{} - } - mapping = append(mapping, define.InspectHostPort{ - HostIP: port.HostIP, - HostPort: fmt.Sprintf("%d", port.HostPort), - }) - settings.Ports[key] = mapping - } - } + settings.Ports = makeInspectPortBindings(c.config.PortMappings) // We can't do more if the network is down. if c.state.NetNS == nil { |