Unify runtime references (#18493)
- Use the glossary to correctly reference runtimes - Updated runtime class documentation for CRI-O - Removed rktlet from runtimes since its EOL Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
@@ -120,7 +120,7 @@ For more details on setting up CRI runtimes, see [CRI installation](/docs/setup/
|
|||||||
|
|
||||||
Kubernetes built-in dockershim CRI does not support runtime handlers.
|
Kubernetes built-in dockershim CRI does not support runtime handlers.
|
||||||
|
|
||||||
#### [containerd](https://containerd.io/)
|
#### {{< glossary_tooltip term_id="containerd" >}}
|
||||||
|
|
||||||
Runtime handlers are configured through containerd's configuration at
|
Runtime handlers are configured through containerd's configuration at
|
||||||
`/etc/containerd/config.toml`. Valid handlers are configured under the runtimes section:
|
`/etc/containerd/config.toml`. Valid handlers are configured under the runtimes section:
|
||||||
@@ -132,19 +132,20 @@ Runtime handlers are configured through containerd's configuration at
|
|||||||
See containerd's config documentation for more details:
|
See containerd's config documentation for more details:
|
||||||
https://github.com/containerd/cri/blob/master/docs/config.md
|
https://github.com/containerd/cri/blob/master/docs/config.md
|
||||||
|
|
||||||
#### [cri-o](https://cri-o.io/)
|
#### {{< glossary_tooltip term_id="cri-o" >}}
|
||||||
|
|
||||||
Runtime handlers are configured through cri-o's configuration at `/etc/crio/crio.conf`. Valid
|
Runtime handlers are configured through CRI-O's configuration at `/etc/crio/crio.conf`. Valid
|
||||||
handlers are configured under the [crio.runtime
|
handlers are configured under the [crio.runtime
|
||||||
table](https://github.com/kubernetes-sigs/cri-o/blob/master/docs/crio.conf.5.md#crioruntime-table):
|
table](https://github.com/cri-o/cri-o/blob/master/docs/crio.conf.5.md#crioruntime-table):
|
||||||
|
|
||||||
```
|
```
|
||||||
[crio.runtime.runtimes.${HANDLER_NAME}]
|
[crio.runtime.runtimes.${HANDLER_NAME}]
|
||||||
runtime_path = "${PATH_TO_BINARY}"
|
runtime_path = "${PATH_TO_BINARY}"
|
||||||
```
|
```
|
||||||
|
|
||||||
See cri-o's config documentation for more details:
|
See CRI-O's [config documentation][100] for more details.
|
||||||
https://github.com/kubernetes-sigs/cri-o/blob/master/cmd/crio/config.go
|
|
||||||
|
[100]: https://raw.githubusercontent.com/cri-o/cri-o/9f11d1d/docs/crio.conf.5.md
|
||||||
|
|
||||||
### Scheduling
|
### Scheduling
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ tags:
|
|||||||
|
|
||||||
<!--more-->
|
<!--more-->
|
||||||
|
|
||||||
Kubernetes supports several container runtimes: [Docker](http://www.docker.com),
|
Kubernetes supports several container runtimes: {{< glossary_tooltip term_id="docker">}},
|
||||||
[containerd](https://containerd.io), [cri-o](https://cri-o.io/),
|
{{< glossary_tooltip term_id="containerd" >}}, {{< glossary_tooltip term_id="cri-o" >}},
|
||||||
[rktlet](https://github.com/kubernetes-incubator/rktlet) and any implementation of
|
and any implementation of the [Kubernetes CRI (Container Runtime
|
||||||
the [Kubernetes CRI (Container Runtime Interface)](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-node/container-runtime-interface.md).
|
Interface)](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-node/container-runtime-interface.md).
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ If the container runtime of choice is Docker, it is used through the built-in
|
|||||||
|
|
||||||
Other CRI-based runtimes include:
|
Other CRI-based runtimes include:
|
||||||
|
|
||||||
- [containerd](https://github.com/containerd/cri) (CRI plugin built into containerd)
|
- [containerd/cri](https://github.com/containerd/cri) (CRI plugin built into containerd)
|
||||||
- [cri-o](https://cri-o.io/)
|
- [cri-o](https://cri-o.io/)
|
||||||
- [frakti](https://github.com/kubernetes/frakti)
|
- [frakti](https://github.com/kubernetes/frakti)
|
||||||
|
|
||||||
|
|||||||
@@ -62,9 +62,9 @@ Kubespray provides the ability to customize many aspects of the deployment:
|
|||||||
* Component versions
|
* Component versions
|
||||||
* Calico route reflectors
|
* Calico route reflectors
|
||||||
* Component runtime options
|
* Component runtime options
|
||||||
* docker
|
* {{< glossary_tooltip term_id="docker" >}}
|
||||||
* rkt
|
* {{< glossary_tooltip term_id="rkt" >}}
|
||||||
* cri-o
|
* {{< glossary_tooltip term_id="cri-o" >}}
|
||||||
* Certificate generation methods (**Vault being discontinued**)
|
* Certificate generation methods (**Vault being discontinued**)
|
||||||
|
|
||||||
Kubespray customizations can be made to a [variable file](http://docs.ansible.com/ansible/playbooks_variables.html). If you are just getting started with Kubespray, consider using the Kubespray defaults to deploy your cluster and explore Kubernetes.
|
Kubespray customizations can be made to a [variable file](http://docs.ansible.com/ansible/playbooks_variables.html). If you are just getting started with Kubespray, consider using the Kubespray defaults to deploy your cluster and explore Kubernetes.
|
||||||
|
|||||||
Reference in New Issue
Block a user