mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-10 13:54:12 +00:00
Merge pull request #427 from bergwolf/sandbox_ns
sandbox: expose share sandbox pidns setting
This commit is contained in:
commit
d02babdf81
@ -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)
|
||||||
|
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user