Skip to content

Commit b5479ff

Browse files
committed
[enterprise-4.16] OCPBUGS#55102: Include reserved HCP CIDR ranges
1 parent 974c493 commit b5479ff

File tree

4 files changed

+39
-13
lines changed

4 files changed

+39
-13
lines changed

hosted_control_planes/hcp-getting-started.adoc

+14-9
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ You can view the procedures by selecting from one of the following providers:
1818
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-cluster-workload-distributing[Distributing hosted cluster workloads]
1919
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#firewall-port-reqs-bare-metal[Bare metal firewall and port requirements]
2020
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#infrastructure-reqs-bare-metal[Bare metal infrastructure requirements]: Review the infrastructure requirements to create a hosted cluster on bare metal.
21+
* xref:../hosted_control_planes/hcp-getting-started.adoc#hcp-cidr-ranges_hcp-getting-started[CIDR ranges for {hcp}]
2122
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#configuring-hosting-service-cluster-configure-bm[Configuring hosted control plane clusters on bare metal]:
2223
** Configure DNS
2324
** Create a hosted cluster and verify cluster creation
@@ -33,7 +34,8 @@ You can view the procedures by selecting from one of the following providers:
3334
== {VirtProductName}
3435

3536
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-sizing-guidance[Hosted control plane sizing guidance]
36-
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-install-cli[Installing the hosted control plane command line interface]
37+
* xref:../hosted_control_planes/hcp-getting-started.adoc#hcp-cidr-ranges_hcp-getting-started[CIDR ranges for {hcp}]
38+
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-install-cli[Installing the hosted control plane command-line interface]
3739
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-cluster-workload-distributing[Distributing hosted cluster workloads]
3840
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-control-planes-manage-kubevirt[Managing hosted control plane clusters on OpenShift Virtualization]: Create {product-title} clusters with worker nodes that are hosted by KubeVirt virtual machines.
3941
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#configure-hosted-disconnected[Configuring {hcp} in a disconnected environment]
@@ -45,6 +47,7 @@ You can view the procedures by selecting from one of the following providers:
4547
== {aws-first}
4648

4749
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosting-cluster-aws-infra-reqs[AWS infrastructure requirements]: Review the infrastructure requirements to create a hosted cluster on {aws-short}.
50+
* xref:../hosted_control_planes/hcp-getting-started.adoc#hcp-cidr-ranges_hcp-getting-started[CIDR ranges for {hcp}]
4851
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosting-service-cluster-configure-aws[Configuring hosted control plane clusters on AWS]: The tasks to configure hosted control plane clusters on {aws-short} include creating the {aws-short} S3 OIDC secret, creating a routable public zone, enabling external DNS, enabling {aws-short} PrivateLink, and deploying a hosted cluster.
4952
* xref:../networking/networking_operators/sr-iov-operator/configuring-sriov-operator.adoc#sriov-operator-hosted-control-planes_configuring-sriov-operator[Deploying the SR-IOV Operator for {hcp}]: After you configure and deploy your hosting service cluster, you can create a subscription to the Single Root I/O Virtualization (SR-IOV) Operator on a hosted cluster. The SR-IOV pod runs on worker machines rather than the control plane.
5053

@@ -57,7 +60,8 @@ You can view the procedures by selecting from one of the following providers:
5760
:FeatureName: {hcp-capital} on the {ibm-z-title} platform
5861
include::snippets/technology-preview.adoc[]
5962

60-
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-install-cli[Installing the hosted control plane command line interface]
63+
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-install-cli[Installing the hosted control plane command-line interface]
64+
* xref:../hosted_control_planes/hcp-getting-started.adoc#hcp-cidr-ranges_hcp-getting-started[CIDR ranges for {hcp}]
6165
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#configuring-hosting-service-cluster-ibmz[Configuring the hosting cluster on x86 bare metal for IBM Z compute nodes (Technology Preview)]
6266

6367
[id="hcp-getting-started-ibmpower"]
@@ -66,17 +70,18 @@ include::snippets/technology-preview.adoc[]
6670
:FeatureName: {hcp-capital} on the {ibm-power-title} platform
6771
include::snippets/technology-preview.adoc[]
6872

