diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-15 04:50:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-15 04:50:40 -0400 |
commit | 6224f3f5d5f651a5bbfdc15407288d08d7af33ea (patch) | |
tree | 56476ca94445886e46f55f574fb5ad4e752ab95b /libpod/define | |
parent | c4843d4e9ce395f1bbcaae848e6172f5a4519a35 (diff) | |
parent | fbc1167c4d7861013001d0c2460c6e1c1e1ad66d (diff) | |
download | podman-6224f3f5d5f651a5bbfdc15407288d08d7af33ea.tar.gz podman-6224f3f5d5f651a5bbfdc15407288d08d7af33ea.tar.bz2 podman-6224f3f5d5f651a5bbfdc15407288d08d7af33ea.zip |
Merge pull request #6956 from mheon/add_ports_to_pod_inspect
Include infra container information in `pod inspect`
Diffstat (limited to 'libpod/define')
-rw-r--r-- | libpod/define/pod_inspect.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/define/pod_inspect.go b/libpod/define/pod_inspect.go index 7f06e16fc..634cbb728 100644 --- a/libpod/define/pod_inspect.go +++ b/libpod/define/pod_inspect.go @@ -3,8 +3,6 @@ package define import ( "net" "time" - - "github.com/cri-o/ocicni/pkg/ocicni" ) // InspectPodData contains detailed information on a pod's configuration and @@ -60,7 +58,7 @@ type InspectPodData struct { type InspectPodInfraConfig struct { // PortBindings are ports that will be forwarded to the infra container // and then shared with the pod. - PortBindings []ocicni.PortMapping + PortBindings map[string][]InspectHostPort // HostNetwork is whether the infra container (and thus the whole pod) // will use the host's network and not create a network namespace. HostNetwork bool @@ -89,6 +87,8 @@ type InspectPodInfraConfig struct { // HostAdd adds a number of hosts to the infra container's resolv.conf // which will be shared with the rest of the pod. HostAdd []string + // Networks is a list of CNI networks te pod will join. + Networks []string } // InspectPodContainerInfo contains information on a container in a pod. |