Merge pull request #83559 from EricPonvelle/rosa_hcp_migration-integration

Integrates the ROSA with HCP migration back into the main branch

Author: EricPonvelle

_topic_maps/_topic_map_rosa_hcp.yml

@@ -13,12 +13,27 @@ toc::[]
 
 . A Provisioned ROSA cluster
 +
-This lab assumes you have access to a successfully provisioned a ROSA cluster. If you have not yet created a ROSA cluster, see xref:../../rosa_getting_started/rosa-quickstart-guide-ui.adoc#rosa-getting-started-prerequisites_rosa-quickstart-guide-ui[Red{nbsp}Hat OpenShift Service on AWS quick start guide] for more information.
+ifdef::openshift-rosa-hcp[]
+This lab assumes you have access to a successfully provisioned a ROSA cluster. If you have not yet created a ROSA cluster, see xref:../../rosa_hcp/rosa-hcp-quickstart-guide.adoc#rosa-getting-started-environment-setup_rosa-hcp-quickstart-guide[ROSA with HCP quick start guide] for more information.
+endif::openshift-rosa-hcp[]
+ifdef::openshift-rosa[]
+This lab assumes you have access to a successfully provisioned a ROSA cluster. If you have not yet created a ROSA cluster, see xref:../../rosa_getting_started/rosa-quickstart-guide-ui.adoc#rosa-getting-started-environment-setup_rosa-quickstart-guide-ui[ROSA quick start guide] for more information.
+endif::openshift-rosa[]
 
 . The OpenShift Command Line Interface (CLI)
 +
-For more information, see xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[Getting started with the OpenShift CLI].
+For more information, see 
+ifdef::openshift-rosa-hcp[]
+link:https://docs.openshift.com/rosa/cli_reference/openshift_cli/getting-started-cli.html#cli-getting-started[Getting started with the OpenShift CLI].
+endif::openshift-rosa-hcp[]
+ifndef::openshift-rosa-hcp[]
+xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[Getting started with the OpenShift CLI].
+endif::openshift-rosa-hcp[]
 
 . A GitHub Account
 +
 Use your existing GitHub account or register at link:https://github.com/signup[https://github.com/signup].
+
+include::modules/rosa-sts-understanding-aws-account-association.adoc[leveloffset=+2]
+[discrete]
+include::modules/rosa-sts-associating-your-aws-account.adoc[leveloffset=+2]

cloud_experts_tutorials/cloud-experts-deploying-application/cloud-experts-deploying-application-prerequisites.adoc

@@ -17,7 +17,13 @@ Red{nbsp}Hat offers two types of admin privileges:
 
 * `dedicated-admin`: `dedicated-admin` privileges allow the admin user to complete most administrative tasks with certain limitations to prevent cluster damage. It is best practice to use `dedicated-admin` when elevated privileges are needed.
 
-For more information on admin privileges, see the xref:../../rosa_install_access_delete_clusters/rosa-sts-accessing-cluster.adoc#rosa-create-cluster-admins_rosa-sts-accessing-cluster[administering a cluster] documentation.
+For more information on admin privileges, see the 
+ifdef::openshift-rosa-hcp[]
+link:https://docs.openshift.com/rosa/rosa_install_access_delete_clusters/rosa-sts-accessing-cluster.html#rosa-create-cluster-admins_rosa-sts-accessing-cluster[administering a cluster] documentation.
+endif::openshift-rosa-hcp[]
+ifndef::openshift-rosa-hcp[]
+xref:../../rosa_install_access_delete_clusters/rosa-sts-accessing-cluster.adoc#rosa-create-cluster-admins_rosa-sts-accessing-cluster[administering a cluster] documentation.
+endif::openshift-rosa-hcp[]
 
 == Using the ROSA CLI
 

cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-admin-rights.adoc

@@ -13,7 +13,13 @@ Creating an administration (admin) user allows you to access your cluster quickl
 
 [NOTE]
 ====
-An admin user works well in this tutorial setting. For actual deployment, use a xref:../../authentication/sd-configuring-identity-providers.adoc#sd-configuring-identity-providers[formal identity provider] to access the cluster and grant the user admin privileges.
+An admin user works well in this tutorial setting. For actual deployment, use a 
+ifdef::openshift-rosa-hcp[]
+link:https://docs.openshift.com/rosa/authentication/sd-configuring-identity-providers.html#sd-configuring-identity-providers[formal identity provider] to access the cluster and grant the user admin privileges.
+endif::openshift-rosa-hcp[]
+ifndef::openshift-rosa-hcp[]
+xref:../../authentication/sd-configuring-identity-providers.adoc#sd-configuring-identity-providers[formal identity provider] to access the cluster and grant the user admin privileges.
+endif::openshift-rosa-hcp[]
 ====
 
 . Run the following command to create the admin user:
@@ -80,4 +86,10 @@ oc get all -n openshift-apiserver
 +
 Only an admin user can run this command without errors.
 
