Skip to content

Commit 39adeb8

Browse files
authored
Merge pull request #93269 from xenolinux/hcp-reserved-cidr
OCPBUGS#55102: Include reserved HCP CIDR ranges
2 parents 6fb0d6a + 176d8be commit 39adeb8

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

hosted_control_planes/hcp-prepare/hcp-requirements.adoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,10 @@ include::modules/hcp-fips.adoc[leveloffset=+1]
2222
* link:https://access.redhat.com/articles/7099674[The {mce} 2.8 support matrix]
2323
* link:https://access.redhat.com/labs/ocpouic/?operator=multicluster-engine&&upgrade_path=4.14%20to%204.16[Red{nbsp}Hat {product-title} Operator Update Information Checker]
2424
* xref:../../hosted_control_planes/hcp-prepare/hcp-sizing-guidance.adoc#hcp-shared-infra_hcp-sizing-guidance[Shared infrastructure between hosted and standalone control planes]
25+
26+
include::modules/hcp-cidr-ranges.adoc[leveloffset=+1]
27+
28+
[role="_additional-resources"]
29+
.Additional resources
30+
31+
* xref:../../networking/cidr-range-definitions.adoc#cidr-range-definitions[CIDR range definitions]

modules/hcp-cidr-ranges.adoc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * hosted_control_planes/hcp-prepare/hcp-requirements.adoc
4+
5+
:_mod-docs-content-type: REFERENCE
6+
[id="hcp-cidr-ranges_{context}"]
7+
= CIDR ranges for {hcp}
8+
9+
For deploying {hcp} on {product-title}, use the following required Classless Inter-Domain Routing (CIDR) subnet ranges:
10+
11+
* `v4InternalSubnet`: 100.65.0.0/16 (OVN-Kubernetes)
12+
* `clusterNetwork`: 10.132.0.0/14 (pod network)
13+
* `serviceNetwork`: 172.31.0.0/16
14+
15+
16+
For more information about {product-title} CIDR range definitions, see "CIDR range definitions".

networking/cidr-range-definitions.adoc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ endif::openshift-dedicated,openshift-rosa[]
99

1010
toc::[]
1111

12-
If your cluster uses OVN-Kubernetes, you must specify non-overlapping ranges for Classless Inter-Domain Routing (CIDR) subnet ranges.
12+
If your cluster uses OVN-Kubernetes, you must specify non-overlapping ranges for Classless Inter-Domain Routing (CIDR) subnet ranges.
1313

1414
[IMPORTANT]
1515
====
@@ -18,9 +18,9 @@ For {product-title} 4.17 and later versions, clusters use `169.254.0.0/17` for I
1818

1919
The following subnet types and are mandatory for a cluster that uses OVN-Kubernetes:
2020

21-
* Join: Uses a join switch to connect gateway routers to distributed routers. A join switch reduces the number of IP addresses for a distributed router. For a cluster that uses the OVN-Kubernetes plugin, an IP address from a dedicated subnet is assigned to any logical port that attaches to the join switch.
21+
* Join: Uses a join switch to connect gateway routers to distributed routers. A join switch reduces the number of IP addresses for a distributed router. For a cluster that uses the OVN-Kubernetes plugin, an IP address from a dedicated subnet is assigned to any logical port that attaches to the join switch.
2222
* Masquerade: Prevents collisions for identical source and destination IP addresses that are sent from a node as hairpin traffic to the same node after a load balancer makes a routing decision.
23-
* Transit: A transit switch is a type of distributed switch that spans across all nodes in the cluster. A transit switch routes traffic between different zones. For a cluster that uses the OVN-Kubernetes plugin, an IP address from a dedicated subnet is assigned to any logical port that attaches to the transit switch.
23+
* Transit: A transit switch is a type of distributed switch that spans across all nodes in the cluster. A transit switch routes traffic between different zones. For a cluster that uses the OVN-Kubernetes plugin, an IP address from a dedicated subnet is assigned to any logical port that attaches to the transit switch.
2424
2525
[NOTE]
2626
====
@@ -121,4 +121,7 @@ endif::openshift-rosa,openshift-dedicated[]
121121
122122
ifdef::openshift-enterprise[]
123123
For example, if the host prefix is set to `/23`, each machine is assigned a `/23` subnet from the pod CIDR address range. The default is `/23`, allowing 510 cluster nodes, and 510 pod IP addresses per node.
124-
endif::openshift-enterprise[]
124+
endif::openshift-enterprise[]
125+
126+
127+
include::modules/hcp-cidr-ranges.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)