Skip to content

Commit 15d839e

Browse files
committed
kubernetes: Simplify and freshen the required-files table
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 983aec6 (doc: Add instruction to run cri-o with kubernetes, 2017-01-31, cri-o#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 9088a12 (contrib: cni: provide example CNI configurations, 2016-12-24, cri-o#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]: https://github.com/containers/image/blob/3d0304a02154dddc8f97cc833aa0861cea5e9ade/docs/policy.json.md Signed-off-by: W. Trevor King <[email protected]>
1 parent bf8a99c commit 15d839e

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

kubernetes.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@ Below, you can find an instruction how to switch one or more nodes on running ku
1313

1414
### Preparing crio
1515

16-
You must prepare and install `crio` on each node you would like to switch. Here's the list of files that must be provided:
17-
18-
| File path | Description | Location |
19-
|--------------------------------------------|----------------------------|-----------------------------------------------------|
20-
| `/etc/crio/crio.conf` | crio configuration | Generated on cri-o `make install` |
21-
| `/etc/crio/seccomp.conf` | seccomp config | Example stored in cri-o repository |
22-
| `/etc/containers/policy.json` | containers policy | Example stored in cri-o repository |
23-
| `/bin/{crio, runc}` | `crio` and `runc` binaries | Built from cri-o repository |
24-
| `/usr/local/libexec/crio/conmon` | `conmon` binary | Built from cri-o repository |
25-
| `/opt/cni/bin/{flannel, bridge,...}` | CNI plugins binaries | Can be built from sources `containernetworking/cni` |
26-
| `/etc/cni/net.d/10-mynet.conf` | Network config | Example stored in [README file](README.md) |
16+
You must prepare and install `crio` on each node you would like to switch.
17+
Besides the files installed by `make install install.config`, here's the list of files that must be provided:
18+
19+
| File path | Description | Location |
20+
|--------------------------------------------|-----------------------------|---------------------------------------------------------|
21+
| `/etc/containers/policy.json` | containers policy | [Example](test/policy.json) stored in cri-o repository |
22+
| `/bin/runc` | `runc` or other OCI runtime | Can be build from sources `opencontainers/runc` |
23+
| `/opt/cni/bin/{flannel, bridge,...}` | CNI plugins binaries | Can be built from sources `containernetworking/plugins` |
24+
| `/etc/cni/net.d/...` | CNI network config | Example [here](contrib/cni) |
2725

2826
`crio` binary can be executed directly on host, inside the container or in any way.
2927
However, recommended way is to set it as a systemd service.

0 commit comments

Comments
 (0)