Skip to content

Commit 6c356a5

Browse files
committed
cri: Expose userns in PodSandboxStatus rpc
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 <[email protected]> Maybe this is better?
1 parent ff464f3 commit 6c356a5

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

internal/cri/server/sandbox_status.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,7 @@ func toCRISandboxStatus(meta sandboxstore.Metadata, status string, createdAt tim
134134
},
135135
Linux: &runtime.LinuxPodSandboxStatus{
136136
Namespaces: &runtime.Namespace{
137-
Options: &runtime.NamespaceOption{
138-
Network: nsOpts.GetNetwork(),
139-
Pid: nsOpts.GetPid(),
140-
Ipc: nsOpts.GetIpc(),
141-
},
137+
Options: nsOpts,
142138
},
143139
},
144140
Labels: meta.Config.GetLabels(),

0 commit comments

Comments
 (0)