Merge pull request #96760 from EricPonvelle/HCP-Prereq-Fix

Repaired a misconfigured link for HCP

Author: EricPonvelle

_topic_maps/_topic_map_rosa.yml

@@ -233,9 +233,16 @@ Topics:
 - Name: Prerequisites checklist for deploying ROSA using STS
   File: rosa-cloud-expert-prereq-checklist
 - Name: Detailed requirements for deploying ROSA using STS
-  File: rosa-sts-aws-prereqs
-- Name: ROSA IAM role resources
+  File: rosa-classic-aws-prereqs
+- Name: Detailed requirements for deploying ROSA with HCP
+  File: rosa-hcp-aws-prereqs
+# Hiding this entry until the HCP migration is completed
+# - Name: Detailed requirements for deploying ROSA using STS
+#   File: rosa-sts-aws-prereqs
+- Name: ROSA Classic IAM role resources
   File: rosa-sts-ocm-role
+- Name: ROSA with HCP IAM roles and resources
+  File: rosa-hcp-prepare-iam-roles-resources
 ##### NOTE: THE BELOW IS REMOVED AS PART OF OSDOCS-13310
 # - Name: Limits and scalability
 #   File: rosa-limits-scalability

_topic_maps/_topic_map_rosa_hcp.yml

@@ -164,7 +164,10 @@ Topics:
 - Name: Prerequisites checklist for deploying ROSA with HCP
   File: rosa-cloud-expert-prereq-checklist
 - Name: Detailed requirements for deploying ROSA with HCP
-  File: rosa-sts-aws-prereqs
+  File: rosa-hcp-aws-prereqs
+# Hiding this entry until the HCP migration is completed
+# - Name: Detailed requirements for deploying ROSA with HCP
+#   File: rosa-sts-aws-prereqs
 - Name: Required IAM roles and resources
   File: rosa-hcp-prepare-iam-roles-resources
 ##### NOTE: THE BELOW IS REMOVED AS PART OF OSDOCS-13310

cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-deploying/cloud-experts-getting-started-detailed-cli-guide.adoc

@@ -142,7 +142,9 @@ The default settings are as follows:
 ** 2 infrastructure nodes
 ** 2 worker nodes
 ** No autoscaling
-** See the documentation on xref:../../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-ec2-instances_rosa-sts-aws-prereqs[ec2 instances] for more details.  
+** See the documentation on xref:../../../rosa_planning/rosa-classic-aws-prereqs.adoc#rosa-ec2-instances_rosa-classic-aws-prereqs[ec2 instances] for more details. 
+// This link needs to remain hidden until the HCP migration is published
+// ** See the documentation on xref:../../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-ec2-instances_rosa-sts-aws-prereqs[ec2 instances] for more details.  
 * Region: As configured for the `aws` CLI
 * Networking IP ranges:
 ** Machine CIDR: 10.0.0.0/16

cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-deploying/cloud-experts-getting-started-hcp.adoc

@@ -152,7 +152,9 @@ echo "export PRIVATE_SUBNET_ID=$PRIVATE_SUBNET_ID"
 +
 [role="_additional-resources"]
 .Additional resources
-* For more about VPC requirements, see the xref:../../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-vpc_rosa-sts-aws-prereqs[VPC documentation].
+* For more about VPC requirements, see the xref:../../../rosa_planning/rosa-classic-aws-prereqs.adoc#rosa-vpc_rosa-classic-aws-prereqs[VPC documentation].
+// This link needs to remain hidden until the HCP migration is published
+// * For more about VPC requirements, see the xref:../../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-vpc_rosa-sts-aws-prereqs[VPC documentation].
 
 . The script outputs commands. Set the commands as environment variables to store the subnet IDs for later use. Copy and run the commands:
 +

cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-what-is-rosa.adoc

@@ -134,7 +134,9 @@ etcd encryption is configured the same as in OpenShift Container Platform. The a
 Currently, the ROSA CLI does not accept multi-region KMS keys for EBS encryption. This feature is in our backlog for product updates. The ROSA CLI accepts single region KMS keys for EBS encryption if it is defined at cluster creation.
 
 == Infrastructure
