Skip to content

Commit 3ed072d

Browse files
committed
KEP-3117: address comments
Signed-off-by: Giuseppe Scrivano <[email protected]>
1 parent f21f699 commit 3ed072d

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

keps/sig-node/3317-user-namespaces/README.md

+12-5
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ By default it is set to `true`.
211211
The following messages will be added:
212212

213213
```
214-
// A IDMapping describes a ID mapping for the user namespace used for the
214+
// IDMapping describes host to container ID mappings for a pod sandbox.
215215
// pod.
216216
message IDMapping {
217217
// host_id is the id on the host.
@@ -222,10 +222,9 @@ message IDMapping {
222222
uint32 length = 3;
223223
}
224224
225-
// A UserNamespace describes the intended user namespace configuration.
225+
// UserNamespace describes the intended user namespace configuration for a sandbox.
226226
message UserNamespace {
227-
// User namespace for this sandbox.
228-
// Note: It currently supports only POD and NODE.
227+
// NamespaceMode: `POD` or `NODE`
229228
NamespaceMode mode = 1;
230229
231230
// uids specifies the UID mappings for the user namespace.
@@ -260,7 +259,11 @@ message NamespaceOption {
260259
// for each namespace.
261260
string target_id = 4;
262261
// User namespace for this sandbox.
263-
UserNamespace user = 5;
262+
// The Kubelet picks the user namespace configuration to use for the sandbox. The mappings
263+
// are specified as part of the UserNamespace struct. If the struct is nil, then the POD mode
264+
// must be assumed. This is done for backward compatibility with older Kubelet versions that
265+
// do not set a user namespace.
266+
UserNamespace user = 5;
264267
}
265268
266269
```
@@ -525,6 +528,10 @@ To test with userns enabled, we need to patch container runtimes. We can either
525528
try to use a patched version or make the alpha longer and add e2e when we can
526529
use container runtime versions that have the needed changes.
527530

531+
#### critests
532+
533+
- For Alpha, the feature is tested for containerd and CRI-O in cri-tools repo using critest to
534+
make sure the specified user namespace configuration is honored.
528535

529536
- <test>: <link to test coverage>
530537

0 commit comments

Comments
 (0)