diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-21 08:40:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-21 08:40:40 -0400 |
| commit | 9b5522d9adff9e8b2413e626bfc62d1df28ce534 (patch) | |
| tree | 6d3b482de0ef857f8956c35c35788238f706c303 /libpod/pod_api.go | |
| parent | b925d707fa768245b3bd50d570b91992c1814dba (diff) | |
| parent | 8fac34b8ff05314fe6996567af9336cf034b2d03 (diff) | |
| download | podman-9b5522d9adff9e8b2413e626bfc62d1df28ce534.tar.gz podman-9b5522d9adff9e8b2413e626bfc62d1df28ce534.tar.bz2 podman-9b5522d9adff9e8b2413e626bfc62d1df28ce534.zip | |
Merge pull request #11518 from cdoern/podDevice
Pod Devices support
Diffstat (limited to 'libpod/pod_api.go')
| -rw-r--r-- | libpod/pod_api.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 4e0acf950..ff818edc2 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -583,6 +583,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { // container. var infraConfig *define.InspectPodInfraConfig var inspectMounts []define.InspectMount + var devices []define.InspectDevice if p.state.InfraContainerID != "" { infra, err := p.runtime.GetContainer(p.state.InfraContainerID) if err != nil { @@ -604,6 +605,12 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { return nil, err } + var nodes map[string]string + devices, err = infra.GetDevices(false, *infra.config.Spec, nodes) + if err != nil { + return nil, err + } + if len(infra.Config().ContainerNetworkConfig.DNSServer) > 0 { infraConfig.DNSServer = make([]string, 0, len(infra.Config().ContainerNetworkConfig.DNSServer)) for _, entry := range infra.Config().ContainerNetworkConfig.DNSServer { @@ -652,6 +659,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { CPUPeriod: p.CPUPeriod(), CPUQuota: p.CPUQuota(), Mounts: inspectMounts, + Devices: devices, } return &inspectData, nil |