cri/server: Add userns tests in PodSandboxStatus

The cherry-pick has been amended to duplicate the tests in cri/sbserver and cri/server. Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com> (cherry picked from commit 06ed897)
containerd · Feb 28, 2024 · b57dc9f · b57dc9f
1 parent 6e809ef
commit b57dc9f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/pkg/cri/sbserver/sandbox_status_test.go b/pkg/cri/sbserver/sandbox_status_test.go
@@ -31,6 +31,14 @@ func TestPodSandboxStatus(t *testing.T) {
 		id = "test-id"
 		ip = "10.10.10.10"
 	)
+	idmap := []*runtime.IDMapping{
+		{
+			ContainerId: 0,
+			HostId:      100,
+			Length:      1,
+		},
+	}
+
 	additionalIPs := []string{"8.8.8.8", "2001:db8:85a3::8a2e:370:7334"}
 	createdAt := time.Now()
 	config := &runtime.PodSandboxConfig{
@@ -46,6 +54,11 @@ func TestPodSandboxStatus(t *testing.T) {
 					Network: runtime.NamespaceMode_NODE,
 					Pid:     runtime.NamespaceMode_CONTAINER,
 					Ipc:     runtime.NamespaceMode_POD,
+					UsernsOptions: &runtime.UserNamespace{
+						Uids: idmap,
+						Gids: idmap,
+						Mode: runtime.NamespaceMode_POD,
+					},
 				},
 			},
 		},
@@ -80,6 +93,11 @@ func TestPodSandboxStatus(t *testing.T) {
 					Network: runtime.NamespaceMode_NODE,
 					Pid:     runtime.NamespaceMode_CONTAINER,
 					Ipc:     runtime.NamespaceMode_POD,
+					UsernsOptions: &runtime.UserNamespace{
+						Uids: idmap,
+						Gids: idmap,
+						Mode: runtime.NamespaceMode_POD,
+					},
 				},
 			},
 		},

diff --git a/pkg/cri/server/sandbox_status_test.go b/pkg/cri/server/sandbox_status_test.go
@@ -31,6 +31,13 @@ func TestPodSandboxStatus(t *testing.T) {
 		id = "test-id"
 		ip = "10.10.10.10"
 	)
+	idmap := []*runtime.IDMapping{
+		{
+			ContainerId: 0,
+			HostId:      100,
+			Length:      1,
+		},
+	}
 	additionalIPs := []string{"8.8.8.8", "2001:db8:85a3::8a2e:370:7334"}
 	createdAt := time.Now()
 	config := &runtime.PodSandboxConfig{
@@ -46,6 +53,11 @@ func TestPodSandboxStatus(t *testing.T) {
 					Network: runtime.NamespaceMode_NODE,
 					Pid:     runtime.NamespaceMode_CONTAINER,
 					Ipc:     runtime.NamespaceMode_POD,
+					UsernsOptions: &runtime.UserNamespace{
+						Uids: idmap,
+						Gids: idmap,
+						Mode: runtime.NamespaceMode_POD,
+					},
 				},
 			},
 		},
@@ -80,6 +92,11 @@ func TestPodSandboxStatus(t *testing.T) {
 					Network: runtime.NamespaceMode_NODE,
 					Pid:     runtime.NamespaceMode_CONTAINER,
 					Ipc:     runtime.NamespaceMode_POD,
+					UsernsOptions: &runtime.UserNamespace{
+						Uids: idmap,
+						Gids: idmap,
+						Mode: runtime.NamespaceMode_POD,
+					},
 				},
 			},
 		},