69-
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-install-cli[Installing the hosted control plane command line interface]
70-
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#config-hosted-service-ibmpower[Configuring the hosting cluster on a 64-bit x86 OpenShift Container Platform cluster to create {hcp} for IBM Power compute nodes (Technology Preview)]
73+
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-install-cli[Installing the hosted control plane command-line interface]
74+
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#config-hosted-service-ibmpower[Configuring the hosting cluster on a 64-bit x86 {product-title} cluster to create {hcp} for IBM Power compute nodes (Technology Preview)]
7175

7276
[id="hcp-getting-started-non-bm-agent"]
73-
== Non bare metal agent machines
77+
== Non-bare-metal agent machines
7478

75-
:FeatureName: {hcp-capital} clusters using non bare metal agent machines
79+
:FeatureName: {hcp-capital} clusters using non-bare-metal agent machines
7680
include::snippets/technology-preview.adoc[]
7781

78-
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-install-cli[Installing the hosted control plane command line interface]
79-
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#configuring-hosting-service-cluster-configure-agent-non-bm[Configuring hosted control plane clusters using non bare metal agent machines (Technology Preview)]
82+
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hosted-install-cli[Installing the hosted control plane command-line interface]
83+
* xref:../hosted_control_planes/hcp-getting-started.adoc#hcp-cidr-ranges_hcp-getting-started[CIDR ranges for {hcp}]
84+
* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#configuring-hosting-service-cluster-configure-agent-non-bm[Configuring hosted control plane clusters using non-bare-metal agent machines (Technology Preview)]
8085

81-
* To destroy a hosted cluster on non bare metal agent machines, follow the instructions in link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hypershift-cluster-destroy-non-bm[Destroying a hosted cluster on non bare metal agent machines]
86+
* To destroy a hosted cluster on non bare metal agent machines, follow the instructions in link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#hypershift-cluster-destroy-non-bm[Destroying a hosted cluster on non-bare-metal agent machines]
8287
* If you want to disable the hosted control plane feature, see link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.11/html/clusters/cluster_mce_overview#disable-hosted-control-planes[Disabling the hosted control plane feature].
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * hosted_control_planes/hcp-getting-started.adoc
4+
5+
:_mod-docs-content-type: CONCEPT
6+
[id="hcp-cidr-ranges_{context}"]
7+
= CIDR ranges for {hcp}
8+
9+
For deploying {hcp} on {product-title}, consider 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+
To know {product-title} CIDR range definitions, see xref:../../networking/cidr-range-definitions.adoc#cidr-range-definitions[CIDR range definitions].

modules/hcp-cidr-ranges.adoc

Whitespace-only changes.

networking/cidr-range-definitions.adoc

+10-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ 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
The following subnet types are mandatory for a cluster that uses OVN-Kubernetes:
1515

16-
* 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.
16+
* 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.
1717
* 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.
18-
* 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.
18+
* 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.
1919
2020
[NOTE]
2121
====
@@ -40,6 +40,12 @@ OVN-Kubernetes, the default network provider in {product-title} 4.14 and later v
4040
The previous list includes join, transit, and masquerade IPv4 and IPv6 address subnets. If your cluster uses OVN-Kubernetes, do not include any of these IP address subnet ranges in any other CIDR definitions in your cluster or infrastructure.
4141
====
4242

43+
For {hcp} on {product-title}, consider the following required CIDR ranges:
44+
45+
* `v4InternalSubnet`: 100.65.0.0/16 (OVN-Kubernetes)
46+
* `clusterNetwork`: 10.132.0.0/14 (pod network)
47+
* `serviceNetwork`: 172.31.0.0/16
48+
4349
ifndef::openshift-rosa,openshift-dedicated[]
4450
[role="_additional-resources"]
4551
.Additional resources
@@ -115,4 +121,4 @@ endif::openshift-rosa,openshift-dedicated[]
115121
116122
ifdef::openshift-enterprise[]
117123
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.
118-
endif::openshift-enterprise[]
124+
endif::openshift-enterprise[]

0 commit comments

Comments
 (0)