Skip to content

Commit b459692

Browse files
authored
Merge pull request #44297 from Amrita42/contributing-guidelines
added control plan in C and removed k8s control plane
2 parents 577f486 + 33e0b49 commit b459692

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

contributing_to_docs/term_glossary.adoc

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,15 @@ used interchangeably with "container-based."
168168

169169
Usage: container group
170170

171+
''''
172+
=== control plane
173+
174+
Usage: control plane
175+
176+
The control plane, which is composed of control plane machines, manages the {product-title} cluster. The control plane machines manage workloads on the compute machines, which are also known as worker machines.
177+
178+
Note that the OpenShift "control plane" was previously known as "master" and could still be in the code.
179+
171180
''''
172181
=== custom resource
173182

@@ -334,15 +343,6 @@ The agent that controls a Kubernetes node. Each node runs a kubelet, which
334343
handles starting and stopping containers on a node, based on the desired state
335344
defined by the control plane (also known as master).
336345

337-
''''
338-
=== Kubernetes control plane
339-
340-
Usage: Kubernetes control plane
341-
342-
The Kubernetes-native equivalent to the link:#project[OpenShift control plane].
343-
An OpenShift system runs OpenShift control planes (also known as masters), not Kubernetes control planes, and
344-
an OpenShift control plane provides a superset of the functionality of a Kubernetes control plane, so it is generally preferred to use the term OpenShift control plane.
345-
346346
''''
347347
=== Kubernetes API server
348348

@@ -422,15 +422,6 @@ The `oc` tool is the command-line interface of OpenShift 3 and 4.
422422
When referencing as a prerequisite for a procedure module, use the following
423423
construction: Install the OpenShift CLI (`oc`).
424424

425-
''''
426-
=== control plane
427-
428-
Usage: control plane
429-
430-
The control plane, which is composed of control plane machines, manages the {product-title} cluster. The control plane machines manage workloads on the compute machines, which are also known as worker machines.
431-
432-
Note that the OpenShift "control plane" was previously known as "master" and could still be in the code.
433-
434425
''''
435426
=== Operator
436427

0 commit comments

Comments
 (0)