Upgrading ROSA with HCP updates

Author: EricPonvelle

_topic_maps/_topic_map_rosa_hcp.yml

@@ -26,6 +26,8 @@ Name: Introduction to ROSA
 Dir: rosa_architecture
 Distros: openshift-rosa-hcp
 Topics:
+- Name: Welcome
+  File: index
 - Name: Legal notice
   File: legal-notice
 - Name: ROSA with HCP overview

rosa_architecture/about-hcp.adoc

@@ -8,6 +8,8 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
 //IMPORTANT!!!
 //This page includes information from "Understanding ROSA" (rosa-architecture-rosa-understanding) and "What is ROSA" (cloud-experts-getting-started-what-is-rosa). I have intentionally deleted those two modules from the HCP topic map in an effort to condense our introductory materials.
 
+
+
 toc::[]
 
 ROSA is a fully-managed turnkey application platform that allows you to focus on what matters most, delivering value to your customers by building and deploying applications. Red{nbsp}Hat and AWS SRE experts manage the underlying platform so you do not have to worry about infrastructure management. ROSA provides seamless integration with a wide range of AWS compute, database, analytics, machine learning, networking, mobile, and other services to further accelerate the building and delivering of differentiating experiences to your customers.
@@ -148,15 +150,6 @@ endif::openshift-rosa-hcp[]
 | link:https://learn.openshift.com/?extIdCarryOver=true&sc_cid=701f2000001Css5AAC[OpenShift Interactive Learning Portal]
 | 
 xref:../storage/index.adoc#storage-overview[Storage]
-| 
-ifdef::openshift-rosa-hcp[]
-link:https://docs.openshift.com/rosa/observability/monitoring/monitoring-overview.html#monitoring-overview_virt-monitoring-overview[Monitoring overview]
-endif::openshift-rosa-hcp[]
-ifndef::openshift-rosa-hcp[]
-xref:../observability/monitoring/monitoring-overview.adoc#monitoring-overview_virt-monitoring-overview[Monitoring overview]
-endif::openshift-rosa-hcp[]
-| 
-xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} life cycle]
 |
 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]

rosa_architecture/cloud-experts-rosa-hcp-sts-explained.adoc

@@ -43,15 +43,14 @@ Security features for AWS STS include:
 * *Roles and policies* - The roles and policies used by {hcp-title} can be divided into account-wide roles and policies and Operator roles and policies.
 +
 The policies determine the allowed actions for each of the roles. See link:https://docs.openshift/rosa/rosa_architecture/rosa-sts-about-iam-resources.html#rosa-sts-about-iam-resources[About IAM resources for ROSA clusters that use STS] for more details about the individual roles and policies and link:https://docs.openshift/rosa/rosa_planning/rosa-sts-ocm-role.html#rosa-sts-ocm-role[ROSA IAM role resource] for more details about trust policies.
-+
---
-** The account-wide roles are:
-+
-*** ManagedOpenShift-Installer-Role
-*** ManagedOpenShift-Worker-Role
-*** ManagedOpenShift-Support-Role
-+
-** The account-wide AWS-managed policies are:
+
+The policies determine the allowed actions for each of the roles. See 
+ifdef::openshift-rosa-hcp[]
+link:https://docs.openshift.com/rosa/rosa_architecture/rosa-sts-about-iam-resources.html#rosa-sts-about-iam-resources[About IAM resources for ROSA clusters that use STS] for more details about the individual roles and policies and link:https://docs.openshift.com/rosa/rosa_planning/rosa-sts-ocm-role.html#rosa-sts-ocm-role[ROSA IAM role resource] for more details about trust policies.
+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 for ROSA clusters that use STS] for more details about the individual roles and policies and xref:../rosa_planning/rosa-sts-ocm-role.adoc#rosa-sts-ocm-role[ROSA IAM role resource] for more details about trust policies.
+endif::openshift-rosa-hcp[]
 +
 *** link:https://docs.aws.amazon.com/aws-managed-policy/latest/reference/ROSAInstallerPolicy.html[ROSAInstallerPolicy]
 *** link:https://docs.aws.amazon.com/aws-managed-policy/latest/reference/ROSAWorkerInstancePolicy.html[ROSAWorkerInstancePolicy]

rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc

@@ -26,29 +26,7 @@ include::modules/rosa-sdpolicy-instance-types.adoc[leveloffset=+2]
 [role="_additional-resources"]
 .Additional resources
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-* xref:../rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-hcp-instance-types[{hcp-title} instance types]
-
-* xref:../../rosa_planning/rosa-hcp-limits-scalability.adoc#rosa-hcp-limits-scalability[{hcp-title} limits and scalability]
-=======
-For a detailed listing of supported instance types, see 
-ifdef::openshift-rosa-hcp[]
-link:https://docs.openshift.com/rosa/rosa_policy_service_definition/rosa-hcp-instance-types.html#rosa-hcp-instance-types[{hcp-title} instance types].
-endif::openshift-rosa-hcp[]
-ifndef::openshift-rosa-hcp[]
-xref:../rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-hcp-instance-types[{hcp-title} instance types].
-endif::openshift-rosa-hcp[]
->>>>>>> 42a0000f89 (Upgrading ROSA with HCP updates)
-=======
 For a detailed listing of supported instance types, see xref:../rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-hcp-instance-types[{hcp-title} instance types].
