diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-27 09:24:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 09:24:26 -0400 |
| commit | 266a3892f25d8cee508f421e718ba6f135ff7123 (patch) | |
| tree | 98aceda072f00ac22d3ee438bfc42d2f4aa1ff93 /pkg/specgen/podspecgen.go | |
| parent | 69cdf5d8035672e8bc7141cac0207e4b0f0e80cd (diff) | |
| parent | d28e85741fedb89be48a03d4f05687e970eb71b9 (diff) | |
| download | podman-266a3892f25d8cee508f421e718ba6f135ff7123.tar.gz podman-266a3892f25d8cee508f421e718ba6f135ff7123.tar.bz2 podman-266a3892f25d8cee508f421e718ba6f135ff7123.zip | |
Merge pull request #11102 from cdoern/infraEnhance
InfraContainer Rework
Diffstat (limited to 'pkg/specgen/podspecgen.go')
| -rw-r--r-- | pkg/specgen/podspecgen.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index 386571d11..8872a1321 100644 --- a/pkg/specgen/podspecgen.go +++ b/pkg/specgen/podspecgen.go @@ -67,7 +67,7 @@ type PodBasicConfig struct { // Pid sets the process id namespace of the pod // Optional (defaults to private if unset). This sets the PID namespace of the infra container // This configuration will then be shared with the entire pod if PID namespace sharing is enabled via --share - Pid Namespace `json:"pid,omitempty:"` + Pid Namespace `json:"pidns,omitempty"` // Userns is used to indicate which kind of Usernamespace to enter. // Any containers created within the pod will inherit the pod's userns settings. // Optional @@ -173,6 +173,7 @@ type PodSpecGenerator struct { PodNetworkConfig PodCgroupConfig PodResourceConfig + InfraContainerSpec *SpecGenerator `json:"-"` } type PodResourceConfig struct { |