Skip to content

Commit 4776608

Browse files
authored
Merge pull request #26088 from saschagrunert/cri-o-docs
Update CRI-O docs to the latest configuration
2 parents 73215ba + ff9bcd4 commit 4776608

File tree

1 file changed

+25
-10
lines changed

1 file changed

+25
-10
lines changed

content/en/docs/setup/production-environment/container-runtimes.md

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,12 @@ Use the following commands to install CRI-O on your system:
268268

269269
{{< note >}}
270270
The CRI-O major and minor versions must match the Kubernetes major and minor versions.
271-
For more information, see the [CRI-O compatibility matrix](https://github.com/cri-o/cri-o).
271+
For more information, see the [CRI-O compatibility matrix](https://github.com/cri-o/cri-o#compatibility-matrix-cri-o--kubernetes).
272272
{{< /note >}}
273273

274274
Install and configure prerequisites:
275275

276276
```shell
277-
278277
# Create the .conf file to load the modules at bootup
279278
cat <<EOF | sudo tee /etc/modules-load.d/crio.conf
280279
overlay
@@ -307,9 +306,9 @@ to the appropriate value from the following table:
307306

308307
<br />
309308
Then, set `$VERSION` to the CRI-O version that matches your Kubernetes version.
310-
For instance, if you want to install CRI-O 1.18, set `VERSION=1.18`.
309+
For instance, if you want to install CRI-O 1.20, set `VERSION=1.20`.
311310
You can pin your installation to a specific release.
312-
To install version 1.18.3, set `VERSION=1.18:1.18.3`.
311+
To install version 1.20.0, set `VERSION=1.20:1.20.0`.
313312
<br />
314313

315314
Then run
@@ -343,9 +342,9 @@ To install on the following operating systems, set the environment variable `OS`
343342

344343
<br />
345344
Then, set `$VERSION` to the CRI-O version that matches your Kubernetes version.
346-
For instance, if you want to install CRI-O 1.18, set `VERSION=1.18`.
345+
For instance, if you want to install CRI-O 1.20, set `VERSION=1.20`.
347346
You can pin your installation to a specific release.
348-
To install version 1.18.3, set `VERSION=1.18:1.18.3`.
347+
To install version 1.20.0, set `VERSION=1.20:1.20.0`.
349348
<br />
350349

351350
Then run
@@ -377,9 +376,9 @@ To install on the following operating systems, set the environment variable `OS`
377376

378377
<br />
379378
Then, set `$VERSION` to the CRI-O version that matches your Kubernetes version.
380-
For instance, if you want to install CRI-O 1.18, set `VERSION=1.18`.
379+
For instance, if you want to install CRI-O 1.20, set `VERSION=1.20`.
381380
You can pin your installation to a specific release.
382-
To install version 1.18.3, set `VERSION=1.18:1.18.3`.
381+
To install version 1.20.0, set `VERSION=1.20:1.20.0`.
383382
<br />
384383

385384
Then run
@@ -400,7 +399,7 @@ sudo zypper install cri-o
400399
{{% tab name="Fedora" %}}
401400

402401
Set `$VERSION` to the CRI-O version that matches your Kubernetes version.
403-
For instance, if you want to install CRI-O 1.18, `VERSION=1.18`.
402+
For instance, if you want to install CRI-O 1.20, `VERSION=1.20`.
404403

405404
You can find available versions with:
406405
```shell
@@ -424,10 +423,26 @@ sudo systemctl daemon-reload
424423
sudo systemctl start crio
425424
```
426425

427-
Refer to the [CRI-O installation guide](https://github.com/kubernetes-sigs/cri-o#getting-started)
426+
Refer to the [CRI-O installation guide](https://github.com/cri-o/cri-o/blob/master/install.md)
428427
for more information.
429428

430429

430+
#### cgroup driver
431+
432+
CRI-O uses the systemd cgroup driver per default. To switch to the `cgroupfs`
433+
cgroup driver, either edit `/etc/crio/crio.conf` or place a drop-in
434+
configuration in `/etc/crio/crio.conf.d/02-cgroup-manager.conf`, for example:
435+
436+
```toml
437+
[crio.runtime]
438+
conmon_cgroup = "pod"
439+
cgroup_manager = "cgroupfs"
440+
```
441+
442+
Please also note the changed `conmon_cgroup`, which has to be set to the value
443+
`pod` when using CRI-O with `cgroupfs`. It is generally necessary to keep the
444+
cgroup driver configuration of the kubelet (usually done via kubeadm) and CRI-O
445+
in sync.
431446

432447
### Docker
433448

0 commit comments

Comments
 (0)