From f570a2cd409220e4433dc91ccbebacc1d66bb5a5 Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Thu, 25 Jun 2020 16:46:06 -0700 Subject: [PATCH 1/2] shimv2 : Remove workaround for sharedPidNs Removing code that existed as a workaround for a bug in how shared process namespaces were handled in the agent. That has been long fixed in the agent. With this, sharedPidNs will now work with shimv2. Fixes #337 Signed-off-by: Archana Shinde --- src/runtime/containerd-shim-v2/create.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/runtime/containerd-shim-v2/create.go b/src/runtime/containerd-shim-v2/create.go index e981039f93..8ef1f3996e 100644 --- a/src/runtime/containerd-shim-v2/create.go +++ b/src/runtime/containerd-shim-v2/create.go @@ -132,14 +132,6 @@ func loadSpec(r *taskAPI.CreateTaskRequest) (*specs.Spec, string, error) { return nil, "", err } - // Todo: - // Since there is a bug in kata for sharedPidNs, here to - // remove the pidns to disable the sharePidNs temporarily, - // once kata fixed this issue, we can remove this line. - // For the bug, please see: - // https://github.com/kata-containers/kata-containers/src/runtime/issues/930 - removeNamespace(&ociSpec, specs.PIDNamespace) - return &ociSpec, bundlePath, nil } From b68d4e45ee80c9be78af368791c8ba79890fac67 Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Thu, 25 Jun 2020 16:48:07 -0700 Subject: [PATCH 2/2] shimv2: Removing function as no longer used Function removeNamespace is no longer used. Get rid of it. Signed-off-by: Archana Shinde --- src/runtime/containerd-shim-v2/utils.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/runtime/containerd-shim-v2/utils.go b/src/runtime/containerd-shim-v2/utils.go index 322c7688c4..6f4554f741 100644 --- a/src/runtime/containerd-shim-v2/utils.go +++ b/src/runtime/containerd-shim-v2/utils.go @@ -19,7 +19,6 @@ import ( vc "github.com/kata-containers/kata-containers/src/runtime/virtcontainers" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/compatoci" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/oci" - "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) @@ -124,12 +123,3 @@ func noNeedForOutput(detach bool, tty bool) bool { return true } - -func removeNamespace(s *specs.Spec, nsType specs.LinuxNamespaceType) { - for i, n := range s.Linux.Namespaces { - if n.Type == nsType { - s.Linux.Namespaces = append(s.Linux.Namespaces[:i], s.Linux.Namespaces[i+1:]...) - return - } - } -}