From 1b4ccf4e65dea09515b0145b8c49cf4b69777539 Mon Sep 17 00:00:00 2001 From: Frances_McDonald Date: Thu, 14 Aug 2025 11:47:09 +0100 Subject: [PATCH] removing hcp module for classic fixing pr link errors fixing pr link error fixing pr hcp link error fixing pr rosa link fing dup in add recources in assembly hcp upgrading applying review comments applying review comment applying review comm fix table fix tables fix tabl fix tab fix ta --- _topic_maps/_topic_map_rosa.yml | 2 -- modules/rosa-hcp-upgrade-options.adoc | 2 +- .../rosa-hcp-upgrading-cli-control-plane.adoc | 4 ++-- rosa_architecture/about-hcp.adoc | 9 +++++--- rosa_hcp/rosa-hcp-egress-zero-install.adoc | 6 ++++-- upgrading/rosa-hcp-upgrading.adoc | 21 ++++--------------- welcome/about-hcp.adoc | 8 +++---- 7 files changed, 21 insertions(+), 31 deletions(-) diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml index 8b2ce4076c..5b72ebc9fc 100644 --- a/_topic_maps/_topic_map_rosa.yml +++ b/_topic_maps/_topic_map_rosa.yml @@ -728,8 +728,6 @@ Name: Upgrading Dir: upgrading Distros: openshift-rosa Topics: -- Name: Upgrading ROSA with HCP clusters - File: rosa-hcp-upgrading - Name: Upgrading ROSA Classic clusters File: rosa-upgrading-sts --- diff --git a/modules/rosa-hcp-upgrade-options.adoc b/modules/rosa-hcp-upgrade-options.adoc index 7042be574f..ef1aae47d4 100644 --- a/modules/rosa-hcp-upgrade-options.adoc +++ b/modules/rosa-hcp-upgrade-options.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: CONCEPT [id="rosa-upgrade-options_{context}"] -= Upgrade options for {hcp-title} clusters += Upgrade options for {product-title} clusters In OpenShift, upgrading means provisioning a new component with updated software and using it to replace an existing component that has outdated software. diff --git a/modules/rosa-hcp-upgrading-cli-control-plane.adoc b/modules/rosa-hcp-upgrading-cli-control-plane.adoc index 920f45b4ed..65541b1fe2 100644 --- a/modules/rosa-hcp-upgrading-cli-control-plane.adoc +++ b/modules/rosa-hcp-upgrading-cli-control-plane.adoc @@ -10,11 +10,11 @@ ifeval::["{context}" != "rosa-hcp-upgrading-whole-cluster"] = Upgrading the hosted control plane with the ROSA CLI -You can manually upgrade the hosted control plane of a {hcp-title} cluster by using the ROSA CLI. This method schedules the control plane for an upgrade if a more recent version is available, either immediately, or at a specified future time. +You can manually upgrade the hosted control plane of a {product-title} cluster by using the ROSA CLI. This method schedules the control plane for an upgrade if a more recent version is available, either immediately, or at a specified future time. [NOTE] ==== -Your control plane only supports machine pools within two minor Y-stream versions. For example, a {hcp-title} cluster with a control plane using version 4.15.z supports machine pools with version 4.13.z and 4.14.z, but the control plane does not support machine pools using version 4.12.z. +Your control plane only supports machine pools within two minor Y-stream versions. For example, a {product-title} cluster with a control plane using version 4.15.z supports machine pools with version 4.13.z and 4.14.z, but the control plane does not support machine pools using version 4.12.z. ==== endif::[] diff --git a/rosa_architecture/about-hcp.adoc b/rosa_architecture/about-hcp.adoc index 67033a4bc6..980d9095d9 100644 --- a/rosa_architecture/about-hcp.adoc +++ b/rosa_architecture/about-hcp.adoc @@ -179,8 +179,8 @@ endif::openshift-rosa-hcp[] ifndef::openshift-rosa-hcp[] xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-about-iam-resources[About IAM resources] endif::openshift-rosa-hcp[] -| link:https://red.ht/rosa-roadmap[ROSA roadmap] +|link:https://red.ht/rosa-roadmap[ROSA roadmap] | ifdef::openshift-rosa-hcp[] link:https://docs.openshift.com/rosa/rosa_architecture/rosa_policy_service_definition/rosa-policy-understand-availability.html#rosa-policy-understand-availability[About availability] @@ -188,13 +188,16 @@ endif::openshift-rosa-hcp[] ifndef::openshift-rosa-hcp[] xref:../../rosa_architecture/rosa_policy_service_definition/rosa-policy-understand-availability.adoc#rosa-policy-understand-availability[About availability] endif::openshift-rosa-hcp[] -| -xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading] +//adding condition to get hcp upgrading PR built +ifdef::openshift-rosa-hcp[] +|xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading] +endif::openshift-rosa-hcp[] | | |=== + [id="Developer"] === Developer diff --git a/rosa_hcp/rosa-hcp-egress-zero-install.adoc b/rosa_hcp/rosa-hcp-egress-zero-install.adoc index 3188f1b5ce..75c30ccfe4 100644 --- a/rosa_hcp/rosa-hcp-egress-zero-install.adoc +++ b/rosa_hcp/rosa-hcp-egress-zero-install.adoc @@ -12,8 +12,10 @@ All public and private clusters with {egress-zero} get their Red{nbsp}Hat contai {egress-zero-title} use AWS ECR to provision your clusters without the need for public internet. Because necessary cluster lifecycle processes occur over AWS private networking, AWS ECR serves as a critical service for core cluster platform images. For more information on AWS ECR, see link:https://aws.amazon.com/ecr/[Amazon Elastic Container Registry]. You can create a fully operational cluster that does not require a public egress by configuring a virtual private cloud (VPC) and using the `--properties zero_egress:true` flag when creating your cluster. - -See xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading {product-title} clusters] to upgrade clusters using {egress-zero}. +//condition out to build pruning PR +ifdef::openshift-rosa-hcp[] +See xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading {product-title} clusters] to upgrade clusters using {egress-zero}. +endif::openshift-rosa-hcp[] [NOTE] ==== diff --git a/upgrading/rosa-hcp-upgrading.adoc b/upgrading/rosa-hcp-upgrading.adoc index 7eb176ed6d..7f5eeb97f0 100644 --- a/upgrading/rosa-hcp-upgrading.adoc +++ b/upgrading/rosa-hcp-upgrading.adoc @@ -1,7 +1,7 @@ :_mod-docs-content-type: ASSEMBLY include::_attributes/attributes-openshift-dedicated.adoc[] [id="rosa-hcp-upgrading"] -= Upgrading {hcp-title} clusters += Upgrading {product-title} clusters :context: rosa-hcp-upgrading toc::[] @@ -9,28 +9,15 @@ toc::[] include::modules/rosa-hcp-upgrade-options.adoc[leveloffset=+1] .Additional resources -ifndef::openshift-rosa-hcp[] * xref:../cli_reference/rosa_cli/rosa-manage-objects-cli.adoc#rosa-edit-machinepool_rosa-managing-objects-cli[ROSA CLI reference: `rosa edit machinepool`] -endif::openshift-rosa-hcp[] -ifdef::openshift-rosa[] -* xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-service-definition[Node lifecycle] -endif::openshift-rosa[] -ifdef::openshift-rosa-hcp[] -* link:https://docs.openshift.com/rosa/cli_reference/rosa_cli/rosa-manage-objects-cli.html#rosa-edit-machinepool_rosa-managing-objects-cli[ROSA CLI reference: `rosa edit machinepool`] -* xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-hcp-service-definition[Node lifecycle] -endif::openshift-rosa-hcp[] +* xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-node-lifecycle_rosa-service-definition[Node lifecycle] //This cannot be a module if we want to use the xrefs [id="rosa-lifecycle-policy_{context}"] == Life cycle policies and planning To plan an upgrade, review the -ifdef::openshift-rosa[] -xref:../rosa_architecture/rosa_policy_service_definition/rosa-life-cycle.adoc#rosa-life-cycle[{product-title} update life cycle]. -endif::openshift-rosa[] -ifdef::openshift-rosa-hcp[] -xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} update life cycle]. -endif::openshift-rosa-hcp[] +xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{product-title} update life cycle]. The life cycle page includes release definitions, support and upgrade requirements, installation policy information and life cycle dates. @@ -39,7 +26,7 @@ Upgrades are manually initiated or automatically scheduled. Red Hat Site Reliabi //The following note should be removed when the entire HCP fleet is confirmed multi-arch [NOTE] ==== -If your control plane is not currently multi-architecture enabled, the upgrade process will first migrate the cluster to a multi-architecture image and then apply the version upgrade. Multi-architecture clusters are capable of running both x86-based and Arm-based workloads. Clusters created after 25 July, 2024 are multi-architecture enabled by default. +If your control plane is not currently multi-architecture enabled, the upgrade process will first migrate the cluster to a multi-architecture image and then apply the version upgrade. Multi-architecture clusters are capable of running both x86-based and Arm-based workloads. Clusters created after 25 July, 2024 are multi-architecture enabled by default. ==== include::modules/rosa-hcp-upgrading-cli-control-plane.adoc[leveloffset=+1] diff --git a/welcome/about-hcp.adoc b/welcome/about-hcp.adoc index 5074a8cf7a..d78b39ef72 100644 --- a/welcome/about-hcp.adoc +++ b/welcome/about-hcp.adoc @@ -65,10 +65,10 @@ Use the following sections to find content to help you learn about and use {hcp- | xref:../backup_and_restore/application_backup_and_restore/oadp-intro.adoc#oadp-api[Back up and restore] | | - -| -| xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading] -| +//adding condition to get hcp upgrading PR built +ifdef::openshift-rosa-hcp[] +xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading] +endif::openshift-rosa-hcp[] | |===