Skip to content

Commit e72b34a

Browse files
author
Ashley Hardin
committed
OSDOCS-8650: Content review of Understanding the Cluster Network Operator topic
1 parent 1824fff commit e72b34a

File tree

2 files changed

+11
-38
lines changed

2 files changed

+11
-38
lines changed

modules/nw-operator-cr.adoc

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ endif::[]
4242

4343
The configuration for the cluster network is specified as part of the Cluster Network Operator (CNO) configuration and stored in a custom resource (CR) object that is named `cluster`. The CR specifies the fields for the `Network` API in the `operator.openshift.io` API group.
4444

45-
The CNO configuration inherits the following fields during cluster installation from the `Network` API in the `Network.config.openshift.io` API group and these fields cannot be changed:
45+
The CNO configuration inherits the following fields during cluster installation from the `Network` API in the `Network.config.openshift.io` API group:
4646

4747
`clusterNetwork`:: IP address pools from which pod IP addresses are allocated.
4848
`serviceNetwork`:: IP address pool for services.
@@ -52,7 +52,7 @@ The CNO configuration inherits the following fields during cluster installation
5252
ifdef::post-install-network-configuration,operator[]
5353
[NOTE]
5454
====
55-
After cluster installation, you cannot modify the fields listed in the previous section.
55+
After cluster installation, you can only modify the `clusterNetwork` IP address range. The default network type can only be changed from OpenShift SDN to OVN-Kubernetes through migration.
5656
====
5757
endif::[]
5858
ifndef::post-install-network-configuration[]
@@ -87,13 +87,6 @@ spec:
8787
hostPrefix: 23
8888
----
8989

90-
ifdef::operator[]
91-
This value is ready-only and inherited from the `Network.config.openshift.io` object named `cluster` during cluster installation.
92-
endif::operator[]
93-
ifndef::operator[]
94-
You can customize this field only in the `install-config.yaml` file before you create the manifests. The value is read-only in the manifest file.
95-
endif::operator[]
96-
9790
|`spec.serviceNetwork`
9891
|`array`
9992
|A block of IP addresses for services. The OpenShift SDN and OVN-Kubernetes network plugins support only a single IP address block for the service network. For example:
@@ -137,7 +130,7 @@ The values for the `defaultNetwork` object are defined in the following table:
137130

138131
|`type`
139132
|`string`
140-
|Either `OpenShiftSDN` or `OVNKubernetes`. The {openshift-networking} network plugin is selected during installation. This value cannot be changed after cluster installation.
133+
|Either `OpenShiftSDN` or `OVNKubernetes`. The {openshift-networking} network plugin is selected during installation. You can change this value by migrating from OpenShift SDN to OVN-Kubernetes.
141134
[NOTE]
142135
====
143136
{product-title} uses the OVN-Kubernetes network plugin by default.
@@ -208,13 +201,6 @@ endif::operator[]
208201

209202
|====
210203

211-
ifdef::operator[]
212-
[NOTE]
213-
====
214-
You can only change the configuration for your cluster network plugin during cluster installation.
215-
====
216-
endif::operator[]
217-
218204
.Example OpenShift SDN configuration
219205
[source,yaml]
220206
----
@@ -352,12 +338,6 @@ If you set this field to `true`, you do not receive the performance benefits of
352338

353339
|====
354340

355-
ifdef::operator[]
356-
[NOTE]
357-
====
358-
You can only change the configuration for your cluster network plugin during cluster installation, except for the `gatewayConfig` field that can be changed at runtime as a postinstallation activity.
359-
====
360-
endif::operator[]
361341

362342
.Example OVN-Kubernetes configuration with IPSec enabled
363343
[source,yaml]
@@ -372,7 +352,7 @@ defaultNetwork:
372352

373353
[discrete]
374354
[id="nw-operator-cr-kubeproxyconfig_{context}"]
375-
=== kubeProxyConfig object configuration
355+
=== kubeProxyConfig object configuration (OpenShiftSDN container network interface only)
376356

377357
The values for the `kubeProxyConfig` object are defined in the following table:
378358

@@ -419,24 +399,15 @@ kind: Network
419399
metadata:
420400
name: cluster
421401
spec:
422-
clusterNetwork: <1>
402+
clusterNetwork:
423403
- cidr: 10.128.0.0/14
424404
hostPrefix: 23
425-
serviceNetwork: <1>
405+
serviceNetwork:
426406
- 172.30.0.0/16
427-
defaultNetwork: <1>
428-
type: OpenShiftSDN
429-
openshiftSDNConfig:
430-
mode: NetworkPolicy
431-
mtu: 1450
432-
vxlanPort: 4789
433-
kubeProxyConfig:
434-
iptablesSyncPeriod: 30s
435-
proxyArguments:
436-
iptables-min-sync-period:
437-
- 0s
407+
networkType: OVNKubernetes
408+
clusterNetworkMTU: 8900
409+
438410
----
439-
<1> Configured only during cluster installation.
440411
endif::operator[]
441412
endif::post-install-network-configuration[]
442413

networking/cluster-network-operator.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ include::modules/nw-operator-cr.adoc[leveloffset=+1]
2323
== Additional resources
2424

2525
* xref:../rest_api/operator_apis/network-operator-openshift-io-v1.adoc#network-operator-openshift-io-v1[`Network` API in the `operator.openshift.io` API group]
26+
* xref:../networking/configuring-cluster-network-range.adoc#nw-cluster-network-range-edit_configuring-cluster-network-range[Modifying the `clusterNetwork` IP address range]
27+
* xref:../networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc#migrate-from-openshift-sdn[Migrating from the OpenShift SDN network plugin]

0 commit comments

Comments
 (0)