-ROSA uses several different cloud services such as virtual machines, storage, and load balancers. You can see a defined list in the xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-aws-policy-provisioned_rosa-sts-aws-prereqs[AWS prerequisites].
+ROSA uses several different cloud services such as virtual machines, storage, and load balancers. You can see a defined list in the xref:../../rosa_planning/rosa-classic-aws-prereqs.adoc#rosa-aws-policy-provisioned_rosa-classic-aws-prereqs[AWS prerequisites].
+// This section needs to remain hidden until the HCP migration is published
+// ROSA uses several different cloud services such as virtual machines, storage, and load balancers. You can see a defined list in the xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-aws-policy-provisioned_rosa-sts-aws-prereqs[AWS prerequisites].
 
 == Credential methods
 There are two credential methods to grant Red{nbsp}Hat the permissions needed to perform the required actions in your AWS account: AWS with STS or an IAM user with admin permissions. AWS with STS is the preferred method, and the IAM user method will eventually be deprecated. AWS with STS better aligns with the principles of least privilege and secure practices in cloud service resource management.

cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-rosa-sts-explained.adoc

@@ -61,7 +61,9 @@ STS roles and policies must be created for each ROSA cluster. To make this easie
 
 [id="components-specific-to-rosa-with-sts"]
 == Components specific to ROSA with STS
-* *AWS infrastructure* - This provides the infrastructure required for the cluster. It contains the actual EC2 instances, storage, and networking components. See xref:../../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-aws-compute-types_rosa-service-definition[AWS compute types] to see supported instance types for compute nodes and xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-ec2-instances_rosa-sts-aws-prereqs[provisioned AWS infrastructure] for control plane and infrastructure node configuration.
+* *AWS infrastructure* - This provides the infrastructure required for the cluster. It contains the actual EC2 instances, storage, and networking components. See xref:../../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-aws-compute-types_rosa-service-definition[AWS compute types] to see supported instance types for compute nodes and xref:../../rosa_planning/rosa-classic-aws-prereqs.adoc#rosa-ec2-instances_rosa-classic-aws-prereqs[provisioned AWS infrastructure] for control plane and infrastructure node configuration.
+// This section needs to remain hidden until the HCP migration is done
+// * *AWS infrastructure* - This provides the infrastructure required for the cluster. It contains the actual EC2 instances, storage, and networking components. See xref:../../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-aws-compute-types_rosa-service-definition[AWS compute types] to see supported instance types for compute nodes and xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-ec2-instances_rosa-sts-aws-prereqs[provisioned AWS infrastructure] for control plane and infrastructure node configuration.
 * *AWS STS* - See the credential method section above.
 * *OpenID Connect (OIDC)* - This provides a mechanism for cluster Operators to authenticate with AWS, assume the cluster roles through a trust policy, and obtain temporary credentials from STS to make the required API calls.
 * *Roles and policies* - The roles and policies are one of the main differences between ROSA with STS and ROSA with IAM Users. For ROSA with STS, the roles and policies used by ROSA are broken into account-wide roles and policies and Operator roles and policies.

modules/rosa-prereq-roles-overview.adoc

@@ -3,7 +3,7 @@
 // * rosa_planning/rosa-hcp-prepare-iam-roles-resources.adoc
 
 :_mod-docs-content-type: MODULE
-[id="rosa-prereq-roles-overview"]
+[id="rosa-prereq-roles-overview_{context}"]
 = Overview of required roles
 
 To create and manage your 

networking/network_security/network-verification.adoc

@@ -41,7 +41,9 @@ ifdef::openshift-dedicated[]
 * Egress is available to the required domain and port combinations that are specified in the xref:../../osd_planning/aws-ccs.adoc#osd-aws-privatelink-firewall-prerequisites_aws-ccs[AWS firewall prerequisites] section.
 endif::openshift-dedicated[]
 ifdef::openshift-rosa[]
