Merge pull request #256 from samuelkarp/api-namespaces-strip

adaptation: ensure namespace adjustment is tested

Author: mikebrow

pkg/adaptation/adaptation_suite_test.go

@@ -34,11 +34,12 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	rspec "github.com/opencontainers/runtime-spec/specs-go"
+
 	nri "github.com/containerd/nri/pkg/adaptation"
 	"github.com/containerd/nri/pkg/api"
 	"github.com/containerd/nri/pkg/plugin"
 	validator "github.com/containerd/nri/plugins/default-validator/builtin"
-	rspec "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 var _ = Describe("Configuration", func() {
@@ -508,6 +509,7 @@ var _ = Describe("Plugin container creation adjustments", func() {
 		case "namespace":
 			ns := &api.LinuxNamespace{
 				Type: "cgroup",
+				Path: "/var/run/cgroupns/replaced",
 			}
 			a.AddOrReplaceNamespace(ns)
 
@@ -678,6 +680,12 @@ var _ = Describe("Plugin container creation adjustments", func() {
 									UseHierarchy:     api.Bool(false),
 								},
 							},
+							Namespaces: []*api.LinuxNamespace{
+								{
+									Type: "cgroup",
+									Path: "/var/run/cgroupns/original",
+								},
+							},
 						},
 					}
 				)
@@ -779,6 +787,7 @@ var _ = Describe("Plugin container creation adjustments", func() {
 						Namespaces: []*api.LinuxNamespace{
 							{
 								Type: "cgroup",
+								Path: "/var/run/cgroupns/replaced",
 							},
 						},
 					},

pkg/api/strip.go

@@ -116,6 +116,12 @@ func (l *LinuxContainerAdjustment) Strip() *LinuxContainerAdjustment {
 		empty = false
 	}
 
+	if len(l.Namespaces) == 0 {
+		l.Namespaces = nil
+	} else {
+		empty = false
+	}
+
 	if empty {
 		return nil
 	}