Revert "Revert "[OSDOCS-14494]Prune "Introduction to ROSA"""

_topic_maps/_topic_map_rosa.yml

@@ -63,12 +63,12 @@ Topics:
     File: rosa-instance-types
   - Name: ROSA update life cycle
     File: rosa-life-cycle
-  - Name: ROSA with HCP service definition
-    File: rosa-hcp-service-definition
-  - Name: ROSA with HCP instance types
-    File: rosa-hcp-instance-types
-  - Name: ROSA with HCP update life cycle
-    File: rosa-hcp-life-cycle
+#  - Name: ROSA with HCP service definition
+#    File: rosa-hcp-service-definition
+#  - Name: ROSA with HCP instance types
+#    File: rosa-hcp-instance-types
+#  - Name: ROSA with HCP update life cycle
+#    File: rosa-hcp-life-cycle
   - Name: Understanding security for ROSA
     File: rosa-policy-process-security
   - Name: SRE and service account access

architecture/rosa-architecture-models.adoc

@@ -16,8 +16,11 @@ include::modules/rosa-hcp-classic-comparison.adoc[leveloffset=+1]
 
 .Additional resources
 
+ifdef::openshift-rosa-hcp[]
 * xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-regions-az_rosa-hcp-service-definition[Regions and availability zones]
 
+endif::openshift-rosa-hcp[]
+
 * xref:../rosa_architecture/rosa_policy_service_definition/rosa-policy-process-security.adoc#rosa-policy-security-regulation-compliance_rosa-policy-process-security[Security and regulation compliance]
 
 include::modules/rosa-hcp-architecture.adoc[leveloffset=+1]

rosa_architecture/about-hcp.adoc

@@ -75,9 +75,9 @@ endif::openshift-rosa-hcp[]
 ifndef::openshift-rosa-hcp[]
 xref:../backup_and_restore/application_backup_and_restore/oadp-intro.adoc#oadp-api[Back up and restore]
 endif::openshift-rosa-hcp[]
-|
+ifdef::openshift-rosa-hcp[]|
 xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle]
-|
+endif::openshift-rosa-hcp[]|
 ifdef::openshift-rosa-hcp[]
 link:https://docs.openshift.com/rosa/architecture/rosa-architecture-models.html#rosa-architecture-models[{hcp-title} architecture]
 endif::openshift-rosa-hcp[]
@@ -91,9 +91,11 @@ endif::openshift-rosa-hcp[]
 ifndef::openshift-rosa-hcp[]
 xref:../../rosa_architecture/rosa_policy_service_definition/rosa-policy-process-security.adoc#rosa-policy-process-security[Understanding process and security]
 endif::openshift-rosa-hcp[]
-|
+
+ifdef::openshift-rosa-hcp[]
 xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-hcp-service-definition[{hcp-title} service definition]
-|
+
+endif::openshift-rosa-hcp[]
 xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[Updates lifecycle]
 |
 // Removed as part of OSDOCS-13310, until figures are verified.
@@ -156,9 +158,11 @@ endif::openshift-rosa-hcp[]
 ifndef::openshift-rosa-hcp[]
 xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
 endif::openshift-rosa-hcp[]
-|
+
+ifdef::openshift-rosa-hcp[]
 xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle]
-|
+endif::openshift-rosa-hcp[]
+
 ifdef::openshift-rosa-hcp[]
 link:https://docs.openshift.com/rosa/rosa_architecture/rosa_policy_service_definition/rosa-policy-responsibility-matrix.html#rosa-policy-responsibility-matrix[ROSA responsibility matrix]
 endif::openshift-rosa-hcp[]

rosa_planning/rosa-hcp-aws-prereqs.adoc

@@ -23,7 +23,7 @@ include::modules/rosa-sts-aws-requirements-support-req.adoc[leveloffset=+2]
 //TODO OSDOCS-11789: Need to have this re-validated by SRE/Support
 include::modules/rosa-sts-aws-requirements-security-req.adoc[leveloffset=+2]
 
-//Adding conditions around these in case the Additional resources don't get ported to HCP or have different file names / locations; keeping all included for now 
+//Adding conditions around these in case the Additional resources don't get ported to HCP or have different file names / locations; keeping all included for now
 [role="_additional-resources"]
 [id="additional-resources_aws-security-requirements_{context}"]
 .Additional resources
