vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

kubernetes: Simplify and freshen the required-files table

Browse source 
The cri-o entries are stale vs. the content currently installed by the
Makefile.  This commit drops them and just references the make call
before starting the table, which lets us stay DRY.

runc is not built from the cri-o repository.  The docs have claimed it
was since 983aec63 (doc: Add instruction to run cri-o with kubernetes,
2017-01-31, #353), but it's independent like the CNI plugins.

The CNI plugins were moved to containernetworking/plugins in
containernetworking/cni@bc0d09e (plugins: moved to
containernetworking/plugins, 2017-05-17, containernetworking/cni#457).

I've added a link to the in-repo policy.json example.  We probably
also want to link to the docs (for the version we vendor?) [1], but
I've left that alone for now.

The CNI config examples were removed from the project README in
9088a12c (contrib: cni: provide example CNI configurations,
2016-12-24, #295).  I've adjusted the reference to point to the new
location, although again, I'd rather replace this with links to
upstream docs.

[1]: 3d0304a021/docs/policy.json.md

Signed-off-by: W. Trevor King <wking@tremily.us>
This commit is contained in:
W. Trevor King 2018-01-18 12:56:45 -08:00
parent bf8a99c085
commit 15d839ea0d
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kubernetes.md
View file

@ -13,17 +13,15 @@ Below, you can find an instruction how to switch one or more nodes on running ku
### Preparing crio ### Preparing crio
You must prepare and install `crio` on each node you would like to switch. Here's the list of files that must be provided: You must prepare and install `crio` on each node you would like to switch.
Besides the files installed by `make install install.config`, here's the list of files that must be provided:
| File path | Description | Location | | File path | Description | Location |
|--------------------------------------------|----------------------------|-----------------------------------------------------| |--------------------------------------------|-----------------------------|---------------------------------------------------------|
| `/etc/crio/crio.conf` | crio configuration | Generated on cri-o `make install` | | `/etc/containers/policy.json` | containers policy | [Example](test/policy.json) stored in cri-o repository |
| `/etc/crio/seccomp.conf` | seccomp config | Example stored in cri-o repository | | `/bin/runc` | `runc` or other OCI runtime | Can be build from sources `opencontainers/runc` |
| `/etc/containers/policy.json` | containers policy | Example stored in cri-o repository | | `/opt/cni/bin/{flannel, bridge,...}` | CNI plugins binaries | Can be built from sources `containernetworking/plugins` |
| `/bin/{crio, runc}` | `crio` and `runc` binaries | Built from cri-o repository | | `/etc/cni/net.d/...` | CNI network config | Example [here](contrib/cni) |
| `/usr/local/libexec/crio/conmon` | `conmon` binary | Built from cri-o repository |
| `/opt/cni/bin/{flannel, bridge,...}` | CNI plugins binaries | Can be built from sources `containernetworking/cni` |
| `/etc/cni/net.d/10-mynet.conf` | Network config | Example stored in [README file](README.md) |
`crio` binary can be executed directly on host, inside the container or in any way. `crio` binary can be executed directly on host, inside the container or in any way.
However, recommended way is to set it as a systemd service. However, recommended way is to set it as a systemd service.