diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index c5a34b6246..6f355d3c64 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -764,8 +764,6 @@ Topics: File: updating-hardware-on-nodes-running-on-vsphere - Name: Migrating to a cluster with multi-architecture compute machines File: migrating-to-multi-payload - - Name: Updating hosted control planes - File: updating-hosted-control-planes - Name: Updating the boot loader on Red Hat Enterprise Linux CoreOS nodes using bootupd File: updating-bootloader-rhcos Distros: openshift-enterprise diff --git a/modules/configuring-node-pools-for-hcp.adoc b/modules/configuring-node-pools-for-hcp.adoc index 97bbeffbc3..42c3c1cdc3 100644 --- a/modules/configuring-node-pools-for-hcp.adoc +++ b/modules/configuring-node-pools-for-hcp.adoc @@ -1,6 +1,5 @@ // Module included in the following assemblies: // -// * updates/updating_a_cluster/updating-hosted-control-planes.adoc // * hosted_control_planes/hcp-machine-config.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/hcp-update-node-pools.adoc b/modules/hcp-update-node-pools.adoc index 51cd8d577e..ac9bc58b37 100644 --- a/modules/hcp-update-node-pools.adoc +++ b/modules/hcp-update-node-pools.adoc @@ -1,6 +1,5 @@ // Module included in the following assemblies: // -// * updates/updating_a_cluster/updating-hosted-control-planes.adoc // * hosted_control_planes/hcp-updating.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/hcp-update-ocp-hc.adoc b/modules/hcp-update-ocp-hc.adoc index 2a01fb3c2c..ff89597951 100644 --- a/modules/hcp-update-ocp-hc.adoc +++ b/modules/hcp-update-ocp-hc.adoc @@ -1,6 +1,5 @@ // Module included in the following assemblies: // -// * upgrades/updating_a_cluster/updating-hosted-control-planes.adoc // * hosted_control_planes/hcp-updating.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/hcp-updates-hosted-cluster.adoc b/modules/hcp-updates-hosted-cluster.adoc index 0816385ab3..257735a3c6 100644 --- a/modules/hcp-updates-hosted-cluster.adoc +++ b/modules/hcp-updates-hosted-cluster.adoc @@ -1,6 +1,5 @@ // Module included in the following assemblies: // -// * updates/updating_a_cluster/updating-hosted-control-planes.adoc // * hosted_control_planes/hcp-updating.adoc :_mod-docs-content-type: CONCEPT diff --git a/modules/hcp-updates-node-pools.adoc b/modules/hcp-updates-node-pools.adoc index 73509ce6c5..e32f66fd4d 100644 --- a/modules/hcp-updates-node-pools.adoc +++ b/modules/hcp-updates-node-pools.adoc @@ -1,6 +1,5 @@ // Module included in the following assemblies: // -// * updates/updating_a_cluster/updating-hosted-control-planes.adoc // * hosted_control_planes/hcp-updating.adoc :_mod-docs-content-type: CONCEPT diff --git a/updating/index.adoc b/updating/index.adoc index 3df8753985..d92f585c72 100644 --- a/updating/index.adoc +++ b/updating/index.adoc @@ -76,7 +76,7 @@ Version {product-version} of {product-title} requires VMware virtual hardware ve [id="updating-clusters-overview-hosted-control-planes"] == Updating {hcp} -xref:../updating/updating_a_cluster/updating-hosted-control-planes.adoc#updating-hosted-control-planes[Updating {hcp}]: On {hcp} for {product-title}, updates are decoupled between the control plane and the nodes. Your service cluster provider, which is the user that hosts the cluster control planes, can manage the updates as needed. The hosted cluster handles control plane updates, and node pools handle node updates. For more information, see the following information: +xref:../hosted_control_planes/hcp-updating.adoc#hcp-updating_hcp-updating[Updating {hcp}]: On {hcp} for {product-title}, updates are decoupled between the control plane and the nodes. Your service cluster provider, which is the user that hosts the cluster control planes, can manage the updates as needed. The hosted cluster handles control plane updates, and node pools handle node updates. For more information, see the following information: -* xref:../updating/updating_a_cluster/updating-hosted-control-planes.adoc#updates-for-hosted-control-planes_updating-hosted-control-planes[Updates for {hcp}] -* xref:../updating/updating_a_cluster/updating-hosted-control-planes.adoc#updating-node-pools-for-hcp_updating-hosted-control-planes[Updating node pools for {hcp}] +* xref:../hosted_control_planes/hcp-updating.adoc#hcp-updates-hosted-cluster_hcp-updating[Updates for the hosted cluster] +* xref:../hosted_control_planes/hcp-updating.adoc#hcp-update-node-pools_hcp-updating[Updating node pools in a hosted cluster] \ No newline at end of file diff --git a/updating/updating_a_cluster/updating-hosted-control-planes.adoc b/updating/updating_a_cluster/updating-hosted-control-planes.adoc deleted file mode 100644 index 252821d001..0000000000 --- a/updating/updating_a_cluster/updating-hosted-control-planes.adoc +++ /dev/null @@ -1,22 +0,0 @@ -:_mod-docs-content-type: ASSEMBLY -[id="updating-hosted-control-planes"] -include::_attributes/common-attributes.adoc[] -= Updating {hcp} -:context: updating-hosted-control-planes - -toc::[] - -//// -WARNING: This assembly has been moved into a subdirectory for 4.14+. Changes to this assembly for earlier versions should be done in separate PRs based off of their respective version branches. Otherwise, your cherry picks may fail. - -To do: Remove this comment once 4.13 docs are EOL. -//// - -On {hcp} for {product-title}, updates are decoupled between the control plane and the nodes. Your service cluster provider, which is the user that hosts the cluster control planes, can manage the updates as needed. The hosted cluster handles control plane updates, and node pools handle node updates. - -include::modules/hcp-updates-hosted-cluster.adoc[leveloffset=+1] - -include::modules/hcp-updates-node-pools.adoc[leveloffset=+1] - -// Configuring node pools for hosted control planes -include::modules/configuring-node-pools-for-hcp.adoc[leveloffset=+1]