Skip to content

Commit 86fb85c

Browse files
authored
Merge pull request #82776 from mburke5678/wmco-hide-10.17.0-follow-up
Minor edits as follow-up to WMCO hiding docs from 10.17
2 parents 722a4d5 + 9fe3883 commit 86fb85c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

installing/installing_aws/ipi/installing-aws-network-customizations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
107107

108108
[NOTE]
109109
====
110-
For more information on using Linux and Windows nodes in the same cluster, see xref:../../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads].
110+
For more information about using Linux and Windows nodes in the same cluster, see xref:../../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads].
111111
====
112112

113113
include::modules/installation-launching-installer.adoc[leveloffset=+1]

installing/installing_azure/ipi/installing-azure-network-customizations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
4949

5050
[NOTE]
5151
====
52-
For more information on using Linux and Windows nodes in the same cluster, see xref:../../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads].
52+
For more information about using Linux and Windows nodes in the same cluster, see xref:../../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads].
5353
====
5454

5555
[role="_additional-resources"]

installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
5353

5454
[NOTE]
5555
====
56-
For more information on using Linux and Windows nodes in the same cluster, see xref:../../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads].
56+
For more information about using Linux and Windows nodes in the same cluster, see xref:../../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads].
5757
====
5858

5959

modules/configuring-hybrid-ovnkubernetes.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ where:
6060
`manifests/` directory for your cluster.
6161
--
6262

63-
. Open the `cluster-network-03-config.yml` file in an editor and configure OVN-Kubernetes with hybrid networking, such as in the following example:
63+
. Open the `cluster-network-03-config.yml` file in an editor and configure OVN-Kubernetes with hybrid networking, as in the following example:
6464
+
6565
--
6666
.Specify a hybrid networking configuration
@@ -79,7 +79,7 @@ spec:
7979
hostPrefix: 23
8080
hybridOverlayVXLANPort: 9898 <2>
8181
----
82-
<1> Specify the CIDR configuration used for nodes on the additional overlay network. The `hybridClusterNetwork` CIDR cannot overlap with the `clusterNetwork` CIDR.
82+
<1> Specify the CIDR configuration used for nodes on the additional overlay network. The `hybridClusterNetwork` CIDR must not overlap with the `clusterNetwork` CIDR.
8383
<2> Specify a custom VXLAN port for the additional overlay network. This is required for running Windows nodes in a cluster installed on vSphere, and must not be configured for any other cloud provider. The custom port can be any open port excluding the default `4789` port. For more information on this requirement, see the Microsoft documentation on link:https://docs.microsoft.com/en-us/virtualization/windowscontainers/kubernetes/common-problems#pod-to-pod-connectivity-between-hosts-is-broken-on-my-kubernetes-cluster-running-on-vsphere[Pod-to-pod connectivity between hosts is broken].
8484
--
8585
+
@@ -97,7 +97,7 @@ ifdef::post-install[]
9797
.Prerequisites
9898

9999
* Install the OpenShift CLI (`oc`).
100-
* Log in to the cluster with a user with `cluster-admin` privileges.
100+
* Log in to the cluster as a user with `cluster-admin` privileges.
101101
* Ensure that the cluster uses the OVN-Kubernetes network plugin.
102102
103103
.Procedure
@@ -129,7 +129,7 @@ $ oc patch networks.operator.openshift.io cluster --type=merge \
129129
--
130130
where:
131131

132-
`cidr`:: Specify the CIDR configuration used for nodes on the additional overlay network. This CIDR cannot overlap with the cluster network CIDR.
132+
`cidr`:: Specify the CIDR configuration used for nodes on the additional overlay network. This CIDR must not overlap with the cluster network CIDR.
133133
`hostPrefix`:: Specifies the subnet prefix length to assign to each individual node. For example, if `hostPrefix` is set to `23`, then each node is assigned a `/23` subnet out of the given `cidr`, which allows for 510 (2^(32 - 23) - 2) pod IP addresses. If you are required to provide access to nodes from an external network, configure load balancers and routers to manage the traffic.
134134
`hybridOverlayVXLANPort`:: Specify a custom VXLAN port for the additional overlay network. This is required for running Windows nodes in a cluster installed on vSphere, and must not be configured for any other cloud provider. The custom port can be any open port excluding the default `4789` port. For more information on this requirement, see the Microsoft documentation on link:https://docs.microsoft.com/en-us/virtualization/windowscontainers/kubernetes/common-problems#pod-to-pod-connectivity-between-hosts-is-broken-on-my-kubernetes-cluster-running-on-vsphere[Pod-to-pod connectivity between hosts is broken].
135135

0 commit comments

Comments
 (0)