vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1163 from mrunalp/pid_ns_opt_in

Browse source 
Make pid namespace sharing optional and disabled by default
This commit is contained in:
Daniel J Walsh 2017-11-19 06:06:35 -05:00 committed by GitHub
commit 6c8ab88e9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/crio/config.go
View file

@ -115,8 +115,8 @@ default_mounts = [
# pids_limit is the number of processes allowed in a container # pids_limit is the number of processes allowed in a container
pids_limit = {{ .PidsLimit }} pids_limit = {{ .PidsLimit }}
# disable using a shared PID namespace for containers in a pod # enable using a shared PID namespace for containers in a pod
disable_shared_pid_namespace = {{ .DisableSharedPIDNamespace }} enable_shared_pid_namespace = {{ .EnableSharedPIDNamespace }}
# log_size_max is the max limit for the container log size in bytes. # log_size_max is the max limit for the container log size in bytes.
# Negative values indicate that no limit is imposed. # Negative values indicate that no limit is imposed.

8
cmd/crio/main.go
View file

@ -132,8 +132,8 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
if ctx.GlobalIsSet("pids-limit") { if ctx.GlobalIsSet("pids-limit") {
config.PidsLimit = ctx.GlobalInt64("pids-limit") config.PidsLimit = ctx.GlobalInt64("pids-limit")
} }
if ctx.GlobalIsSet("disable-shared-pid-namespace") { if ctx.GlobalIsSet("enable-shared-pid-namespace") {
config.DisableSharedPIDNamespace = ctx.GlobalBool("disable-shared-pid-namespace") config.EnableSharedPIDNamespace = ctx.GlobalBool("enable-shared-pid-namespace")
} }
if ctx.GlobalIsSet("log-size-max") { if ctx.GlobalIsSet("log-size-max") {
config.LogSizeMax = ctx.GlobalInt64("log-size-max") config.LogSizeMax = ctx.GlobalInt64("log-size-max")
@ -301,8 +301,8 @@ func main() {
Usage: "maximum number of processes allowed in a container", Usage: "maximum number of processes allowed in a container",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "disable-shared-pid-namespace", Name: "enable-shared-pid-namespace",
Usage: "disable using a shared PID namespace for containers in a pod", Usage: "enable using a shared PID namespace for containers in a pod",
}, },
cli.Int64Flag{ cli.Int64Flag{
Name: "log-size-max", Name: "log-size-max",

4
docs/crio.8.md
View file

@ -118,8 +118,8 @@ set the CPU profile file path
**--pids-limit**="" **--pids-limit**=""
Maximum number of processes allowed in a container (default: 1024) Maximum number of processes allowed in a container (default: 1024)
**--disable-shared-pid-namespace**="" **--enable-shared-pid-namespace**=""
Disable using a shared PID namespace for containers in a pod (default: false) Enable using a shared PID namespace for containers in a pod (default: false)
**--root**="" **--root**=""
The crio root dir (default: "/var/lib/containers/storage") The crio root dir (default: "/var/lib/containers/storage")

4
docs/crio.conf.5.md
View file

@ -87,8 +87,8 @@ Example:
**pids_limit**="" **pids_limit**=""
Maximum number of processes allowed in a container (default: 1024) Maximum number of processes allowed in a container (default: 1024)
**disable_shared_pid_namespace**="" **enable_shared_pid_namespace**=""
Disable using a shared PID namespace for containers in a pod (default: false) Enable using a shared PID namespace for containers in a pod (default: false)
**runtime**="" **runtime**=""
OCI runtime path (default: "/usr/bin/runc") OCI runtime path (default: "/usr/bin/runc")

4
libkpod/config.go
View file

@ -121,8 +121,8 @@ type RuntimeConfig struct {
// NoPivot instructs the runtime to not use `pivot_root`, but instead use `MS_MOVE` // NoPivot instructs the runtime to not use `pivot_root`, but instead use `MS_MOVE`
NoPivot bool `toml:"no_pivot"` NoPivot bool `toml:"no_pivot"`
// DisableSharePidNamespace instructs the runtime to disable share pid namespace // EnableSharePidNamespace instructs the runtime to enable share pid namespace
DisableSharedPIDNamespace bool `toml:"disable_shared_pid_namespace"` EnableSharedPIDNamespace bool `toml:"enable_shared_pid_namespace"`
// Conmon is the path to conmon binary, used for managing the runtime. // Conmon is the path to conmon binary, used for managing the runtime.
Conmon string `toml:"conmon"` Conmon string `toml:"conmon"`

2
server/container_create.go
View file

@ -924,7 +924,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
if containerConfig.GetLinux().GetSecurityContext().GetNamespaceOptions().GetHostPid() { if containerConfig.GetLinux().GetSecurityContext().GetNamespaceOptions().GetHostPid() {
// kubernetes PodSpec specify to use Host PID namespace // kubernetes PodSpec specify to use Host PID namespace
specgen.RemoveLinuxNamespace(string(rspec.PIDNamespace)) specgen.RemoveLinuxNamespace(string(rspec.PIDNamespace))
} else if !s.config.DisableSharedPIDNamespace { } else if s.config.EnableSharedPIDNamespace {
// share Pod PID namespace // share Pod PID namespace
pidNsPath := fmt.Sprintf("/proc/%d/ns/pid", podInfraState.Pid) pidNsPath := fmt.Sprintf("/proc/%d/ns/pid", podInfraState.Pid)
if err := specgen.AddOrReplaceLinuxNamespace(string(rspec.PIDNamespace), pidNsPath); err != nil { if err := specgen.AddOrReplaceLinuxNamespace(string(rspec.PIDNamespace), pidNsPath); err != nil {

4
test/helpers.bash
View file

@ -57,7 +57,7 @@ PIDS_LIMIT=${PIDS_LIMIT:-1024}
# Log size max limit # Log size max limit
LOG_SIZE_MAX_LIMIT=${LOG_SIZE_MAX_LIMIT:--1} LOG_SIZE_MAX_LIMIT=${LOG_SIZE_MAX_LIMIT:--1}
# enable share container pid namespace # enable share container pid namespace
DISABLE_SHARED_PID_NAMESPACE=${DISABLE_SHARED_PID_NAMESPACE:-false} ENABLE_SHARED_PID_NAMESPACE=${ENABLE_SHARED_PID_NAMESPACE:-false}
TESTDIR=$(mktemp -d) TESTDIR=$(mktemp -d)
@ -242,7 +242,7 @@ function start_crio() {
"$COPYIMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTIONS --runroot "$TESTDIR/crio-run" --image-name=mrunalp/image-volume-test --import-from=dir:"$ARTIFACTS_PATH"/image-volume-test-image --add-name=docker.io/library/mrunalp/image-volume-test --signature-policy="$INTEGRATION_ROOT"/policy.json "$COPYIMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTIONS --runroot "$TESTDIR/crio-run" --image-name=mrunalp/image-volume-test --import-from=dir:"$ARTIFACTS_PATH"/image-volume-test-image --add-name=docker.io/library/mrunalp/image-volume-test --signature-policy="$INTEGRATION_ROOT"/policy.json
"$COPYIMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTIONS --runroot "$TESTDIR/crio-run" --image-name=busybox:latest --import-from=dir:"$ARTIFACTS_PATH"/busybox-image --add-name=docker.io/library/busybox:latest --signature-policy="$INTEGRATION_ROOT"/policy.json "$COPYIMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTIONS --runroot "$TESTDIR/crio-run" --image-name=busybox:latest --import-from=dir:"$ARTIFACTS_PATH"/busybox-image --add-name=docker.io/library/busybox:latest --signature-policy="$INTEGRATION_ROOT"/policy.json
"$COPYIMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTIONS --runroot "$TESTDIR/crio-run" --image-name=runcom/stderr-test:latest --import-from=dir:"$ARTIFACTS_PATH"/stderr-test --add-name=docker.io/runcom/stderr-test:latest --signature-policy="$INTEGRATION_ROOT"/policy.json "$COPYIMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTIONS --runroot "$TESTDIR/crio-run" --image-name=runcom/stderr-test:latest --import-from=dir:"$ARTIFACTS_PATH"/stderr-test --add-name=docker.io/runcom/stderr-test:latest --signature-policy="$INTEGRATION_ROOT"/policy.json
"$CRIO_BINARY" ${DEFAULT_MOUNTS_OPTS} ${HOOKS_OPTS} --conmon "$CONMON_BINARY" --listen "$CRIO_SOCKET" --cgroup-manager "$CGROUP_MANAGER" --registry "docker.io" --runtime "$RUNTIME_BINARY" --root "$TESTDIR/crio" --runroot "$TESTDIR/crio-run" $STORAGE_OPTIONS --seccomp-profile "$seccomp" --apparmor-profile "$apparmor" --cni-config-dir "$CRIO_CNI_CONFIG" --cni-plugin-dir "$CRIO_CNI_PLUGIN" --signature-policy "$INTEGRATION_ROOT"/policy.json --image-volumes "$IMAGE_VOLUMES" --pids-limit "$PIDS_LIMIT" --disable-shared-pid-namespace=${DISABLE_SHARED_PID_NAMESPACE} --log-size-max "$LOG_SIZE_MAX_LIMIT" --config /dev/null config >$CRIO_CONFIG "$CRIO_BINARY" ${DEFAULT_MOUNTS_OPTS} ${HOOKS_OPTS} --conmon "$CONMON_BINARY" --listen "$CRIO_SOCKET" --cgroup-manager "$CGROUP_MANAGER" --registry "docker.io" --runtime "$RUNTIME_BINARY" --root "$TESTDIR/crio" --runroot "$TESTDIR/crio-run" $STORAGE_OPTIONS --seccomp-profile "$seccomp" --apparmor-profile "$apparmor" --cni-config-dir "$CRIO_CNI_CONFIG" --cni-plugin-dir "$CRIO_CNI_PLUGIN" --signature-policy "$INTEGRATION_ROOT"/policy.json --image-volumes "$IMAGE_VOLUMES" --pids-limit "$PIDS_LIMIT" --enable-shared-pid-namespace=${ENABLE_SHARED_PID_NAMESPACE} --log-size-max "$LOG_SIZE_MAX_LIMIT" --config /dev/null config >$CRIO_CONFIG
# Prepare the CNI configuration files, we're running with non host networking by default # Prepare the CNI configuration files, we're running with non host networking by default
if [[ -n "$4" ]]; then if [[ -n "$4" ]]; then

4
test/namespaces.bats
View file

@ -7,7 +7,7 @@ function teardown() {
} }
@test "pod disable shared pid namespace" { @test "pod disable shared pid namespace" {
DISABLE_SHARED_PID_NAMESPACE="true" start_crio ENABLE_SHARED_PID_NAMESPACE="false" start_crio
run crictl runs "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
@ -37,7 +37,7 @@ function teardown() {
} }
@test "pod enable shared pid namespace" { @test "pod enable shared pid namespace" {
DISABLE_SHARED_PID_NAMESPACE="false" start_crio ENABLE_SHARED_PID_NAMESPACE="true" start_crio
run crictl runs "$TESTDATA"/sandbox_config.json run crictl runs "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"