Skip to content

Commit 84cebaf

Browse files
committed
docs: remove deprecated io.containerd.runtime.v1.linux
Signed-off-by: Akihiro Suda <[email protected]>
1 parent e079e4a commit 84cebaf

2 files changed

Lines changed: 2 additions & 31 deletions

File tree

docs/man/containerd-config.toml.5.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@ documentation.
8989

9090
- **[plugins.cgroup]** has one option __no_prometheus__ (Default: **false**)
9191
- **[plugins.diff]** has one option __default__, a list by default set to **["walking"]**
92-
- **[plugins.linux]** has several options for configuring the runtime, shim, and related options:
93-
- **shim** specifies the shim binary (Default: **"containerd-shim"**),
94-
- **runtime** is the OCI compliant runtime binary (Default: **"runc"**),
95-
- **runtime_root** is the root directory used by the runtime (Default: **""**),
96-
- **no_shim** specifies whether to use a shim or not (Default: **false**),
97-
- **shim_debug** turns on debugging for the shim (Default: **false**)
9892
- **[plugins."io.containerd.gc.v1.scheduler"]** has several options that perform advanced tuning for the scheduler:
9993
- **pause_threshold** is the maximum amount of time GC should be scheduled (Default: **0.02**),
10094
- **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"]
186180
no_prometheus = false
187181
[plugins.diff]
188182
default = ["walking"]
189-
[plugins.linux]
190-
shim = "containerd-shim"
191-
runtime = "runc"
192-
runtime_root = ""
193-
no_shim = false
194-
shim_debug = false
195183
[plugins.scheduler]
196184
pause_threshold = 0.02
197185
deletion_threshold = 0

docs/ops.md

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ containerd itself does not actually have any persistent data that it needs to st
102102
│   └── ingest
103103
├── io.containerd.metadata.v1.bolt
104104
│   └── meta.db
105-
├── io.containerd.runtime.v1.linux
105+
├── io.containerd.runtime.v2.task
106106
│   ├── default
107107
│   └── example
108108
├── io.containerd.snapshotter.v1.btrfs
@@ -118,7 +118,7 @@ Sockets, pids, runtime state, mount points, and other plugin data that must not
118118
/run/containerd
119119
├── containerd.sock
120120
├── debug.sock
121-
├── io.containerd.runtime.v1.linux
121+
├── io.containerd.runtime.v2.task
122122
│   └── default
123123
│   └── redis
124124
│   ├── config.json
@@ -198,23 +198,6 @@ You will have to read the plugin specific docs to find the options that your plu
198198

199199
See [containerd's Plugin documentation](./PLUGINS.md)
200200

201-
### Linux Runtime Plugin
202-
203-
The linux runtime allows a few options to be set to configure the shim and the runtime that you are using.
204-
205-
```toml
206-
[plugins.linux]
207-
# shim binary name/path
208-
shim = ""
209-
# runtime binary name/path
210-
runtime = "runc"
211-
# do not use a shim when starting containers, saves on memory but
212-
# live restore is not supported
213-
no_shim = false
214-
# display shim logs in the containerd daemon's log output
215-
shim_debug = true
216-
```
217-
218201
### Bolt Metadata Plugin
219202

220203
The bolt metadata plugin allows configuration of the content sharing policy between namespaces.

0 commit comments

Comments
 (0)