@@ -87,4 +87,6 @@ include::modules/rosa-hcp-firewall-prerequisites.adoc[leveloffset=+2]
 [id="additional-resources_aws-prerequisites_{context}"]
 == Additional resources
 * xref:../rosa_architecture/rosa_policy_service_definition/rosa-sre-access.adoc#rosa-sre-access[SRE and service account access]
-* xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-hcp-instance-types[Instance types]
+ifdef::openshift-rosa-hcp[]
+* xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-hcp-instance-types[Instance types]
+endif::openshift-rosa-hcp[]

rosa_release_notes/rosa-release-notes.adoc

@@ -115,7 +115,7 @@ endif::openshift-rosa[]
 //* **Egress zero is now generally available on {product-title} clusters.** 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. For more information, see xref:../rosa_hcp/rosa-hcp-egress-zero-install.adoc#rosa-hcp-egress-zero-install[Creating a {egress-zero-title}].
 //endif::openshift-rosa-hcp[]
 
-//Commenting this out as is repeated above, although version type is slightly different.Out of scope for Whats new pruning task. Will investigate separately. 
+//Commenting this out as is repeated above, although version type is slightly different.Out of scope for Whats new pruning task. Will investigate separately.
 //* **{product-title} SDN network plugin blocks future major upgrades**
 //* **Initiate live migration from OpenShift SDN to OVN-Kubernetes.**
 //As part of the {product-title} move to OVN-Kubernetes as the only supported network plugin starting with {product-title} version 4.17, users can now initiate live migration from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin.
@@ -175,6 +175,10 @@ ifdef::openshift-rosa-hcp[]
 * **{product-title} Graviton Arm-based instance types.** You can now use {AWS} Arm-based Graviton instance types for your workloads in {product-title} clusters created after 24 July, 2024. For more information, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-sdpolicy-aws-instance-types-graviton_rosa-hcp-instance-types[AWS Graviton Arm-based instance types].
 endif::openshift-rosa-hcp[]
 
+* **Upgrade multiple nodes simultaneously.** You can now configure a machine pool to upgrade multiple nodes simultaneously. Two new machine pool parameters, `max-surge` and `max-unavailable`, give you greater control over how machine pool upgrades occur. For more information, see xref:../upgrading/rosa-hcp-upgrading.adoc#rosa-hcp-upgrading[Upgrading {hcp-title} clusters].
+ifdef::openshift-rosa-hcp[]
+* **{hcp-title} Graviton Arm-based instance types.** You can now use {AWS} Arm-based Graviton instance types for your workloads in {hcp-title-first} clusters created after 24 July, 2024. For more information, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-sdpolicy-aws-instance-types-graviton_rosa-hcp-instance-types[AWS Graviton Arm-based instance types].
+endif::openshift-rosa-hcp[]
 * **ROSA CLI update.** The ROSA CLI (`rosa`) was updated to a new version. For information about what has changed in this release, see the link:https://github.com/openshift/rosa/releases/tag/v1.2.42[ROSA CLI release notes]. For more information about the ROSA CLI (`rosa`), see xref:../cli_reference/rosa_cli/rosa-get-started-cli.adoc#rosa-about_rosa-getting-started-cli[About the ROSA CLI].
 
 [id="rosa-q2-2024_{context}"]
@@ -200,6 +204,8 @@ ifdef::openshift-rosa[]
 endif::openshift-rosa[]
 ifdef::openshift-rosa-hcp[]
 * **{product-title} regions added.** {product-title} is now available in the following regions:
+ifdef::openshift-rosa-hcp[]
+* **{hcp-title} regions added.** {hcp-title-first} is now available in the following regions:
 +
 ** Zurich (`eu-central-2`)
 ** Hong Kong (`ap-east-1`)
@@ -211,6 +217,8 @@ For more information on region availabilities, see xref:../rosa_architecture/ros
 
 * **Added support for external authentication providers.** You can now create clusters configured with external authentication providers, such as Microsoft Entra ID and KeyCloak. For more information, see xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-ext-auth.adoc#rosa-hcp-sts-creating-a-cluster-ext-auth[Creating {product-title} clusters with external authentication].
 endif::openshift-rosa-hcp[]
+endif::openshift-rosa-hcp[]
+* **Added support for external authentication providers.** You can now create clusters configured with external authentication providers, such as Microsoft Entra ID and KeyCloak. For more information, see xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-ext-auth.adoc#rosa-hcp-sts-creating-a-cluster-ext-auth[Creating ROSA with HCP clusters with external authentication].
 
 * **Longer cluster names enhancement.** You can now specify a cluster name that is longer than 15 characters. For cluster names that are longer than 15 characters, you can customize the domain prefix for the cluster URL by using the `domain-prefix` flag in the ROSA CLI (`rosa`) or by selecting the **Create custom domain prefix** checkbox in the {hybrid-console}. For more information, see xref:../cli_reference/rosa_cli/rosa-manage-objects-cli.adoc#rosa-create-cluster-command_rosa-managing-objects-cli[create cluster in Managing objects with the ROSA CLI].
 
