Support rootless containerd worker #2660
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AkihiroSuda
reviewed
Feb 21, 2022
| // These compression types aren't supported by containerd differ. So try to compute diff on buildkit side. | ||
| // This case can be happen on containerd worker + non-overlayfs snapshotter (e.g. native). | ||
| // See also: https://github.com/containerd/containerd/issues/4263 | ||
| desc, err = walking.NewWalkingDiff(sr.cm.ContentStore).Compare(ctx, lower, upper, |
There was a problem hiding this comment.
Maybe this should be in a separate commit
AkihiroSuda
reviewed
Feb 21, 2022
docs/rootless.md
Outdated
| Run containerd in rootless mode using rootlesskit following [containerd's document](https://github.com/containerd/containerd/blob/main/docs/rootless.md). | ||
|
|
||
| ``` | ||
| $ rootlesskit --copy-up=/run --state-dir=/path/to/rootlesskit-state-dir containerd -c config.toml |
There was a problem hiding this comment.
This is a "hard way".
I'd recommend using containerd-rootless.sh
AkihiroSuda
reviewed
Feb 21, 2022
docs/rootless.md
Outdated
| ``` | ||
| $ nsenter -U --preserve-credentials -m -t $(cat /path/to/rootlesskit-state-dir/child_pid) \ | ||
| buildkitd --oci-worker=false --containerd-worker=true --containerd-worker-snapshotter=native \ | ||
| --containerd-worker-addr=/run/user/1001/containerd/containerd.sock |
There was a problem hiding this comment.
containerd-rootless-setuptool.sh nsenter -- buildkitd ... is easier.
AkihiroSuda
reviewed
Feb 21, 2022
docs/rootless.md
Outdated
| @@ -65,6 +92,8 @@ See https://rootlesscontaine.rs/getting-started/common/subuid/ | |||
|
|
|||
| ## Containerized deployment | |||
|
|
|||
| * Only supported by OCI worker | |||
AkihiroSuda
reviewed
Feb 21, 2022
| if cfg.Rootless { | ||
| logrus.Debugf("running in rootless mode") | ||
| if common.config.Workers.Containerd.NetworkConfig.Mode == "auto" { | ||
| common.config.Workers.Containerd.NetworkConfig.Mode = "host" |
There was a problem hiding this comment.
You can use CNI when you have CAP_NET_ADMIN in the current namespace, e.g., when RootlessKit is running with slirp4netns/VPNkit/lxc-user-nic/whatever.
There was a problem hiding this comment.
(OCI worker should be updated to support CNI too, so it can be a separate commit/PR)
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
…napshotter Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
ktock
force-pushed
the
rootless-containerd-worker
branch
from
44e64e3
to
393bc5b
Compare
tonistiigi
approved these changes
Feb 22, 2022
| @@ -99,6 +99,8 @@ type ContainerdConfig struct { | |||
| ApparmorProfile string `toml:"apparmor-profile"` | |||
|
|
|||
| MaxParallelism int `toml:"max-parallelism"` | |||
|
|
|||
| Rootless bool `toml:"rootless"` | |||
There was a problem hiding this comment.
Shouldn't containerd expose if it is running in rootless mode?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1325
This commit adds support for rootless containerd worker.
This also enables integration tests for rootless containerd worker configuration.
Example configuration
Rootless containerd can run using rootlesskit following containerd's document.
Example
config.toml:Then buildkitd can join the same namespace as containerd.