Merge pull request #17722 from sjenning/pick-51634

[3.7] UPSTREAM: 51634: Revert to using isolated PID namespaces in Docker
openshift · Jan 2, 2018 · aa3cca9 · aa3cca9
2 parents bfd1f00 + 5b7bc10
commit aa3cca9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/pkg/cmd/server/kubernetes/node/node_config_test.go b/pkg/cmd/server/kubernetes/node/node_config_test.go
@@ -31,6 +31,7 @@ func TestKubeletDefaults(t *testing.T) {
 			ContainerRuntimeOptions: kubeletoptions.ContainerRuntimeOptions{
 				DockershimRootDirectory:   "/var/lib/dockershim",
 				DockerExecHandlerName:     "native",
+				DockerDisableSharedPID:    true,
 				DockerEndpoint:            "unix:///var/run/docker.sock",
 				ImagePullProgressDeadline: metav1.Duration{Duration: 1 * time.Minute},
 				RktAPIEndpoint:            rkt.DefaultRktAPIServiceEndpoint,

diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/container_runtime.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/container_runtime.go