-. You can now use the cluster as an admin user, which will suffice for this tutorial. For actual deployment, it is highly recommended to set up an identity provider, which is explained in the xref:../../cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.adoc#cloud-experts-getting-started-idp[next tutorial].
+. You can now use the cluster as an admin user, which will suffice for this tutorial. For actual deployment, it is highly recommended to set up an identity provider, which is explained in the 
+ifdef::openshift-rosa-hcp[]
+link:https://docs.openshift.com/rosa/cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.html#cloud-experts-getting-started-idp[next tutorial].
+endif::openshift-rosa-hcp[]
+ifndef::openshift-rosa-hcp[]
+xref:../../cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-idp.adoc#cloud-experts-getting-started-idp[next tutorial].
+endif::openshift-rosa-hcp[]

cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-admin.adoc

@@ -140,7 +140,13 @@ image::rosa-cli-ui-12.png[]
 
 [IMPORTANT]
 ====
-Make sure that you have the most recent ROSA command line interface (CLI) and AWS CLI installed and have completed the ROSA prerequisites covered in the previous section. See xref:../cli_reference/rosa_cli/rosa-get-started-cli.adoc#rosa-get-started-cli[Help with ROSA CLI setup] and link:https://aws.amazon.com/cli/[Instructions to install the AWS CLI] for more information.
+Make sure that you have the most recent ROSA command line interface (CLI) and AWS CLI installed and have completed the ROSA prerequisites covered in the previous section. See 
+ifdef::openshift-rosa-hcp[]
+link:https://docs.openshift.com/rosa/cli_reference/rosa_cli/rosa-get-started-cli.html#rosa-get-started-cli[Help with ROSA CLI setup] and link:https://aws.amazon.com/cli/[Instructions to install the AWS CLI] for more information.
+endif::openshift-rosa-hcp[]
+ifndef::openshift-rosa-hcp[]
+xref:../cli_reference/rosa_cli/rosa-get-started-cli.adoc#rosa-get-started-cli[Help with ROSA CLI setup] and link:https://aws.amazon.com/cli/[Instructions to install the AWS CLI] for more information.
+endif::openshift-rosa-hcp[]
 ====
 
 . Initiate the cluster deployment using the `rosa create cluster` command. You can click the *copy* button on the link:https://console.redhat.com/openshift/create/rosa/getstarted[Set up Red{nbsp}Hat OpenShift Service on AWS (ROSA) console page] and paste the command in your terminal. This launches the cluster creation process in interactive mode:

cloud_experts_tutorials/cloud-experts-rosa-hcp-activation-and-account-linking-tutorial.adoc

@@ -23,11 +23,11 @@ include::modules/olm-creating-fb-catalog-image.adoc[leveloffset=+1]
 * xref:../../cli_reference/opm/cli-opm-ref.adoc#cli-opm-ref[`opm` CLI reference]
 
 include::modules/olm-filtering-fbc.adoc[leveloffset=+1]
-ifndef::openshift-dedicated,openshift-rosa[]
+ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 [role="_additional-resources"]
 .Additional resources
 
 * xref:../../operators/understanding/olm-packaging-format.adoc#olm-deprecations-schema_olm-packaging-format[Packaging format -> Schemas -> olm.deprecations schema]
 * xref:../../disconnected/mirroring/installing-mirroring-disconnected.adoc#updating-mirror-registry-content[Mirroring images for a disconnected installation using the oc-mirror plugin -> Keeping your mirror registry content updated]
 * xref:../../disconnected/using-olm.adoc#olm-creating-catalog-from-index_olm-restricted-networks[Adding a catalog source to a cluster]
-endif::openshift-dedicated,openshift-rosa[]
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]

extensions/catalogs/creating-catalogs.adoc

@@ -18,7 +18,7 @@
 ----
 $ rosa create cluster --worker-disk-size=<disk_size>
 ----
-The value can be in GB, GiB, TB, or TiB. Replace '<disk_size>' with a numeric value and unit, for example '--worker-disk-size=200GiB'. You cannot separate the digit and the unit. No spaces are allowed.
+The value can be in GB, GiB, TB, or TiB. Replace `<disk_size>` with a numeric value and unit, for example `--worker-disk-size=200GiB`. You cannot separate the digit and the unit. No spaces are allowed.
 
 .Prerequisite for machine pool creation
 
@@ -30,9 +30,9 @@ The value can be in GB, GiB, TB, or TiB. Replace '<disk_size>' with a numeric va
 +
 [source,terminal]
 ----
-$ rosa create machinepool --cluster=<cluster_id>  <1>
-                          --disk-size=<disk_size>  <2>
+$ rosa create machinepool --cluster=<cluster_id> \// <1>
+                          --disk-size=<disk_size> // <2>
 ----
-<1> Specifies the ID or name of your existing OpenShift cluster
-<2> Specifies the worker node disk size. The value can be in GB, GiB, TB, or TiB. Replace '<disk_size>' with a numeric value and unit, for example '--disk-size=200GiB'. You cannot separate the digit and the unit. No spaces are allowed.
+<1> Specifies the ID or name of your existing OpenShift cluster.
+<2> Specifies the worker node disk size. The value can be in GB, GiB, TB, or TiB. Replace `<disk_size>` with a numeric value and unit, for example `--disk-size=200GiB`. You cannot separate the digit and the unit. No spaces are allowed.
 . Confirm new machine pool disk volume size by logging into the AWS console and find the EC2 virtual machine root volume size.