diff --git a/cmd/crio/config.go b/cmd/crio/config.go index 76e3361d..7d26059f 100644 --- a/cmd/crio/config.go +++ b/cmd/crio/config.go @@ -115,6 +115,9 @@ default_mounts = [ # pids_limit is the number of processes allowed in a container pids_limit = {{ .PidsLimit }} +# enable using a shared PID namespace for containers in a pod +enable_shared_pid_namespace = {{ .EnableSharedPIDNamespace }} + # log_size_max is the max limit for the container log size in bytes. # Negative values indicate that no limit is imposed. log_size_max = {{ .LogSizeMax }} diff --git a/cmd/crio/main.go b/cmd/crio/main.go index e47b71b9..2f91c115 100644 --- a/cmd/crio/main.go +++ b/cmd/crio/main.go @@ -132,6 +132,9 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error { if ctx.GlobalIsSet("pids-limit") { config.PidsLimit = ctx.GlobalInt64("pids-limit") } + if ctx.GlobalIsSet("enable-shared-pid-namespace") { + config.EnableSharedPIDNamespace = ctx.GlobalBool("enable-shared-pid-namespace") + } if ctx.GlobalIsSet("log-size-max") { config.LogSizeMax = ctx.GlobalInt64("log-size-max") } @@ -297,6 +300,10 @@ func main() { Value: libkpod.DefaultPidsLimit, Usage: "maximum number of processes allowed in a container", }, + cli.BoolFlag{ + Name: "enable-shared-pid-namespace", + Usage: "enable using a shared PID namespace for containers in a pod", + }, cli.Int64Flag{ Name: "log-size-max", Value: libkpod.DefaultLogSizeMax, diff --git a/contrib/rpm/Makefile b/contrib/rpm/Makefile deleted file mode 100644 index 24bbca28..00000000 --- a/contrib/rpm/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -.PHONY: dist -dist: crio.spec - spectool -g crio.spec - -.PHONY: rpm -rpm: dist - rpmbuild --define "_sourcedir `pwd`" --define "_specdir `pwd`" \ - --define "_rpmdir `pwd`" --define "_srcrpmdir `pwd`" -ba crio.spec - -all: rpm - -clean: - rm -f *rpm *gz - rm -rf x86_64 diff --git a/contrib/rpm/crio.spec b/contrib/rpm/crio.spec deleted file mode 100644 index 3485fe37..00000000 --- a/contrib/rpm/crio.spec +++ /dev/null @@ -1,76 +0,0 @@ -%define debug_package %{nil} -%global provider github -%global provider_tld com -%global project kubernetes-incubator -%global repo cri-o -%global Name crio -# https://github.com/kubernetes-incubator/cri-o -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 8ba639952a95f2e24cc98987689138b67545576c -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: %{Name} -Version: 0.0.1 -Release: 1.git%{shortcommit}%{?dist} -Summary: Kubelet Container Runtime Interface (CRI) for OCI runtimes. -Group: Applications/Text -License: Apache 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Provides: %{repo} - -BuildRequires: golang-github-cpuguy83-go-md2man - -%description -The crio package provides an implementation of the -Kubelet Container Runtime Interface (CRI) using OCI conformant runtimes. - -crio provides following functionalities: - - Support multiple image formats including the existing Docker image format - Support for multiple means to download images including trust & image verification - Container image management (managing image layers, overlay filesystems, etc) - Container process lifecycle management - Monitoring and logging required to satisfy the CRI - Resource isolation as required by the CRI - -%prep -%setup -q -n %{repo}-%{commit} - -%build -make all - -%install -%make_install -%make_install install.systemd - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} -%files -%{_bindir}/crio -%{_bindir}/crioctl -%{_mandir}/man5/crio.conf.5* -%{_mandir}/man8/crio.8* -%{_sysconfdir}/crio.conf -%{_sysconfdir}/seccomp.json -%dir /%{_libexecdir}/crio -/%{_libexecdir}/crio/conmon -/%{_libexecdir}/crio/pause -%{_unitdir}/crio.service -%doc README.md -%license LICENSE -%dir /usr/share/oci-umount/oci-umount.d -/usr/share/oci-umount/oci-umount.d/cri-umount.conf - - -%preun -%systemd_preun %{Name} - -%postun -%systemd_postun_with_restart %{Name} - -%changelog -* Mon Oct 31 2016 Dan Walsh - 0.0.1 -- Initial RPM release - diff --git a/docs/crio.8.md b/docs/crio.8.md index 4cb332aa..3207c847 100644 --- a/docs/crio.8.md +++ b/docs/crio.8.md @@ -100,6 +100,8 @@ crio [GLOBAL OPTIONS] config [OPTIONS] - **--pids-limit**="": Maximum number of processes allowed in a container (default: 1024) +- **--enable-shared-pid-namespace**="": Enable using a shared PID namespace for containers in a pod (default: false) + - **--root**="": The crio root dir (default: "/var/lib/containers/storage") - **--registry**="": Registry host which will be prepended to unqualified images, can be specified multiple times diff --git a/docs/crio.conf.5.md b/docs/crio.conf.5.md index c2f3f358..708f26e7 100644 --- a/docs/crio.conf.5.md +++ b/docs/crio.conf.5.md @@ -87,6 +87,9 @@ Example: **pids_limit**="" Maximum number of processes allowed in a container (default: 1024) +**enable_shared_pid_namespace**="" + Enable using a shared PID namespace for containers in a pod (default: false) + **runtime**="" OCI runtime path (default: "/usr/bin/runc") diff --git a/libkpod/config.go b/libkpod/config.go index 687b4b38..9007f35d 100644 --- a/libkpod/config.go +++ b/libkpod/config.go @@ -121,6 +121,9 @@ type RuntimeConfig struct { // NoPivot instructs the runtime to not use `pivot_root`, but instead use `MS_MOVE` NoPivot bool `toml:"no_pivot"` + // EnableSharePidNamespace instructs the runtime to enable share pid namespace + EnableSharedPIDNamespace bool `toml:"enable_shared_pid_namespace"` + // Conmon is the path to conmon binary, used for managing the runtime. Conmon string `toml:"conmon"` diff --git a/server/container_create.go b/server/container_create.go index 540ff891..c04bfa69 100644 --- a/server/container_create.go +++ b/server/container_create.go @@ -921,9 +921,15 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string, return nil, err } - // Do not share pid ns for now if containerConfig.GetLinux().GetSecurityContext().GetNamespaceOptions().GetHostPid() { + // kubernetes PodSpec specify to use Host PID namespace specgen.RemoveLinuxNamespace(string(rspec.PIDNamespace)) + } else if s.config.EnableSharedPIDNamespace { + // share Pod PID namespace + pidNsPath := fmt.Sprintf("/proc/%d/ns/pid", podInfraState.Pid) + if err := specgen.AddOrReplaceLinuxNamespace(string(rspec.PIDNamespace), pidNsPath); err != nil { + return nil, err + } } netNsPath := sb.NetNsPath() diff --git a/test/helpers.bash b/test/helpers.bash index 21488e1f..f3b2b087 100644 --- a/test/helpers.bash +++ b/test/helpers.bash @@ -56,6 +56,8 @@ IMAGE_VOLUMES=${IMAGE_VOLUMES:-mkdir} PIDS_LIMIT=${PIDS_LIMIT:-1024} # Log size max limit LOG_SIZE_MAX_LIMIT=${LOG_SIZE_MAX_LIMIT:--1} +# enable share container pid namespace +ENABLE_SHARED_PID_NAMESPACE=${ENABLE_SHARED_PID_NAMESPACE:-false} TESTDIR=$(mktemp -d) @@ -240,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=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 - "$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" --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 if [[ -n "$4" ]]; then diff --git a/test/namespaces.bats b/test/namespaces.bats new file mode 100644 index 00000000..ff9787a9 --- /dev/null +++ b/test/namespaces.bats @@ -0,0 +1,67 @@ +#!/usr/bin/env bats + +load helpers + +function teardown() { + cleanup_test +} + +@test "pod disable shared pid namespace" { + ENABLE_SHARED_PID_NAMESPACE="false" start_crio + + run crictl runs "$TESTDATA"/sandbox_config.json + echo "$output" + [ "$status" -eq 0 ] + pod_id="$output" + run crictl create "$pod_id" "$TESTDATA"/container_redis.json "$TESTDATA"/sandbox_config.json + echo "$output" + [ "$status" -eq 0 ] + ctr_id="$output" + run crictl start "$ctr_id" + [ "$status" -eq 0 ] + + run crictl exec --sync "$ctr_id" cat /proc/1/cmdline + echo "$output" + [ "$status" -eq 0 ] + [[ "$output" =~ "redis" ]] + + run crictl stops "$pod_id" + echo "$output" + [ "$status" -eq 0 ] + run crictl rms "$pod_id" + echo "$output" + [ "$status" -eq 0 ] + cleanup_ctrs + cleanup_pods + stop_crio +} + +@test "pod enable shared pid namespace" { + ENABLE_SHARED_PID_NAMESPACE="true" start_crio + + run crictl runs "$TESTDATA"/sandbox_config.json + echo "$output" + [ "$status" -eq 0 ] + pod_id="$output" + run crictl create "$pod_id" "$TESTDATA"/container_redis.json "$TESTDATA"/sandbox_config.json + echo "$output" + [ "$status" -eq 0 ] + ctr_id="$output" + run crictl start "$ctr_id" + [ "$status" -eq 0 ] + + run crictl exec --sync "$ctr_id" cat /proc/1/cmdline + echo "$output" + [ "$status" -eq 0 ] + [[ "$output" =~ "pause" ]] + + run crictl stops "$pod_id" + echo "$output" + [ "$status" -eq 0 ] + run crictl rms "$pod_id" + echo "$output" + [ "$status" -eq 0 ] + cleanup_ctrs + cleanup_pods + stop_crio +}