github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-10 13:54:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #427 from bergwolf/sandbox_ns

Browse Source 
sandbox: expose share sandbox pidns setting
This commit is contained in:
Archana Shinde 2018-06-20 09:27:13 -07:00 committed by GitHub
commit d02babdf81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/kata_agent.go
View File

@ -528,7 +528,7 @@ func (k *kataAgent) startSandbox(sandbox *Sandbox) error {
req := &grpc.CreateSandboxRequest{ req := &grpc.CreateSandboxRequest{
Hostname: hostname, Hostname: hostname,
Storages: storages, Storages: storages,
SandboxPidns: false, SandboxPidns: sandbox.sharePidNs,
} }
_, err = k.sendReq(req) _, err = k.sendReq(req)

7
virtcontainers/sandbox.go
View File

@ -358,6 +358,9 @@ type SandboxConfig struct {
Annotations map[string]string Annotations map[string]string
ShmSize uint64 ShmSize uint64
// SharePidNs sets all containers to share the same sandbox level pid namespace.
SharePidNs bool
} }
// valid checks that the sandbox configuration is valid. // valid checks that the sandbox configuration is valid.
@ -462,7 +465,8 @@ type Sandbox struct {
wg *sync.WaitGroup wg *sync.WaitGroup
shmSize uint64 shmSize uint64
sharePidNs bool
} }
// ID returns the sandbox identifier string. // ID returns the sandbox identifier string.
@ -743,6 +747,7 @@ func newSandbox(sandboxConfig SandboxConfig) (*Sandbox, error) {
annotationsLock: &sync.RWMutex{}, annotationsLock: &sync.RWMutex{},
wg: &sync.WaitGroup{}, wg: &sync.WaitGroup{},
shmSize: sandboxConfig.ShmSize, shmSize: sandboxConfig.ShmSize,
sharePidNs: sandboxConfig.SharePidNs,
} }
if err = globalSandboxList.addSandbox(s); err != nil { if err = globalSandboxList.addSandbox(s); err != nil {