@@ -297,13 +305,16 @@ ifdef::openshift-rosa[]
 * **Machine pool update.** You can now add taints to the machine pool that is automatically generated during cluster creation. You can also delete this machine pool. This new feature provides more flexibility and cost-effectiveness for cluster administrators, specifically in regards to scaling infrastructure based on changing resource requirements. For more information, see xref:../rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc#creating_a_machine_pool_rosa-managing-worker-nodes[Creating a machine pool].
 
 * **{product-title} regions added.** {product-title} is now available in the following regions:
+ifdef::openshift-rosa-hcp[]
+* **ROSA regions added.** {product-title} (ROSA) is now available in the following regions:
 +
 ** Spain (`eu-south-2`)
 ** Hyderabad (`ap-south-2`)
 ** Melbourne (`ap-southeast-4`)
 ** Zurich (`eu-central-2`)
 +
 For more information on region availabilities, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-regions-az_rosa-service-definition[Regions and availability zones].
+endif::openshift-rosa-hcp[]
 
 * **Documentation update.** The CLI Tools section was added to the ROSA documentation and includes more detailed information to help you fully use all of the supported CLI tools. The ROSA CLI section can now be found nested inside the CLI Tools heading. For more information, see xref:../cli_reference/index.adoc[CLI tools overview].
 
@@ -315,6 +326,12 @@ For more information on region availabilities, see xref:../rosa_architecture/ros
 * **ROSA CLI update.** The ROSA CLI (`rosa`) was updated to a new version. For information about what has changed in this release, see the link:https://github.com/openshift/rosa/releases/tag/v1.2.23[ROSA CLI release notes]. For more information about the ROSA CLI (`rosa`), see xref:../cli_reference/rosa_cli/rosa-get-started-cli.adoc#rosa-about_rosa-getting-started-cli[About the ROSA CLI].
 
 * **{product-title}  region added.** {product-title} is now available in the United Arab Emirates (`me-central-1`) region. For more information on region availability, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-regions-az_rosa-service-definition[Regions and availability zones].
+ifdef::openshift-rosa-hcp[]
+* **ROSA region added.** {product-title} (ROSA) is now available in the United Arab Emirates (`me-central-1`) region. For more information on region availability, see xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-regions-az_rosa-service-definition[Regions and availability zones].
+endif::openshift-rosa-hcp[]
+include::snippets/rosa-hcp-rn.adoc[leveloffset=+1]
+:featureName: ROSA with HCP
+include::snippets/technology-preview.adoc[leveloffset=+1]
 
 [id="rosa-q1-2023_{context}"]
 === Q1 2023

welcome/about-hcp.adoc

@@ -32,12 +32,13 @@ Use the following sections to find content to help you learn about and use {hcp-
 
 | xref:../architecture/index.adoc#architecture-overview[Architecture overview]
 | xref:../backup_and_restore/application_backup_and_restore/oadp-intro.adoc#oadp-api[Back up and restore]
+ifdef::openshift-rosa-hcp[]
 | xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle]
-
+endif::openshift-rosa-hcp[]
 | xref:../architecture/rosa-architecture-models.adoc#rosa-architecture-models[{hcp-title} architecture]
-|
+ifdef::openshift-rosa-hcp[]
 | xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-hcp-service-definition[{hcp-title} service definition]
-
+endif::openshift-rosa-hcp[]
 |
 |
 | xref:../support/index.adoc#support-overview[Getting support]
@@ -59,9 +60,10 @@ Use the following sections to find content to help you learn about and use {hcp-
 | link:https://learn.openshift.com/?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[OpenShift Interactive Learning Portal]
 | xref:../storage/index.adoc#storage-overview[Storage]
 | xref:../observability/monitoring/about-ocp-monitoring/about-ocp-monitoring.adoc#about-ocp-monitoring[About {product-title} monitoring]
+ifdef::openshift-rosa-hcp[]
 | xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle]
-
-| 
+endif::openshift-rosa-hcp[]
+|
 | xref:../backup_and_restore/application_backup_and_restore/oadp-intro.adoc#oadp-api[Back up and restore]
 |
 |