Skip to content

Commit 23b3e52

Browse files
shurupTim Bannister
and
Tim Bannister
committed
Fix duplicated glossary entry for CRI
Signed-off-by: Dmitry Shurupov Co-authored-by: Tim Bannister
1 parent 93d3c19 commit 23b3e52

File tree

5 files changed

+17
-35
lines changed

5 files changed

+17
-35
lines changed

content/en/docs/concepts/architecture/cri.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ each Node in your cluster, so that the
1515
{{< glossary_tooltip text="kubelet" term_id="kubelet" >}} can launch
1616
{{< glossary_tooltip text="Pods" term_id="pod" >}} and their containers.
1717

18-
{{< glossary_definition prepend="The Container Runtime Interface (CRI) is" term_id="container-runtime-interface" length="all" >}}
18+
{{< glossary_definition prepend="The Container Runtime Interface (CRI) is" term_id="cri" length="all" >}}
1919

2020
2121

content/en/docs/reference/glossary/container-runtime-interface.md

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
---
2-
title: Container runtime interface (CRI)
2+
title: Container Runtime Interface (CRI)
33
id: cri
4-
date: 2019-03-07
5-
full_link: /docs/concepts/architecture/#container-runtime
4+
date: 2021-11-24
5+
full_link: /docs/concepts/architecture/cri
66
short_description: >
7-
An API for container runtimes to integrate with kubelet
8-
7+
Protocol for communication between the kubelet and the local container runtime.
98
109
aka:
1110
tags:
12-
- fundamental
11+
- fundamental
1312
---
14-
The container runtime interface (CRI) is an API for container runtimes
15-
to integrate with the {{< glossary_tooltip text="kubelet" term_id="kubelet" >}} on a node.
13+
14+
The main protocol for the communication between the {{< glossary_tooltip text="kubelet" term_id="kubelet" >}} and Container Runtime.
15+
1616
1717

18-
For more information, see the [CRI](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-node/container-runtime-interface.md) API and specifications.
18+
The Kubernetes Container Runtime Interface (CRI) defines the main
19+
[gRPC](https://grpc.io) protocol for the communication between the
20+
[node components](/docs/concepts/architecture/#node-components)
21+
{{< glossary_tooltip text="kubelet" term_id="kubelet" >}} and
22+
{{< glossary_tooltip text="container runtime" term_id="container-runtime" >}}.

content/en/docs/reference/instrumentation/cri-pod-container-metrics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ description: >-
1414
The [kubelet](/docs/reference/command-line-tools-reference/kubelet/) collects pod and
1515
container metrics via [cAdvisor](https://github.com/google/cadvisor). As an alpha feature,
1616
Kubernetes lets you configure the collection of pod and container
17-
metrics via the {{< glossary_tooltip term_id="container-runtime-interface" text="Container Runtime Interface">}} (CRI). You
17+
metrics via the {{< glossary_tooltip term_id="cri" text="Container Runtime Interface">}} (CRI). You
1818
must enable the `PodAndContainerStatsFromCRI` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) and
1919
use a compatible CRI implementation (containerd >= 1.6.0, CRI-O >= 1.23.0) to
2020
use the CRI based collection mechanism.
@@ -35,4 +35,4 @@ collection with cAdvisor include:
3535
- It further decouples the kubelet and the container runtime allowing collection of metrics for
3636
container runtimes that don't run processes directly on the host with kubelet where they are
3737
observable by cAdvisor (for example: container runtimes that use virtualization).
38-
38+

content/en/docs/reference/instrumentation/node-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ By default, Kubernetes fetches node summary metrics data using an embedded
4040
[cAdvisor](https://github.com/google/cadvisor) that runs within the kubelet. If you
4141
enable the `PodAndContainerStatsFromCRI` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
4242
in your cluster, and you use a container runtime that supports statistics access via
43-
{{< glossary_tooltip term_id="container-runtime-interface" text="Container Runtime Interface">}} (CRI), then
43+
{{< glossary_tooltip term_id="cri" text="Container Runtime Interface">}} (CRI), then
4444
the kubelet [fetches Pod- and container-level metric data using CRI](/docs/reference/instrumentation/cri-pod-container-metrics), and not via cAdvisor.
4545

4646
## {{% heading "whatsnext" %}}

0 commit comments

Comments
 (0)