diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-05 17:56:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-05 17:56:36 +0100 |
| commit | 50e156b60536017fc1841ef6b875565cb1a08a4e (patch) | |
| tree | 4dfe1e4929f29470cc5e99b955d47b7080ac1555 /libpod/pod_api.go | |
| parent | 2157414cf83a3b99accc2f52ac8da3f2f05bd8dd (diff) | |
| parent | 289270375a54c26b86f9e2d99aab18b427e56b88 (diff) | |
| download | podman-50e156b60536017fc1841ef6b875565cb1a08a4e.tar.gz podman-50e156b60536017fc1841ef6b875565cb1a08a4e.tar.bz2 podman-50e156b60536017fc1841ef6b875565cb1a08a4e.zip | |
Merge pull request #12208 from cdoern/podSecurityOpt
Pod Security Option support and Infra Inheritance changes
Diffstat (limited to 'libpod/pod_api.go')
| -rw-r--r-- | libpod/pod_api.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 95a82721e..526e0c28b 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -586,6 +586,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { var inspectMounts []define.InspectMount var devices []define.InspectDevice var deviceLimits []define.InspectBlkioThrottleDevice + var infraSecurity []string if p.state.InfraContainerID != "" { infra, err := p.runtime.GetContainer(p.state.InfraContainerID) if err != nil { @@ -603,6 +604,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { infraConfig.UserNS = p.UserNSMode() namedVolumes, mounts := infra.sortUserVolumes(infra.config.Spec) inspectMounts, err = infra.GetInspectMounts(namedVolumes, infra.config.ImageVolumes, mounts) + infraSecurity = infra.GetSecurityOptions() if err != nil { return nil, err } @@ -678,6 +680,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { Devices: devices, BlkioDeviceReadBps: deviceLimits, VolumesFrom: p.VolumesFrom(), + SecurityOpts: infraSecurity, } return &inspectData, nil |