Skip to content

Commit ae347f3

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

File tree

3 files changed

+45
-17
lines changed

3 files changed

+45
-17
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].

modules/hcp-cidr-ranges.adoc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
To know {product-title} CIDR range definitions, see xref:../../networking/cidr-range-definitions.adoc#cidr-range-definitions[CIDR range definitions].

networking/cidr-range-definitions.adoc

+17-8
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
====
@@ -47,7 +47,7 @@ ifndef::openshift-rosa,openshift-dedicated[]
4747
* For more information about configuring join subnets or transit subnets, see xref:../networking/ovn_kubernetes_network_provider/configure-ovn-kubernetes-subnets.adoc#configure-ovn-kubernetes-subnets[Configuring OVN-Kubernetes internal IP address subnets].
4848
endif::openshift-rosa,openshift-dedicated[]
4949
50-
[id="machine-cidr-description"]
50+
[id="machine-cidr-description_{context}"]
5151
== Machine CIDR
5252

5353
In the Machine classless inter-domain routing (CIDR) field, you must specify the IP address range for machines or cluster nodes.
@@ -77,15 +77,15 @@ ifndef::openshift-rosa,openshift-dedicated[]
7777
* xref:../networking/networking_operators/cluster-network-operator.adoc#nw-operator-cr_cluster-network-operator[Cluster Network Operator configuration]
7878
endif::[]
7979
80-
[id="service-cidr-description"]
80+
[id="service-cidr-description_{context}"]
8181
== Service CIDR
8282
In the Service CIDR field, you must specify the IP address range for services.
8383
ifdef::openshift-rosa,openshift-dedicated[]
8484
It is recommended, but not required, that the address block is the same between clusters. This will not create IP address conflicts.
8585
endif::openshift-rosa,openshift-dedicated[]
8686
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`.
8787

88-
[id="pod-cidr-description"]
88+
[id="pod-cidr-description_{context}"]
8989
== Pod CIDR
9090
In the pod CIDR field, you must specify the IP address range for pods.
9191

@@ -105,14 +105,23 @@ You can expand the range after cluster installation.
105105
* xref:../networking/configuring-cluster-network-range.adoc#configuring-cluster-network-range[Configuring the cluster network range]
106106
endif::openshift-enterprise[]
107107

108-
[id="host-prefix-description"]
108+
[id="host-prefix-description_{context}"]
109109
== Host Prefix
110110
In the Host Prefix field, you must specify the subnet prefix length assigned to pods scheduled to individual machines. The host prefix determines the pod IP address pool for each machine.
111111

112+
[id="hcp-cidr-description_{context}"]
113+
== {hcp-capital} CIDR
114+
115+
For {hcp} on {product-title}, consider the following required CIDR ranges:
116+
117+
* `v4InternalSubnet`: 100.65.0.0/16 (OVN-Kubernetes)
118+
* `clusterNetwork`: 10.132.0.0/14 (pod network)
119+
* `serviceNetwork`: 172.31.0.0/16
120+
112121
ifdef::openshift-rosa,openshift-dedicated[]
113122
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 512 cluster nodes, and 512 pods per node (both of which are beyond our maximum supported).
114123
endif::openshift-rosa,openshift-dedicated[]
115124

116125
ifdef::openshift-enterprise[]
117126
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[]
127+
endif::openshift-enterprise[]

0 commit comments

Comments
 (0)