Merge pull request #31186 from jboxman/rm-dup-net-install-table

The fields in this module are duplicated elsewhere

Author: jboxman

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

@@ -58,8 +58,6 @@ include::modules/installation-initializing.adoc[leveloffset=+1]
 
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
-include::modules/nw-install-config-parameters.adoc[leveloffset=+2]
-
 include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
 // Removing; Proxy not supported for AWS IPI for 4.2

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

@@ -39,8 +39,6 @@ include::modules/installation-initializing.adoc[leveloffset=+1]
 
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
-include::modules/nw-install-config-parameters.adoc[leveloffset=+2]
-
 include::modules/installation-azure-config-yaml.adoc[leveloffset=+2]
 
 // Removing; Proxy not supported for Azure IPI for 4.2

installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc

@@ -47,8 +47,6 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
 include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
 
-include::modules/nw-install-config-parameters.adoc[leveloffset=+2]
-
 // Network Operator specific configuration
 
 include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]

installing/installing_gcp/installing-gcp-network-customizations.adoc

@@ -42,8 +42,6 @@ include::modules/installation-initializing.adoc[leveloffset=+1]
 
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
-include::modules/nw-install-config-parameters.adoc[leveloffset=+2]
-
 include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
 
 == Additional resources

installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc

@@ -40,8 +40,6 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
 include::modules/installation-vsphere-config-yaml.adoc[leveloffset=+2]
 
-include::modules/nw-install-config-parameters.adoc[leveloffset=+2]
-
 // Network Operator specific configuration
 
 include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]

installing/installing_vmc/installing-vmc-network-customizations.adoc

@@ -41,9 +41,6 @@ include::modules/installation-initializing.adoc[leveloffset=+1]
 
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
-// additional install-config network parameters
-include::modules/nw-install-config-parameters.adoc[leveloffset=+2]
-
 include::modules/installation-installer-provisioned-vsphere-config-yaml.adoc[leveloffset=+2]
 
 // begin network customization

installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc

@@ -43,9 +43,6 @@ include::modules/installation-initializing.adoc[leveloffset=+1]
 
 include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
-// additional install-config network parameters
-include::modules/nw-install-config-parameters.adoc[leveloffset=+2]
-
 include::modules/installation-installer-provisioned-vsphere-config-yaml.adoc[leveloffset=+2]
 
 // begin network customization

installing/installing_vsphere/installing-vsphere-network-customizations.adoc

@@ -52,8 +52,6 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
 include::modules/installation-vsphere-config-yaml.adoc[leveloffset=+2]
 
-include::modules/nw-install-config-parameters.adoc[leveloffset=+2]
-
 // Network Operator specific configuration
 
 include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]

modules/installation-configuration-parameters.adoc

@@ -271,44 +271,55 @@ endif::openshift-origin[]
 |Array of strings
 
 |`networking`
-|The configuration for the pod network provider in the cluster.
+|The configuration for the network for the cluster.
 |Object
 
+[NOTE]
+====
+You cannot modify parameters specified by the `networking` object after installation.
+====
+
+|`networking.networkType`
+|The default Container Network Interface (CNI) network provider plug-in to install.
+ifdef::openshift-origin[]
+Either `OpenShiftSDN` or `OVNKubernetes`. The default value is `OVNKubernetes`.
+endif::openshift-origin[]
+ifndef::openshift-origin[]
+Either `OpenShiftSDN` or `OVNKubernetes`. The default value is `OpenShiftSDN`.
+endif::openshift-origin[]
+|String
+
 |`networking.clusterNetwork`
 |The IP address pools for pods. The default is `10.128.0.0/14` with a host prefix of `/23`.
-|Array of objects
+|Array of objects. For example:
+
+[source,yaml]
+----
+networking:
+  clusterNetworking:
+  - cidr: 10.128.0.0/14
+    hostPrefix: 23
+----
 
 |`networking.clusterNetwork.cidr`
 |Required if you use `networking.clusterNetwork`. The IP block address pool.
-|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`.
+|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`.
 
 |`networking.clusterNetwork.hostPrefix`
-|Required if you use `networking.clusterNetwork`. The prefix size to allocate to each node from the CIDR. For example, 24 would allocate 2^8=256 addresses to each node.
+|Required if you use `networking.clusterNetwork`. The prefix size to allocate to each node from the CIDR. For example, `24` would allocate `2^8=256` addresses to each node.
 |Integer
 
+|`networking.serviceNetwork`
+|The IP address pools for services. The default is `172.30.0.0/16`.
+|Array of IP networks. 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`.
+
 |`networking.machineNetwork`
 |The IP address pools for machines.
 |Array of objects
 
 |`networking.machineNetwork.cidr`
 |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.
-|Array of IP networks. 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`.
+|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`.
 
 |`publish`
 |How to publish or expose the user-facing endpoints of your cluster, such as the Kubernetes API, OpenShift routes.