-* Egress is available to the required domain and port combinations that are specified in the xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-classic-firewall-prerequisites_rosa-sts-aws-prereqs[AWS firewall prerequisites] section.
+* Egress is available to the required domain and port combinations that are specified in the xref:../../rosa_planning/rosa-classic-aws-prereqs.adoc#rosa-classic-firewall-prerequisites_rosa-classic-aws-prereqs[AWS firewall prerequisites] section.
+// This link needs to reamin hidden until the HCP migration is published
+// * Egress is available to the required domain and port combinations that are specified in the xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-classic-firewall-prerequisites_rosa-sts-aws-prereqs[AWS firewall prerequisites] section.
 endif::openshift-rosa[]
 
 include::modules/automatic-network-verification-bypassing.adoc[leveloffset=+1]

networking/ovn_kubernetes_network_provider/configuring-cluster-wide-proxy.adoc

@@ -33,7 +33,9 @@ include::modules/cluster-wide-proxy-preqs.adoc[leveloffset=+1]
 .Additional resources
 
 ifdef::openshift-rosa[]
-* For the installation prerequisites for ROSA clusters that use the AWS Security Token Service (STS), see xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-sts-aws-prerequisites[AWS prerequisites for ROSA with STS].
+* For the installation prerequisites for ROSA clusters that use the AWS Security Token Service (STS), see xref:../../rosa_planning/rosa-classic-aws-prereqs.adoc#rosa-classic-aws-prerequisites[AWS prerequisites for ROSA with STS].
+// This section needs to remain hidden until the HCP migration is completed
+// * For the installation prerequisites for ROSA clusters that use the AWS Security Token Service (STS), see xref:../../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-sts-aws-prerequisites[AWS prerequisites for ROSA with STS].
 * For the installation prerequisites for ROSA clusters that do not use STS, see xref:../../rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-aws-prereqs.adoc#prerequisites[AWS prerequisites for ROSA].
 endif::openshift-rosa[]
 ifdef::openshift-dedicated[]

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

@@ -37,7 +37,9 @@ Security features for AWS STS include:
 
 [id="components-specific-to-rosa-hcp-with-sts"]
 == Components of {hcp-title}
-* *AWS infrastructure* - The infrastructure required for the cluster including the Amazon EC2 instances, Amazon EBS storage, and networking components. See xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-instance-types_rosa-hcp-service-definition[AWS compute types] to see the supported instance types for compute nodes and xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-ec2-instances_rosa-sts-aws-prereqs[provisioned AWS infrastructure] for more information on cloud resource configuration.
+* *AWS infrastructure* - The infrastructure required for the cluster including the Amazon EC2 instances, Amazon EBS storage, and networking components. See xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-instance-types_rosa-hcp-service-definition[AWS compute types] to see the supported instance types for compute nodes and xref:../rosa_planning/rosa-hcp-aws-prereqs.adoc#rosa-ec2-instances_rosa-hcp-aws-prereqs[provisioned AWS infrastructure] for more information on cloud resource configuration.
+// This link remains hidden until the migration is completed 
+//* *AWS infrastructure* - The infrastructure required for the cluster including the Amazon EC2 instances, Amazon EBS storage, and networking components. See xref:../rosa_architecture/rosa_policy_service_definition/rosa-hcp-service-definition.adoc#rosa-sdpolicy-instance-types_rosa-hcp-service-definition[AWS compute types] to see the supported instance types for compute nodes and xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-ec2-instances_rosa-sts-aws-prereqs[provisioned AWS infrastructure] for more information on cloud resource configuration.
 * *AWS STS* - A method for granting short-term, dynamic tokens to provide users the necessary permissions to temporarily interact with your AWS account resources.
 * *OpenID Connect (OIDC)* - A mechanism for cluster Operators to authenticate with AWS, assume the cluster roles through a trust policy, and obtain temporary credentials from AWS IAM STS to make the required API calls.
 * *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.