Merge pull request #29158 from mburke5678/okd-issue-457

mburke5678 · web-flow · commit 4a1b55008b02 · 2021-02-05T11:54:17.000-05:00
Documentation indicates OpenShiftSDN is a (preferred) supported default network CNI Provider
diff --git a/modules/installation-aws-config-yaml.adoc b/modules/installation-aws-config-yaml.adoc
@@ -95,7 +95,12 @@ endif::[]
     hostPrefix: 23
   machineNetwork:
   - cidr: 10.0.0.0/16
+ifndef::openshift-origin[]
   networkType: OpenShiftSDN
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+  networkType: OVNKubernetes
+endif::openshift-origin[]
   serviceNetwork:
   - 172.30.0.0/16
 platform:
diff --git a/modules/installation-azure-config-yaml.adoc b/modules/installation-azure-config-yaml.adoc
@@ -71,7 +71,12 @@ endif::[]
     hostPrefix: 23
   machineNetwork:
   - cidr: 10.0.0.0/16
+ifndef::openshift-origin[]
   networkType: OpenShiftSDN
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+  networkType: OVNKubernetes
+endif::openshift-origin[]
   serviceNetwork:
   - 172.30.0.0/16
 platform:
diff --git a/modules/installation-bare-metal-config-yaml.adoc b/modules/installation-bare-metal-config-yaml.adoc
@@ -91,7 +91,12 @@ networking:
   clusterNetwork:
   - cidr: 10.128.0.0/14 <7>
     hostPrefix: 23 <8>
+ifndef::openshift-origin[]
   networkType: OpenShiftSDN
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+  networkType: OVNKubernetes
+endif::openshift-origin[]
   serviceNetwork: <9>
   - 172.30.0.0/16
 platform:
diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc
@@ -270,9 +270,17 @@ Not all CCO modes are supported for all cloud providers. For more information on
 |Required if you use `networking.machineNetwork`. The IP block address pool. The default is `10.0.0.0/16` for all platforms other than libvirt. For libvirt, the default is `192.168.126.0/24`.
 |IP network. IP networks are represented as strings using Classless Inter-Domain Routing (CIDR) notation with a traditional IP address or network number, followed by the forward slash (/) character, followed by a decimal value between 0 and 32 that describes the number of significant bits. For example, `10.0.0.0/16` represents IP addresses `10.0.0.0` through `10.0.255.255`.
 
+ifndef::openshift-origin[]
 |`networking.networkType`
 |The type of network to install. The default is `OpenShiftSDN`.
 |String
+endif::openshift-origin[]
+
+ifdef::openshift-origin[]
+|`networking.networkType`
+|The type of network to install. The default is `OVNKubernetes`.
+|String
+endif::openshift-origin[]
 
 |`networking.serviceNetwork`
 |The IP address pools for services. The default is 172.30.0.0/16.
diff --git a/modules/installation-gcp-config-yaml.adoc b/modules/installation-gcp-config-yaml.adoc
@@ -85,7 +85,12 @@ endif::[]
     hostPrefix: 23
   machineNetwork:
   - cidr: 10.0.0.0/16
+ifndef::openshift-origin[]
   networkType: OpenShiftSDN
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+  networkType: OVNKubernetes
+endif::openshift-origin[]
   serviceNetwork:
   - 172.30.0.0/16
 platform:
diff --git a/modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc b/modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc
@@ -44,7 +44,12 @@ networking:
     hostPrefix: 23
   machineNetwork:
   - cidr: 10.0.0.0/16
+ifndef::openshift-origin[]
   networkType: OpenShiftSDN
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+  networkType: OVNKubernetes
+endif::openshift-origin[]
   serviceNetwork:
   - 172.30.0.0/16
 platform:
diff --git a/modules/installation-installer-provisioned-vsphere-config-yaml.adoc b/modules/installation-installer-provisioned-vsphere-config-yaml.adoc
@@ -48,7 +48,12 @@ networking:
     hostPrefix: 23
   machineNetwork:
   - cidr: 10.0.0.0/16
+ifndef::openshift-origin[]
   networkType: OpenShiftSDN
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+  networkType: OVNKubernetes
+endif::openshift-origin[]
   serviceNetwork:
   - 172.30.0.0/16
 endif::network[]
diff --git a/modules/installation-osp-config-yaml.adoc b/modules/installation-osp-config-yaml.adoc
@@ -38,7 +38,12 @@ networking:
   - cidr: 10.0.0.0/16
   serviceNetwork:
   - 172.30.0.0/16
+ifndef::openshift-origin[]
   networkType: OpenShiftSDN
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+  networkType: OVNKubernetes
+endif::openshift-origin[]
 platform:
   openstack:
     cloud: mycloud
diff --git a/modules/installation-osp-restricted-config-yaml.adoc b/modules/installation-osp-restricted-config-yaml.adoc
@@ -38,7 +38,12 @@ networking:
   machineCIDR: 10.0.0.0/16
   serviceNetwork:
   - 172.30.0.0/16
+ifndef::openshift-origin[]
   networkType: OpenShiftSDN
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+  networkType: OVNKubernetes
+endif::openshift-origin[]
 platform:
   openstack:
     region: region1
diff --git a/modules/installing-rhv-example-install-config-yaml.adoc b/modules/installing-rhv-example-install-config-yaml.adoc
@@ -50,7 +50,12 @@ networking:
     hostPrefix: 23
   machineNetwork:
   - cidr: 10.0.0.0/16
+ifndef::openshift-origin[]
   networkType: OpenShiftSDN
+endif::openshift-origin[]
+ifdef::openshift-origin[]
+  networkType: OVNKubernetes
+endif::openshift-origin[]
   serviceNetwork:
   - 172.30.0.0/16
 platform:
diff --git a/modules/nw-operator-cr.adoc b/modules/nw-operator-cr.adoc
@@ -91,6 +91,13 @@ NOTE: Because of performance improvements introduced in {product-title} 4.3 and
 <6> The minimum duration before refreshing `iptables` rules. This parameter ensures that the refresh does not happen too frequently. Valid suffixes include `s`, `m`, and `h` and are described in the link:https://golang.org/pkg/time/#ParseDuration[Go time package].
 endif::operator[]
 
+ifdef::openshift-origin[]
+[NOTE]
+====
+{product-title} uses the OVN-Kubernetes Container Network Interface (CNI) cluster network provider by default.
+====
+endif::openshift-origin[]
+
 [id="nw-operator-configuration-parameters-for-openshift-sdn_{context}"]
 == Configuration parameters for the OpenShift SDN default CNI network provider
 
diff --git a/networking/openshift_sdn/about-openshift-sdn.adoc b/networking/openshift_sdn/about-openshift-sdn.adoc
@@ -26,6 +26,14 @@ cluster and receive network traffic from those pods and services.
 * The _subnet_ mode provides a flat pod network where every pod can
 communicate with every other pod and service. The network policy mode provides
 the same functionality as the subnet mode.
+
+ifdef::openshift-origin[]
+[NOTE]
+====
+{product-title} uses the xref:../../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes Container Network Interface (CNI) plug-in] by default.
+====
+endif::openshift-origin[]
+
 endif::[]
 ifdef::openshift-dedicated[]
 OpenShift SDN supports only the _network policy_ mode, which allows project
