OSDOCS-17248:removes SDN UDP port from OVN-K docs

Author: JoeAldinger

modules/configuring-hybrid-ovnkubernetes.adoc

@@ -80,8 +80,12 @@ spec:
         hybridOverlayVXLANPort: 9898 <2>
 ----
 <1> Specify the CIDR configuration used for nodes on the additional overlay network. The `hybridClusterNetwork` CIDR must not overlap with the `clusterNetwork` CIDR.
+<<<<<<< HEAD
 <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].
 --
+=======
+<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 `6081` port. For more information on this requirement, see 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] in the Microsoft documentation.
+>>>>>>> 6d2b6a67ea (OSDOCS-17248:removes SDN UDP port from OVN-K docs)
 +
 [NOTE]
 ====
@@ -131,7 +135,12 @@ where:
 
 `cidr`:: Specify the CIDR configuration used for nodes on the additional overlay network. This CIDR must not overlap with the cluster network CIDR.
 `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.
-`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].
+`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 `6081` port. For more information on this requirement, see 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] in the Microsoft documentation.
+
+[NOTE]
+====
+Windows Server Long-Term Servicing Channel (LTSC): Windows Server 2019 is not supported on clusters with a custom `hybridOverlayVXLANPort` value because this Windows server version does not support selecting a custom VXLAN port.
+====
 --
 +
 .Example output

modules/installation-about-custom-azure-vnet.adoc

@@ -154,8 +154,6 @@ the Cluster Version Operator on port `9099`.
 |The default ports that Kubernetes reserves
 
 .6+|UDP
-|`4789`
-|VXLAN
 
 |`6081`
 |Geneve

modules/installation-aws-user-infra-requirements.adoc

@@ -274,12 +274,12 @@ a `AWS::EC2::SecurityGroupIngress` resource.
 |`MasterIngressVxlan`
 |Vxlan packets
 |`udp`
-|`4789`
+|`6081`
 
 |`MasterIngressWorkerVxlan`
 |Vxlan packets
 |`udp`
-|`4789`
+|`6081`
 
 |`MasterIngressInternal`
 |Internal cluster communication and Kubernetes proxy metrics
@@ -391,12 +391,12 @@ a `AWS::EC2::SecurityGroupIngress` resource.
 |`WorkerIngressVxlan`
 |Vxlan packets
 |`udp`
-|`4789`
+|`6081`
 
 |`WorkerIngressWorkerVxlan`
 |Vxlan packets
 |`udp`
-|`4789`
+|`6081`
 
 |`WorkerIngressInternal`
 |Internal cluster communication

modules/installation-network-user-infra.adoc

@@ -162,8 +162,6 @@ the Cluster Version Operator on port `9099`.
 |`22623`
 |The port handles traffic from the Machine Config Server and directs the traffic to the control plane machines.
 .6+|UDP
-|`4789`
-|VXLAN
 
 |`6081`
 |Geneve

modules/installation-vsphere-installer-network-requirements.adoc

@@ -38,8 +38,6 @@ the Cluster Version Operator on port `9099`.
 |The default ports that Kubernetes reserves
 
 .5+|UDP
-|`4789`
-|virtual extensible LAN (VXLAN)
 
 |`6081`
 |Geneve