Skip to content

Commit b401509

Browse files
authored
Merge pull request #75273 from JoeAldinger/OSDOCS-9803
/lgtm OSDOCS-9803:updates CIDR ranges that are internal to OVN-K
2 parents 8fb5cf9 + 38bf278 commit b401509

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

networking/cidr-range-definitions.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ endif::[]
2222

2323
[IMPORTANT]
2424
====
25-
OVN-Kubernetes, the default network provider in {product-title} 4.11 and later, uses the `100.64.0.0/16` IP address range internally. If your cluster uses OVN-Kubernetes, do not include the `100.64.0.0/16` IP address range in any other CIDR definitions in your cluster.
25+
OVN-Kubernetes, the default network provider in {product-title} 4.14 and later versions, uses the following IP address ranges internally: `100.64.0.0/16`, `169.254.169.0/29`, `100.88.0.0/16`, `fd98::/64`, `fd69::/125`, and the `fd97::/64`. If your cluster uses OVN-Kubernetes, do not include any IP address ranges in any other CIDR definitions in your cluster.
2626
====
2727

2828
[id="machine-cidr-description"]
2929
== Machine CIDR
30-
In the Machine CIDR field, you must specify the IP address range for machines or cluster nodes.
30+
In the Machine classless inter-domain routing (CIDR) field, you must specify the IP address range for machines or cluster nodes.
3131
ifdef::openshift-rosa,openshift-dedicated[]
32-
This range must encompass all CIDR address ranges for your virtual private cloud (VPC) subnets. Subnets must be contiguous. A minimum IP address range of 128 addresses, using the subnet prefix `/25`, is supported for single availability zone deployments. A minimum address range of 256 addresses, using the subnet prefix `/24`, is supported for deployments that use multiple availability zones.
32+
This range must encompass all CIDR address ranges for your virtual private cloud (VPC) subnets. Subnets must be contiguous. A minimum IP address range of 128 addresses, using the subnet prefix `/25`, is supported for single availability zone deployments. A minimum address range of 256 addresses, using the subnet prefix `/24`, is supported for deployments that use multiple availability zones.
3333
endif::openshift-rosa,openshift-dedicated[]
3434

3535
The default is `10.0.0.0/16`. This range must not conflict with any connected networks.
@@ -43,29 +43,29 @@ endif::[]
4343

4444
[id="service-cidr-description"]
4545
== Service CIDR
46-
In the Service CIDR field, you must specify the IP address range for services.
46+
In the Service CIDR field, you must specify the IP address range for services.
4747
ifdef::openshift-rosa,openshift-dedicated[]
48-
It is recommended, but not required, that the address block is the same between clusters. This will not create IP address conflicts.
48+
It is recommended, but not required, that the address block is the same between clusters. This will not create IP address conflicts.
4949
endif::openshift-rosa,openshift-dedicated[]
5050
The range must be large enough to accommodate your workload. The address block must not overlap with any external service accessed from within the cluster. The default is `172.30.0.0/16`.
5151

5252
[id="pod-cidr-description"]
5353
== Pod CIDR
54-
In the pod CIDR field, you must specify the IP address range for pods.
54+
In the pod CIDR field, you must specify the IP address range for pods.
5555

5656
ifdef::openshift-enterprise[]
57-
The pod CIDR is the same as the `clusterNetwork` CIDR and the cluster CIDR.
57+
The pod CIDR is the same as the `clusterNetwork` CIDR and the cluster CIDR.
5858
endif::openshift-enterprise[]
5959
ifdef::openshift-rosa,openshift-dedicated[]
60-
It is recommended, but not required, that the address block is the same between clusters. This will not create IP address conflicts.
60+
It is recommended, but not required, that the address block is the same between clusters. This will not create IP address conflicts.
6161
endif::openshift-rosa,openshift-dedicated[]
62-
The range must be large enough to accommodate your workload. The address block must not overlap with any external service accessed from within the cluster. The default is `10.128.0.0/14`.
62+
The range must be large enough to accommodate your workload. The address block must not overlap with any external service accessed from within the cluster. The default is `10.128.0.0/14`.
6363
ifdef::openshift-enterprise[]
6464
You can expand the range after cluster installation.
6565

6666
[role="_additional-resources"]
6767
.Additional resources
68-
* xref:../networking/cluster-network-operator.adoc#nw-operator-cr-cno-object_cluster-network-operator[Cluster Network Operator Configuration]
68+
* xref:../networking/cluster-network-operator.adoc#nw-operator-cr-cno-object_cluster-network-operator[Cluster Network Operator configuration]
6969
* xref:../networking/configuring-cluster-network-range.adoc#configuring-cluster-network-range[Configuring the cluster network range]
7070
endif::openshift-enterprise[]
7171

0 commit comments

Comments
 (0)