->>>>>>> 49a8105d18 (Repaired the links in Introduction to ROSA book)
-=======
-* xref:../rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-hcp-instance-types[{hcp-title} instance types]
-
-* xref:../../rosa_planning/rosa-hcp-limits-scalability.adoc#rosa-hcp-limits-scalability[{hcp-title} limits and scalability]
->>>>>>> dfb2811cc7 (OSDOCS-12118 changed the node count reference in the service definition)
 
 include::modules/rosa-sdpolicy-am-regions-az.adoc[leveloffset=+2]
 
@@ -92,4 +70,4 @@ ifndef::openshift-rosa-hcp[]
 xref:../rosa_policy_service_definition/rosa-policy-process-security.adoc#rosa-policy-process-security[Understanding process and security for ROSA] for the latest compliance information.
 endif::openshift-rosa-hcp[]
 
-* See xref:../rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[ROSA life cycle]
+* See xref:../rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[ROSA life cycle]

rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc

@@ -38,12 +38,29 @@ include::modules/rosa-sdpolicy-instance-types.adoc[leveloffset=+2]
 [role="_additional-resources"]
 .Additional resources
 
+<<<<<<< HEAD
 For a detailed listing of supported instance types, see 
 ifdef::openshift-rosa-hcp[]
 xref:../rosa_policy_service_definition/rosa-hcp-instance-types.adoc#rosa-instance-types[{product-title} instance types].endif::openshift-rosa-hcp[]
 ifndef::openshift-rosa-hcp[]
 xref:../rosa_policy_service_definition/rosa-instance-types.adoc#rosa-instance-types[{product-title} instance types].
 endif::openshift-rosa-hcp[]
+=======
+<<<<<<< HEAD
+* xref:../rosa_policy_service_definition/rosa-instance-types.adoc#rosa-instance-types[{product-title} instance types]
+
+* xref:../../rosa_planning/rosa-limits-scalability.adoc#rosa-limits-scalability[Limits and scalability]
+
+=======
+For a detailed listing of supported instance types, see 
+ifdef::openshift-rosa-hcp[]
+link:https://docs.openshift.com/rosa/rosa_architecture/rosa_policy_service_definition/rosa-hcp-instance-types.html#rosa-hcp-instance-types[{product-title} instance types].
+endif::openshift-rosa-hcp[]
+ifndef::openshift-rosa-hcp[]
+xref:../rosa_policy_service_definition/rosa-instance-types.adoc#rosa-instance-types[{product-title} instance types].
+endif::openshift-rosa-hcp[]
+>>>>>>> 42a0000f89 (Upgrading ROSA with HCP updates)
+>>>>>>> 8c77e6d308 (Upgrading ROSA with HCP updates)
 
 include::modules/rosa-sdpolicy-am-regions-az.adoc[leveloffset=+2]
 

upgrading/rosa-hcp-upgrading.adoc

@@ -9,27 +9,19 @@ toc::[]
 include::modules/rosa-hcp-upgrade-options.adoc[leveloffset=+1]
 
 .Additional resources
-
-* 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:../cli_reference/rosa_cli/rosa-manage-objects-cli.adoc#rosa-edit-machinepool_rosa-managing-objects-cli[ROSA CLI reference: `rosa edit machinepool`]
 
 //This cannot be a module if we want to use the xrefs
 [id="rosa-lifecycle-policy_{context}"]
 == Life cycle policies and planning
 
-<<<<<<< HEAD
-To plan an upgrade, review the xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-life-cycle.adoc#rosa-hcp-life-cycle[{hcp-title} update life cycle].
-=======
-<<<<<<< HEAD
 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[]
-=======
->>>>>>> a3e00b5379 (Adding the Upgrading HCP cherrypick)
->>>>>>> 35bf785d38 (Adding the Upgrading HCP cherrypick)
 
 The life cycle page includes release definitions, support and upgrade requirements, installation policy information and life cycle dates.
 
@@ -57,10 +49,8 @@ Upgrading the entire cluster involves upgrading both the hosted control plane an
 
 include::modules/rosa-hcp-upgrading-cli-control-plane.adoc[leveloffset=+2]
 include::modules/rosa-hcp-upgrading-cli-machinepool.adoc[leveloffset=+2]
-<<<<<<< HEAD
 include::modules/rosa-hcp-upgrading-cli-tutorial.adoc[leveloffset=+1]
-=======
 
 ifdef::prevcontext[:context: {prevcontext}]
 ifndef::prevcontext[:!context:]
->>>>>>> a3e00b5379 (Adding the Upgrading HCP cherrypick)
+include::modules/rosa-hcp-upgrading-cli-tutorial.adoc[leveloffset=+1]