github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5086 from eramos2/revise-docs

Browse Source 
Fixed wording in docs, and broken link
This commit is contained in:
Mike Brown 2021-02-25 15:32:25 -06:00 committed by GitHub
commit 4379557924
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/PLUGINS.md
View File

@ -21,7 +21,7 @@ External plugins allow extending containerd's functionality using an officially
released version of containerd without needing to recompile the daemon to add a
plugin.
containerd allows extensions through two method:
containerd allows extensions through two methods:
- via a binary available in containerd's PATH
- by configuring containerd to proxy to another gRPC service

4
docs/ops.md
View File

@ -79,7 +79,7 @@ sudo systemd-run -p Delegate=yes -p KillMode=process /usr/local/bin/containerd
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.
There are a few settings that are important for ops.
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.
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.
We also do not want to make containerd unkillable, but we want to lower its score to the level of other system daemons.
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.
In the config file you can specify plugin level options for the set of plugins that you use via the `[plugins.<name>]` sections.
You will have to read the plugin specific docs to find the options that your plugin accepts.
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.