diff --git a/docs/man/containerd-config.toml.5.md b/docs/man/containerd-config.toml.5.md index 5d32bbb01..dbc5ca647 100644 --- a/docs/man/containerd-config.toml.5.md +++ b/docs/man/containerd-config.toml.5.md @@ -89,12 +89,6 @@ documentation. - **[plugins.cgroup]** has one option __no_prometheus__ (Default: **false**) - **[plugins.diff]** has one option __default__, a list by default set to **["walking"]** -- **[plugins.linux]** has several options for configuring the runtime, shim, and related options: - - **shim** specifies the shim binary (Default: **"containerd-shim"**), - - **runtime** is the OCI compliant runtime binary (Default: **"runc"**), - - **runtime_root** is the root directory used by the runtime (Default: **""**), - - **no_shim** specifies whether to use a shim or not (Default: **false**), - - **shim_debug** turns on debugging for the shim (Default: **false**) - **[plugins."io.containerd.gc.v1.scheduler"]** has several options that perform advanced tuning for the scheduler: - **pause_threshold** is the maximum amount of time GC should be scheduled (Default: **0.02**), - **deletion_threshold** guarantees GC is scheduled after n number of deletions (Default: **0** [not triggered]), @@ -186,12 +180,6 @@ imports = ["/etc/containerd/runtime_*.toml", "./debug.toml"] no_prometheus = false [plugins.diff] default = ["walking"] - [plugins.linux] - shim = "containerd-shim" - runtime = "runc" - runtime_root = "" - no_shim = false - shim_debug = false [plugins.scheduler] pause_threshold = 0.02 deletion_threshold = 0 diff --git a/docs/ops.md b/docs/ops.md index 66ead5fa2..0af7f3038 100644 --- a/docs/ops.md +++ b/docs/ops.md @@ -102,7 +102,7 @@ containerd itself does not actually have any persistent data that it needs to st │   └── ingest ├── io.containerd.metadata.v1.bolt │   └── meta.db -├── io.containerd.runtime.v1.linux +├── io.containerd.runtime.v2.task │   ├── default │   └── example ├── io.containerd.snapshotter.v1.btrfs @@ -118,7 +118,7 @@ Sockets, pids, runtime state, mount points, and other plugin data that must not /run/containerd ├── containerd.sock ├── debug.sock -├── io.containerd.runtime.v1.linux +├── io.containerd.runtime.v2.task │   └── default │   └── redis │   ├── config.json @@ -198,23 +198,6 @@ You will have to read the plugin specific docs to find the options that your plu See [containerd's Plugin documentation](./PLUGINS.md) -### Linux Runtime Plugin - -The linux runtime allows a few options to be set to configure the shim and the runtime that you are using. - -```toml -[plugins.linux] - # shim binary name/path - shim = "" - # runtime binary name/path - runtime = "runc" - # do not use a shim when starting containers, saves on memory but - # live restore is not supported - no_shim = false - # display shim logs in the containerd daemon's log output - shim_debug = true -``` - ### Bolt Metadata Plugin The bolt metadata plugin allows configuration of the content sharing policy between namespaces.