Skip to content

Commit d2cd6ca

Browse files
committed
content: Mention containerd 1.7 supports user namespaces
containerd 1.7 was just released with user namespaces support. Let's mention which kubernetes versions should work with container 1.7. While we are there, let's clarify the CRI-O version and not duplicate the requirements in the concept and task pages and just add a link Signed-off-by: Rodrigo Campos <[email protected]>
1 parent 67c42f6 commit d2cd6ca

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

content/en/docs/concepts/workloads/pods/user-namespaces.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,24 @@ mitigate some future vulnerabilities too.
2929
<!-- body -->
3030
## {{% heading "prerequisites" %}}
3131

32-
{{% thirdparty-content single="true" %}}
33-
<!-- if adding another runtime in the future, omit the single setting -->
32+
{{% thirdparty-content %}}
3433

34+
<!-- When merging this with the dev-1.27 branch conflicts will arise. The text
35+
as it is in the dev-1.27 branch should be used. -->
3536
This is a Linux only feature. In addition, support is needed in the
3637
{{< glossary_tooltip text="container runtime" term_id="container-runtime" >}}
3738
to use this feature with Kubernetes stateless pods:
3839

39-
* CRI-O: v1.25 has support for user namespaces.
40+
* CRI-O: version 1.25 (and later) supports user namespaces for containers.
4041

41-
* containerd: support is planned for the 1.7 release. See containerd
42-
issue [#7063][containerd-userns-issue] for more details.
42+
* containerd: version 1.7 supports user namespaces for containers, compatible
43+
with Kubernetes v1.25 and v1.26, but not with later releases. If you are
44+
running a different version of Kubernetes, check the documentation for that
45+
Kubernetes release.
4346

4447
Support for this in [cri-dockerd is not planned][CRI-dockerd-issue] yet.
4548

4649
[CRI-dockerd-issue]: https://github.com/Mirantis/cri-dockerd/issues/74
47-
[containerd-userns-issue]: https://github.com/containerd/containerd/issues/7063
4850

4951
## Introduction
5052

content/en/docs/tasks/configure-pod-container/user-namespaces.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,13 @@ this is true when user namespaces are used.
4343
* You need to be able to exec into pods
4444
* Feature gate `UserNamespacesStatelessPodsSupport` need to be enabled.
4545

46-
In addition, support is needed in the
47-
{{< glossary_tooltip text="container runtime" term_id="container-runtime" >}}
48-
to use this feature with Kubernetes stateless pods:
46+
The cluster that you're using **must** include at least one node that meets the
47+
[requirements](/docs/concepts/workloads/pods/user-namespaces/#before-you-begin)
48+
for using user namespaces with Pods.
4949

50-
* CRI-O: v1.25 has support for user namespaces.
50+
If you have a mixture of nodes and only some of the nodes provide user namespace support for
51+
Pods, you also need to ensure that the user namespace Pods are
52+
[scheduled](/docs/concepts/scheduling-eviction/assign-pod-node/) to suitable nodes.
5153

5254
Please note that **if your container runtime doesn't support user namespaces, the
5355
new `pod.spec` field will be silently ignored and the pod will be created without

0 commit comments

Comments
 (0)