cri: Expose userns in PodSandboxStatus rpc

rata · rata · commit 6c356a5c7520 · 2024-02-07T17:06:01.000+01:00
We added support for userns but we weren't showing it in the
podSandboxStatus.

Let's just show the whole nsOpts, so we don't forget in the future
either if something else inside there changes.

Please note that this will expose the content of nsOpts.TargetId that we
weren't exposing before. But that seemed like a bug to me.

Signed-off-by: Rodrigo Campos &lt;rodrigoca@microsoft.com&gt;

Maybe this is better?
diff --git a/internal/cri/server/sandbox_status.go b/internal/cri/server/sandbox_status.go
@@ -134,11 +134,7 @@ func toCRISandboxStatus(meta sandboxstore.Metadata, status string, createdAt tim
 		},
 		Linux: &runtime.LinuxPodSandboxStatus{
 			Namespaces: &runtime.Namespace{
-				Options: &runtime.NamespaceOption{
-					Network: nsOpts.GetNetwork(),
-					Pid:     nsOpts.GetPid(),
-					Ipc:     nsOpts.GetIpc(),
-				},
+				Options: nsOpts,
 			},
 		},
 		Labels:         meta.Config.GetLabels(),
