Skip to content

Commit

Permalink
Add containerd and CRI-O to glossary (kubernetes#14309)
Browse files Browse the repository at this point in the history
  • Loading branch information
sftim authored and Rajakavitha1 committed May 21, 2019
1 parent 6870c1f commit ad76ca0
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 0 deletions.
19 changes: 19 additions & 0 deletions content/en/docs/reference/glossary/containerd.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
title: containerd
id: containerd
date: 2019-05-14
full_link: https://containerd.io/docs/
short_description: >
A container runtime with an emphasis on simplicity, robustness and portability
aka:
tags:
- tool
---
A container runtime with an emphasis on simplicity, robustness and portability

<!--more-->

containerd is a {{< glossary_tooltip text="container" term_id="container" >}} runtime
that runs as a daemon on Linux or Windows. containerd takes care of fetching and
storing container images, executing containers, providing network access, and more.
24 changes: 24 additions & 0 deletions content/en/docs/reference/glossary/cri-o.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
title: CRI-O
id: cri-o
date: 2019-05-14
full_link: https://cri-o.io/docs/
short_description: >
A lightweight container runtime specifically for Kubernetes
aka:
tags:
- tool
---
A tool that lets you use OCI container runtimes witk Kubernetes CRI.

<!--more-->

CRI-O is an implementation of the {{< glossary_tooltip term_id="cri" >}}
to enable using {{< glossary_tooltip text="container" term_id="container" >}}
runtimes that are compatible with the Open Container Initiative (OCI)
[runtime spec](http://www.github.com/opencontainers/runtime-spec).

Deploying CRI-O allows Kubernetes to use any OCI-compliant runtime as the container
runtime for running {{< glossary_tooltip text="Pods" term_id="pod" >}}, and to fetch
OCI container images from remote registries.

0 comments on commit ad76ca0

Please sign in to comment.