Skip to content

Commit 86fe8d8

Browse files
authored
Merge pull request #54463 from bergerhoffer/typo-main
Typo check before GA
2 parents 46a71f8 + 5a8d602 commit 86fe8d8

7 files changed

+18
-18
lines changed

migrating_from_ocp_3_to_4/planning-migration-3-4.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ For more information, see xref:../networking/network_policy/about-network-policy
153153
[discrete]
154154
==== OVN-Kubernetes as the default networking plug-in in Red Hat OpenShift Networking
155155

156-
In {product-title} 3.11, OpenShift SDN was the the default networking plug-in in Red Hat OpenShift Networking. In {product-title} {product-version}, OVN-Kubernetes is now the default networking plug-in.
156+
In {product-title} 3.11, OpenShift SDN was the default networking plug-in in Red Hat OpenShift Networking. In {product-title} {product-version}, OVN-Kubernetes is now the default networking plug-in.
157157

158158
For information on migrating to OVN-Kubernetes from OpenShift SDN, see xref:../networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc#migrate-from-openshift-sdn[Migrating from the OpenShift SDN network plug-in].
159159

migration_toolkit_for_containers/installing-mtc-restricted.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To guarantee successful data transfer in all environments, {mtc-full} ({mtc-shor
5151

5252
==== Manually overriding default non-root operation for data trannsfer
5353

54-
Although running Rsync pods as non-root user works in most cases, data transfer might fail when when you run workloads as root user on the source side. {mtc-short} provides two ways to manually override default non-root operation for data transfer:
54+
Although running Rsync pods as non-root user works in most cases, data transfer might fail when you run workloads as root user on the source side. {mtc-short} provides two ways to manually override default non-root operation for data transfer:
5555

5656
* Configure all migrations to run an Rsync pod as root on the destination cluster for all migrations.
5757
* Run an Rsync pod as root on the destination cluster per migration.

migration_toolkit_for_containers/installing-mtc.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To guarantee successful data transfer in all environments, {mtc-full} ({mtc-shor
4242

4343
==== Manually overriding default non-root operation for data trannsfer
4444

45-
Although running Rsync pods as non-root user works in most cases, data transfer might fail when when you run workloads as root user on the source side. {mtc-short} provides two ways to manually override default non-root operation for data transfer:
45+
Although running Rsync pods as non-root user works in most cases, data transfer might fail when you run workloads as root user on the source side. {mtc-short} provides two ways to manually override default non-root operation for data transfer:
4646

4747
* Configure all migrations to run an Rsync pod as root on the destination cluster for all migrations.
4848
* Run an Rsync pod as root on the destination cluster per migration.

modules/cnf-topology-aware-lifecycle-manager-about-cgu-crs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ When the remediation plan is successfully created, you can you set the `enable`
150150

151151
[NOTE]
152152
====
153-
You can only make changes to the `spec` fields if the `enable` field of the `ClusterGroupUpgrade` CR is is set to `false`.
153+
You can only make changes to the `spec` fields if the `enable` field of the `ClusterGroupUpgrade` CR is set to `false`.
154154
====
155155

156156
[id="validating_{context}"]

modules/olm-rukpak-registry-bundle.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
[id="olm-rukpak-registry-bundle_{context}"]
77
= Registry bundle spec
88

9-
A registry bundle, or `registry+v1` bundle, contains a set of static Kubernetes YAML manifests organized in the legacy Operator Lifecycle Manger (OLM) bundle format.
9+
A registry bundle, or `registry+v1` bundle, contains a set of static Kubernetes YAML manifests organized in the legacy Operator Lifecycle Manager (OLM) bundle format.

modules/overriding-default-node-ip-selection-logic.adoc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44

55
:_content-type: PROCEDURE
66
[id="overriding-default-node-ip-selection-logic_{context}"]
7-
= Optional: Overriding the default node IP selection logic
7+
= Optional: Overriding the default node IP selection logic
88

9-
To override the default IP selection logic, you can create a hint file that includes the `NODEIP_HINT` variable to override the default IP selection logic. Creating a hint file allows you to select a specific node IP address from the interface in the subnet of the IP address specified in the `NODEIP_HINT` variable.
9+
To override the default IP selection logic, you can create a hint file that includes the `NODEIP_HINT` variable to override the default IP selection logic. Creating a hint file allows you to select a specific node IP address from the interface in the subnet of the IP address specified in the `NODEIP_HINT` variable.
1010

11-
For example, if a node has two interfaces, `eth0` with an address of `10.0.0.10/24`, and `eth1` with an address of `192.0.2.5/24`, and the default route points to `eth0` (`10.0.0.10`),the node IP address would normally use the `10.0.0.10` IP address.
11+
For example, if a node has two interfaces, `eth0` with an address of `10.0.0.10/24`, and `eth1` with an address of `192.0.2.5/24`, and the default route points to `eth0` (`10.0.0.10`),the node IP address would normally use the `10.0.0.10` IP address.
1212

13-
Users can configure the `NODEIP_HINT` variable to point at a known IP in the subnet, for example, a subnet gateway such as `192.0.2.1` so that the other subnet, `192.0.2.0/24`, is selected. As a result, the `192.0.2.5` IP address on `eth1` is used for the node.
13+
Users can configure the `NODEIP_HINT` variable to point at a known IP in the subnet, for example, a subnet gateway such as `192.0.2.1` so that the other subnet, `192.0.2.0/24`, is selected. As a result, the `192.0.2.5` IP address on `eth1` is used for the node.
1414

15-
The following procedure shows how to override the default node IP selection logic.
15+
The following procedure shows how to override the default node IP selection logic.
1616

1717
.Procedure
1818

19-
. Add a hint file to your your `/etc/default/nodeip-configuration` file, for example:
19+
. Add a hint file to your `/etc/default/nodeip-configuration` file, for example:
2020
+
2121
[source,text]
2222
----
@@ -26,7 +26,7 @@ NODEIP_HINT=192.0.2.1
2626
[IMPORTANT]
2727
====
2828
* Do not use the exact IP address of a node as a hint, for example, `192.0.2.5`. Using the exact IP address of a node causes the node using the hint IP address to fail to configure correctly.
29-
* The IP address in the hint file is only used to determine the correct subnet. It will not receive traffic as a result of appearing in the hint file.
29+
* The IP address in the hint file is only used to determine the correct subnet. It will not receive traffic as a result of appearing in the hint file.
3030
====
3131

3232
. Generate the `base-64` encoded content by running the following command:
@@ -43,7 +43,7 @@ $ echo 'NODEIP_HINT=192.0.2.1' | base64
4343
Tk9ERUlQX0hJTlQ9MTkyLjAuMCxxxx==
4444
----
4545

46-
. Activate the hint by creating a machine config manifest for both `master` and `worker` roles before deploying the cluster:
46+
. Activate the hint by creating a machine config manifest for both `master` and `worker` roles before deploying the cluster:
4747
+
4848
.Master machine config manifest
4949
[source,yaml]
@@ -85,13 +85,13 @@ spec:
8585
storage:
8686
files:
8787
- contents:
88-
source: data:text/plain;charset=utf-8;base64, <encoded_content> <1>
88+
source: data:text/plain;charset=utf-8;base64, <encoded_content> <1>
8989
mode: 0644
9090
overwrite: true
9191
path: /etc/default/nodeip-configuration
9292
----
9393
<1> Replace `<encoded_contents>` with the base64-encoded content of the `/etc/default/nodeip-configuration` file, for example, `Tk9ERUlQX0hJTlQ9MTkyLjAuMCxxxx==`.
9494

95-
. Save the manifest to the directory where you store your cluster configuration, for example, `~/clusterconfigs`.
95+
. Save the manifest to the directory where you store your cluster configuration, for example, `~/clusterconfigs`.
9696

97-
. Deploy the cluster.
97+
. Deploy the cluster.

modules/persistent-storage-csi-vol-populator.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
[id="persistent-storage-csi-vol-populator_{context}"]
77
= Volume populators
88

9-
Volume populators use the `datasource` field in a persistent volume claim (PVC) spec to to create pre-populated volumes.
9+
Volume populators use the `datasource` field in a persistent volume claim (PVC) spec to create pre-populated volumes.
1010

1111
Volume population is currently enabled, and supported as a Technology Preview feature. However, {product-title} does not ship with any volume populators.
1212

1313
:FeatureName: Volume populators
14-
include::snippets/technology-preview.adoc[leveloffset=+1]
14+
include::snippets/technology-preview.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)