Skip to content

Commit c75f6d4

Browse files
authored
Merge pull request containerd#10323 from siretart/debian/bug.1044768
Allow running test in usernamespace
2 parents a60edaf + 09d3e20 commit c75f6d4

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

internal/cri/server/podsandbox/sandbox_run_linux_test.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"github.com/containerd/containerd/v2/internal/cri/annotations"
3434
"github.com/containerd/containerd/v2/internal/cri/opts"
3535
ostesting "github.com/containerd/containerd/v2/pkg/os/testing"
36+
"github.com/containerd/containerd/v2/pkg/userns"
3637
)
3738

3839
func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) {
@@ -142,7 +143,10 @@ func TestLinuxSandboxContainerSpec(t *testing.T) {
142143
Type: runtimespec.IPCNamespace,
143144
})
144145
assert.Contains(t, spec.Linux.Sysctl["net.ipv4.ip_unprivileged_port_start"], "0")
145-
assert.Contains(t, spec.Linux.Sysctl["net.ipv4.ping_group_range"], "0 2147483647")
146+
if !userns.RunningInUserNS() {
147+
assert.Contains(t, spec.Linux.Sysctl["net.ipv4.ping_group_range"], "0 2147483647")
148+
}
149+
146150
},
147151
},
148152
{

0 commit comments

Comments
 (0)