Skip to content

Commit d9312c4

Browse files
authored
Merge pull request #36204 from mburke5678/remove-also-known
Removing instances of *(also known as the master...)*
2 parents 254da62 + 2fdbfee commit d9312c4

File tree

69 files changed

+69
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+69
-69
lines changed

_unused_topics/monitoring-configuring-etcd-monitoring.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ image::etcd-no-certificate.png[]
118118

119119
While `etcd` is being monitored, Prometheus is not yet able to authenticate against `etcd`, and so cannot gather metrics. To configure Prometheus authentication against `etcd`:
120120

121-
. Copy the `/etc/etcd/ca/ca.crt` and `/etc/etcd/ca/ca.key` credentials files from the control plane node (also known as the master node) to the local machine:
121+
. Copy the `/etc/etcd/ca/ca.crt` and `/etc/etcd/ca/ca.key` credentials files from the control plane node to the local machine:
122122
+
123123
[subs="quotes"]
124124
----

_unused_topics/nodes-nodes-audit-log-advanced.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ openshift_master_audit_config={"enabled": true, "auditFilePath": "/var/lib/origi
1919

2020
[IMPORTANT]
2121
====
22-
The policy file *_/etc/origin/master/adv-audit.yaml_* must be available on each control plane node (also known as the master node).
22+
The policy file *_/etc/origin/master/adv-audit.yaml_* must be available on each control plane node.
2323
====
2424

2525

architecture/understanding-development.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ so there is less overhead in running them.
124124

125125
When you ultimately run your containers in {product-title}, you use the
126126
link:https://cri-o.io/[CRI-O] container engine. CRI-O runs on every worker and
127-
control plane machine (also known as the master machine) in an {product-title} cluster, but CRI-O is not yet supported as
127+
control plane machine in an {product-title} cluster, but CRI-O is not yet supported as
128128
a standalone runtime outside of {product-title}.
129129

130130
[id="base-image-options"]

backup_and_restore/backing-up-etcd.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Be sure to take an etcd backup after you upgrade your cluster. This is important
1919

2020
[IMPORTANT]
2121
====
22-
Back up your cluster's etcd data by performing a single invocation of the backup script on a control plane host (also known as the master host). Do not take a backup for each control plane host.
22+
Back up your cluster's etcd data by performing a single invocation of the backup script on a control plane host. Do not take a backup for each control plane host.
2323
====
2424

2525
After you have an etcd backup, you can xref:../backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[restore to a previous cluster state].

backup_and_restore/disaster_recovery/about-disaster-recovery.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ state.
1313

1414
[IMPORTANT]
1515
====
16-
Disaster recovery requires you to have at least one healthy control plane host (also known as the master host).
16+
Disaster recovery requires you to have at least one healthy control plane host.
1717
====
1818

1919
xref:../../backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[Restoring to a previous cluster state]::

backup_and_restore/replacing-unhealthy-etcd-member.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This process depends on whether the etcd member is unhealthy because the machine
1111

1212
[NOTE]
1313
====
14-
If you have lost the majority of your control plane hosts (also known as the master hosts), leading to etcd quorum loss, then you must follow the disaster recovery procedure to xref:../backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[restore to a previous cluster state] instead of this procedure.
14+
If you have lost the majority of your control plane hosts, leading to etcd quorum loss, then you must follow the disaster recovery procedure to xref:../backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[restore to a previous cluster state] instead of this procedure.
1515
1616
If the control plane certificates are not valid on the member being replaced, then you must follow the procedure to xref:../backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-recovering-expired-certs[recover from expired control plane certificates] instead of this procedure.
1717

machine_management/creating-infrastructure-machinesets.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ You can create a machine set to host only infrastructure components. You apply s
1111

1212
[IMPORTANT]
1313
====
14-
Unlike earlier versions of {product-title}, you cannot move the infrastructure components to the control plane machines (also known as the master machines). To move the components, you must create a new machine set.
14+
Unlike earlier versions of {product-title}, you cannot move the infrastructure components to the control plane machines. To move the components, you must create a new machine set.
1515
====
1616

1717
include::modules/infrastructure-components.adoc[leveloffset=+1]

modules/accessing-hosts-on-aws.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ API is responsive, run privileged pods instead.
4141
master. The hostname looks similar to `ip-10-0-1-163.ec2.internal`.
4242

4343
. From the bastion SSH host you manually deployed into Amazon EC2, SSH into that
44-
control plane host (also known as the master host). Ensure that you use the same SSH key you specified during the
44+
control plane host. Ensure that you use the same SSH key you specified during the
4545
installation:
4646
+
4747
[source,terminal]

modules/architecture-kubernetes-introduction.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ deployment, scaling, and management of containerized applications. The general
1515
concept of Kubernetes is fairly simple:
1616

1717
* Start with one or more worker nodes to run the container workloads.
18-
* Manage the deployment of those workloads from one or more control plane nodes (also known as the master nodes).
18+
* Manage the deployment of those workloads from one or more control plane nodes.
1919
* Wrap containers in a deployment unit called a pod. Using pods provides extra
2020
metadata with the container and offers the ability to group several containers
2121
in a single deployment entity.

modules/architecture-machine-roles.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Machine sets are groupings of machine resources under the `machine-api` namespac
2626
[id="defining-masters_{context}"]
2727
== Cluster masters
2828

29-
In a Kubernetes cluster, the control plane nodes (also known as the master nodes) run services that are required to control the Kubernetes cluster. In {product-title}, the control plane machines are the control plane. They contain more than just the Kubernetes services for managing the {product-title} cluster. Because all of the machines with the control plane role are control plane machines, the terms _master_ and _control plane_ are used interchangeably to describe them. Instead of being grouped into a machine set, control plane machines are defined by a series of standalone machine API resources. Extra controls apply to control plane machines to prevent you from deleting all control plane machines and breaking your cluster.
29+
In a Kubernetes cluster, the control plane nodes run services that are required to control the Kubernetes cluster. In {product-title}, the control plane machines are the control plane. They contain more than just the Kubernetes services for managing the {product-title} cluster. Because all of the machines with the control plane role are control plane machines, the terms _master_ and _control plane_ are used interchangeably to describe them. Instead of being grouped into a machine set, control plane machines are defined by a series of standalone machine API resources. Extra controls apply to control plane machines to prevent you from deleting all control plane machines and breaking your cluster.
3030

3131
[NOTE]
3232
====

0 commit comments

Comments
 (0)