diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 494e358a2c1..b1fe237ca41 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -2466,10 +2466,11 @@ file: test/e2e/common/node/sysctl.go - testname: Sysctl, test sysctls codename: '[sig-node] Sysctls [LinuxOnly] [NodeConformance] should support sysctls - [MinimumKubeletVersion:1.21] [Conformance]' + [MinimumKubeletVersion:1.21] [Environment:NotInUserNS] [Conformance]' description: 'Pod is created with kernel.shm_rmid_forced sysctl. Kernel.shm_rmid_forced must be set to 1 [LinuxOnly]: This test is marked as LinuxOnly since Windows does - not support sysctls' + not support sysctls [Environment:NotInUserNS]: The test fails in UserNS (as expected): + `open /proc/sys/kernel/shm_rmid_forced: permission denied`' release: v1.21 file: test/e2e/common/node/sysctl.go - testname: Environment variables, expansion diff --git a/test/e2e/common/node/sysctl.go b/test/e2e/common/node/sysctl.go index 438590bc4b2..1de5be72722 100644 --- a/test/e2e/common/node/sysctl.go +++ b/test/e2e/common/node/sysctl.go @@ -73,8 +73,9 @@ var _ = SIGDescribe("Sysctls [LinuxOnly] [NodeConformance]", func() { Testname: Sysctl, test sysctls Description: Pod is created with kernel.shm_rmid_forced sysctl. Kernel.shm_rmid_forced must be set to 1 [LinuxOnly]: This test is marked as LinuxOnly since Windows does not support sysctls + [Environment:NotInUserNS]: The test fails in UserNS (as expected): `open /proc/sys/kernel/shm_rmid_forced: permission denied` */ - framework.ConformanceIt("should support sysctls [MinimumKubeletVersion:1.21]", func(ctx context.Context) { + framework.ConformanceIt("should support sysctls [MinimumKubeletVersion:1.21] [Environment:NotInUserNS]", func(ctx context.Context) { pod := testPod() pod.Spec.SecurityContext = &v1.PodSecurityContext{ Sysctls: []v1.Sysctl{ @@ -182,8 +183,9 @@ var _ = SIGDescribe("Sysctls [LinuxOnly] [NodeConformance]", func() { Testname: Sysctl, test sysctls supports slashes Description: Pod is created with kernel/shm_rmid_forced sysctl. Support slashes as sysctl separator. The '/' separator is also accepted in place of a '.' [LinuxOnly]: This test is marked as LinuxOnly since Windows does not support sysctls + [Environment:NotInUserNS]: The test fails in UserNS (as expected): `open /proc/sys/kernel/shm_rmid_forced: permission denied` */ - ginkgo.It("should support sysctls with slashes as separator [MinimumKubeletVersion:1.23]", func(ctx context.Context) { + ginkgo.It("should support sysctls with slashes as separator [MinimumKubeletVersion:1.23] [Environment:NotInUserNS]", func(ctx context.Context) { pod := testPod() pod.Spec.SecurityContext = &v1.PodSecurityContext{ Sysctls: []v1.Sysctl{