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

Merge pull request #1263 from wking/doc-stale-make-output

Browse source 
kubernetes: Simplify and freshen the required-files table
This commit is contained in:
Antonio Murdaca 2018-01-18 23:54:15 +01:00 committed by GitHub
commit cbfdda868a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 31 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.

22
tutorial.md
View file

@ -138,32 +138,12 @@ make
sudo make install sudo make install
``` ```
Output: If you are installing for the first time, generate and install configuration files with:
```
install -D -m 755 crio /usr/local/bin/crio
install -D -m 755 conmon/conmon /usr/local/libexec/crio/conmon
install -D -m 755 pause/pause /usr/local/libexec/crio/pause
install -d -m 755 /usr/local/share/man/man{1,5,8}
install -m 644 docs/crio.conf.5 -t /usr/local/share/man/man5
install -m 644 docs/crio.8 -t /usr/local/share/man/man8
install -D -m 644 crio.conf /etc/crio/crio.conf
install -D -m 644 seccomp.json /etc/crio/seccomp.json
```
If you are installing for the first time, generate config as follows:
``` ```
sudo make install.config sudo make install.config
``` ```
Output:
```
install -D -m 644 crio.conf /etc/crio/crio.conf
install -D -m 644 seccomp.json /etc/crio/seccomp.json
```
#### Start the crio system daemon #### Start the crio system daemon
``` ```