diff --git a/modules/nw-install-config-parameters.adoc b/modules/nw-install-config-parameters.adoc index d17da0e943..55147b7f93 100644 --- a/modules/nw-install-config-parameters.adoc +++ b/modules/nw-install-config-parameters.adoc @@ -25,10 +25,10 @@ supported in {product-title} {product-version}. |`OpenShiftSDN` |`networking.clusterNetwork.cidr` -|A block of IP addresses from which Pod IPs are allocated. The `OpenShiftSDN` -network plug-in supports multiple cluster networks. The address blocks for -multiple cluster networks must not overlap. Select address pools large enough to -fit your anticipated workload. +|A block of IP addresses from which Pod IP addresses are allocated. The +`OpenShiftSDN` network plug-in supports multiple cluster networks. The address +blocks for multiple cluster networks must not overlap. Select address pools +large enough to fit your anticipated workload. |An IP address allocation in CIDR format. The default value is `10.128.0.0/14`. |`networking.clusterNetwork.hostPrefix` diff --git a/modules/nw-networkpolicy-about.adoc b/modules/nw-networkpolicy-about.adoc index daf5087fa1..79c00b18c5 100644 --- a/modules/nw-networkpolicy-about.adoc +++ b/modules/nw-networkpolicy-about.adoc @@ -47,10 +47,10 @@ spec: ingress: [] ---- -* Only allow connections from the {product-title} Ingress router: +* Only allow connections from the {product-title} Ingress Controller: + To make a project allow only connections from the {product-title} Ingress -router, add the following NetworkPolicy object: +Controller, add the following NetworkPolicy object: + [source,yaml] ---- diff --git a/modules/nw-operator-cr.adoc b/modules/nw-operator-cr.adoc index b440cef583..ca7841f65a 100644 --- a/modules/nw-operator-cr.adoc +++ b/modules/nw-operator-cr.adoc @@ -29,11 +29,11 @@ link:https://golang.org/pkg/time/#ParseDuration[Go time package]] = Cluster Network Operator custom resource (CR) The cluster network configuration in the `Network.operator.openshift.io` custom -resource (CR) stores the configuration settings for the Network Operator. +resource (CR) stores the configuration settings for the Cluster Network +Operator (CNO). -The following CR displays the default configuration for the Cluster Network -Operator and explains both the parameters you can configure and valid parameter -values: +The following CR displays the default configuration for the CNO and explains +both the parameters you can configure and valid parameter values: .Cluster Network Operator CR [source,yaml] diff --git a/networking/configuring-networkpolicy.adoc b/networking/configuring-networkpolicy.adoc index 7790fbc3c1..2cb79831c8 100644 --- a/networking/configuring-networkpolicy.adoc +++ b/networking/configuring-networkpolicy.adoc @@ -1,4 +1,4 @@ -[id="configuring-networkpolicy-plugin"] +[id="configuring-networkpolicy"] = Configuring network policy with OpenShift SDN include::modules/common-attributes.adoc[] :context: configuring-networkpolicy-plugin diff --git a/networking/openshift-sdn/about-openshift-sdn.adoc b/networking/openshift-sdn/about-openshift-sdn.adoc index 1638e0c83d..dc6eb6365f 100644 --- a/networking/openshift-sdn/about-openshift-sdn.adoc +++ b/networking/openshift-sdn/about-openshift-sdn.adoc @@ -12,9 +12,10 @@ OpenShift SDN, which configures an overlay network using Open vSwitch (OVS). OpenShift SDN provides three SDN modes for configuring the Pod network: +// TODO - this link fails ccutil build * The _network policy_ mode allows project administrators to configure their own -isolation policies using `NetworkPolicy` objects. Network policy is the default -mode in {product-title} {product-version}. +isolation policies using xref:../../networking/configuring-networkpolicy.adoc#configuring-networkpolicy[NetworkPolicy objects]. +NetworkPolicy is the default mode in {product-title} {product-version}. * The _multitenant_ mode provides project-level isolation for Pods and Services. Pods from different projects cannot send packets to or receive packets from Pods