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 /pkg/domain | |
| 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 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/pods.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index f9850e5a8..1b5a1be51 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -138,6 +138,7 @@ type PodCreateOptions struct { Userns specgen.Namespace `json:"-"` Volume []string `json:"volume,omitempty"` VolumesFrom []string `json:"volumes_from,omitempty"` + SecurityOpt []string `json:"security_opt,omitempty"` } // PodLogsOptions describes the options to extract pod logs. @@ -230,7 +231,7 @@ type ContainerCreateOptions struct { Rm bool RootFS bool Secrets []string - SecurityOpt []string + SecurityOpt []string `json:"security_opt,omitempty"` SdNotifyMode string ShmSize string SignaturePolicy string @@ -312,6 +313,7 @@ func ToPodSpecGen(s specgen.PodSpecGenerator, p *PodCreateOptions) (*specgen.Pod s.Hostname = p.Hostname s.Labels = p.Labels s.Devices = p.Devices + s.SecurityOpt = p.SecurityOpt s.NoInfra = !p.Infra if p.InfraCommand != nil && len(*p.InfraCommand) > 0 { s.InfraCommand = strings.Split(*p.InfraCommand, " ") |