mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 17:30:00 +00:00
Revert to using isolated PID namespaces in Docker
A shared PID namespace were enabled by default in the 1.7 when running with a supported Docker runtime, but a Docker version that supports a shared namespace was not qualified for use. Release 1.8 will qualify a docker version supporting shared PID, but we don't want to cause disruption for container images which expect always to have PID 1.
This commit is contained in:
parent
721923924d
commit
145c343273
@ -108,6 +108,7 @@ func NewContainerRuntimeOptions() *ContainerRuntimeOptions {
|
|||||||
DockerEndpoint: dockerEndpoint,
|
DockerEndpoint: dockerEndpoint,
|
||||||
DockershimRootDirectory: "/var/lib/dockershim",
|
DockershimRootDirectory: "/var/lib/dockershim",
|
||||||
DockerExecHandlerName: "native",
|
DockerExecHandlerName: "native",
|
||||||
|
DockerDisableSharedPID: true,
|
||||||
PodSandboxImage: defaultPodSandboxImage,
|
PodSandboxImage: defaultPodSandboxImage,
|
||||||
ImagePullProgressDeadline: metav1.Duration{Duration: 1 * time.Minute},
|
ImagePullProgressDeadline: metav1.Duration{Duration: 1 * time.Minute},
|
||||||
RktAPIEndpoint: defaultRktAPIServiceEndpoint,
|
RktAPIEndpoint: defaultRktAPIServiceEndpoint,
|
||||||
|
Loading…
Reference in New Issue
Block a user