Skip to content

Commit 4379557

Browse files
authored
Merge pull request #5086 from eramos2/revise-docs
Fixed wording in docs, and broken link
2 parents 8dbe53a + 224efa9 commit 4379557

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

docs/PLUGINS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ External plugins allow extending containerd's functionality using an officially
2121
released version of containerd without needing to recompile the daemon to add a
2222
plugin.
2323

24-
containerd allows extensions through two method:
24+
containerd allows extensions through two methods:
2525
- via a binary available in containerd's PATH
2626
- by configuring containerd to proxy to another gRPC service
2727

docs/ops.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ sudo systemd-run -p Delegate=yes -p KillMode=process /usr/local/bin/containerd
7979
In the containerd config file you will find settings for persistent and runtime storage locations as well as grpc, debug, and metrics addresses for the various APIs.
8080

8181
There are a few settings that are important for ops.
82-
The first setting is the `oom_score`. Because containerd will be managing multiple containers, we need to ensure that containers are killed before the containerd daemon in an out of memory condition.
82+
The first setting is the `oom_score`. Because containerd will be managing multiple containers, we need to ensure that containers are killed before the containerd daemon gets into an out of memory condition.
8383
We also do not want to make containerd unkillable, but we want to lower its score to the level of other system daemons.
8484

8585
containerd also exports its own metrics as well as container level metrics via the prometheus metrics format.
@@ -196,6 +196,8 @@ The only way we can do this is via the config file and not CLI flags.
196196
In the config file you can specify plugin level options for the set of plugins that you use via the `[plugins.<name>]` sections.
197197
You will have to read the plugin specific docs to find the options that your plugin accepts.
198198

199+
See [containerd's Plugin documentation](./PLUGINS.md)
200+
199201
### Linux Runtime Plugin
200202

201203
The linux runtime allows a few options to be set to configure the shim and the runtime that you are using.

0 commit comments

Comments
 (0)