OSDOCS-14500

Author: jneczypor

_topic_maps/_topic_map_rosa.yml

@@ -111,10 +111,6 @@ Topics:
   File: index
 #- Name: ROSA prerequisites
 #  File: rosa-mobb-prerequisites-tutorial
-- Name: ROSA with HCP activation and account linking
-  File: cloud-experts-rosa-hcp-activation-and-account-linking-tutorial
-- Name: ROSA with HCP private offer acceptance and sharing
-  File: cloud-experts-rosa-with-hcp-private-offer-acceptance-and-sharing
 - Name: Verifying Permissions for a ROSA STS Deployment
   File: rosa-mobb-verify-permissions-sts-deployment
 - Name: Deploying ROSA with a Custom DNS Resolver

_topic_maps/_topic_map_rosa_hcp.yml

@@ -141,8 +141,8 @@ Topics:
   File: cloud-experts-aws-secret-manager
 - Name: Using AWS Controllers for Kubernetes on ROSA
   File: cloud-experts-using-aws-ack
-- Name: Dynamically issuing certificates using the cert-manager Operator on ROSA
-  File: cloud-experts-dynamic-certificate-custom-domain
+#- Name: Dynamically issuing certificates using the cert-manager Operator on ROSA
+#  File: cloud-experts-dynamic-certificate-custom-domain
 - Name: Assigning consistent egress IP for external traffic
   File: cloud-experts-consistent-egress-ip
 # ---

cloud_experts_tutorials/cloud-experts-aws-load-balancer-operator.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="cloud-experts-aws-load-balancer-operator"]
-= Tutorial: AWS Load Balancer Operator on ROSA
+= Tutorial: AWS Load Balancer Operator on {product-title}
 include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: cloud-experts-aws-load-balancer-operator
 
@@ -33,7 +33,7 @@ Load Balancers created by the AWS Load Balancer Operator cannot be used for link
 ====
 endif::openshift-rosa-hcp[]
 
-The link:https://kubernetes-sigs.github.io/aws-load-balancer-controller/[AWS Load Balancer Controller] manages AWS Elastic Load Balancers for a {product-title} (ROSA) cluster. The controller provisions link:https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html[AWS Application Load Balancers (ALB)] when you create Kubernetes Ingress resources and link:https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html[AWS Network Load Balancers (NLB)] when implementing Kubernetes Service resources with a type of LoadBalancer.
+The link:https://kubernetes-sigs.github.io/aws-load-balancer-controller/[AWS Load Balancer Controller] manages AWS Elastic Load Balancers for a {product-title} cluster. The controller provisions link:https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html[AWS Application Load Balancers (ALB)] when you create Kubernetes Ingress resources and link:https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html[AWS Network Load Balancers (NLB)] when implementing Kubernetes Service resources with a type of LoadBalancer.
 
 Compared with the default AWS in-tree load balancer provider, this controller is developed with advanced annotations for both ALBs and NLBs. Some advanced use cases are:
 
@@ -53,11 +53,10 @@ AWS ALBs require a multi-AZ cluster, as well as three public subnets split acros
 ====
 
 ifndef::openshift-rosa-hcp[]
-* xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[A multi-AZ ROSA classic cluster]
+* xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[A multi-AZ {product-title} cluster]
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa-hcp[]
-* link:https://docs.openshift.com/rosa-hcp/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.html[A multi-AZ ROSA cluster]
-endif::openshift-rosa-hcp[]
+* xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[A multi-AZ {product-title} cluster]
 * BYO VPC cluster
 * AWS CLI
 * OC CLI

cloud_experts_tutorials/cloud-experts-aws-secret-manager.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="cloud-experts-aws-secret-manager"]
-= Tutorial: Using AWS Secrets Manager CSI on ROSA with STS
+= Tutorial: Using AWS Secrets Manager CSI on {product-title} with STS
 include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: cloud-experts-aws-secret-manager
 
@@ -17,14 +17,14 @@ toc::[]
 //   - Chris Kang
 // ---
 
-The AWS Secrets and Configuration Provider (ASCP) provides a way to expose AWS Secrets as Kubernetes storage volumes. With the ASCP, you can store and manage your secrets in Secrets Manager and then retrieve them through your workloads running on {product-title} (ROSA).
+The AWS Secrets and Configuration Provider (ASCP) provides a way to expose AWS Secrets as Kubernetes storage volumes. With the ASCP, you can store and manage your secrets in Secrets Manager and then retrieve them through your workloads running on {product-title}.
 
 [id="cloud-experts-aws-secret-manager-prerequisites"]
 == Prerequisites
 
 Ensure that you have the following resources and tools before starting this process:
 
-* A ROSA cluster deployed with STS
+* A {product-title} cluster deployed with STS
 * Helm 3
 * `aws` CLI
 * `oc` CLI
@@ -34,7 +34,7 @@ Ensure that you have the following resources and tools before starting this proc
 [id="cloud-experts-aws-secret-manager-preparing-environment"]
 === Additional environment requirements
 
-. Log in to your ROSA cluster by running the following command:
+. Log in to your {product-title} cluster by running the following command:
 +
 [source,terminal]
 ----
@@ -58,12 +58,13 @@ $ oc get authentication.config.openshift.io cluster -o json \
 "https://xxxxx.cloudfront.net/xxxxx"
 ----
 +
-If your output is different, do not proceed. 
+If your output is different, do not proceed.
+See 
 ifndef::openshift-rosa-hcp[]
-See xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[Red{nbsp}Hat documentation on creating an STS cluster] before continuing this process.
+xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[Red{nbsp}Hat documentation on creating an STS cluster] before continuing this process.
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa-hcp[]
-See link:https://docs.openshift.com/rosa-hcp/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.html[Creating ROSA with HCP clusters using the default options] before continuing this process.
+xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[Red{nbsp}Hat documentation on creating an STS cluster] before continuing this process.
 endif::openshift-rosa-hcp[]
 
 . Set the `SecurityContextConstraints` permission to allow the CSI driver to run by running the following command:

cloud_experts_tutorials/cloud-experts-consistent-egress-ip.adoc

@@ -19,7 +19,7 @@ toc::[]
 
 You can assign a consistent IP address for traffic that leaves your cluster such as security groups which require an IP-based configuration to meet security standards.
 
-By default, {product-title} (ROSA) uses the OVN-Kubernetes container network interface (CNI) to assign random IP addresses from a pool. This can make configuring security lockdowns unpredictable or open.
+By default, {product-title} uses the OVN-Kubernetes container network interface (CNI) to assign random IP addresses from a pool. This can make configuring security lockdowns unpredictable or open.
 
 ifndef::openshift-rosa-hcp[]
 See xref:../networking/ovn_kubernetes_network_provider/configuring-egress-ips-ovn.adoc#configuring-egress-ips-ovn[Configuring an egress IP address] for more information.
@@ -34,15 +34,9 @@ endif::openshift-rosa-hcp[]
 
 .Prerequisites
 
-* A ROSA cluster deployed with OVN-Kubernetes
-ifndef::openshift-rosa-hcp[]
+* A {product-title} cluster deployed with OVN-Kubernetes
 * The xref:../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[OpenShift CLI] (`oc`)
 * The xref:../cli_reference/rosa_cli/rosa-get-started-cli.adoc#rosa-get-started-cli[ROSA CLI] (`rosa`)
-endif::openshift-rosa-hcp[]
-ifdef::openshift-rosa-hcp[]
-* The link:https://docs.openshift.com/rosa/cli_reference/openshift_cli/getting-started-cli.html[OpenShift CLI] (`oc`)
-* The link:https://docs.openshift.com/rosa/cli_reference/rosa_cli/rosa-get-started-cli.html[ROSA CLI] (`rosa`)
-endif::openshift-rosa-hcp[]
 * link:https://stedolan.github.io/jq/[`jq`]
 
 

cloud_experts_tutorials/cloud-experts-custom-dns-resolver.adoc

@@ -1,18 +1,18 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="cloud-experts-custom-dns-resolver"]
-= Tutorial: Deploying ROSA with a Custom DNS Resolver
+= Tutorial: Deploying {product-title} with a Custom DNS Resolver
 include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: cloud-experts-custom-dns-resolver
 
 toc::[]
 
-A link:https://docs.aws.amazon.com/vpc/latest/userguide/DHCPOptionSet.html[custom DHCP option set] enables you to customize your VPC with your own DNS server, domain name, and more. {product-title} (ROSA) clusters support using custom DHCP option sets. By default, ROSA clusters require setting the "domain name servers" option to `AmazonProvidedDNS` to ensure successful cluster creation and operation. Customers who want to use custom DNS servers for DNS resolution must do additional configuration to ensure successful ROSA cluster creation and operation. 
+A link:https://docs.aws.amazon.com/vpc/latest/userguide/DHCPOptionSet.html[custom DHCP option set] enables you to customize your VPC with your own DNS server, domain name, and more. {product-title} clusters support using custom DHCP option sets. By default, {product-title} clusters require setting the "domain name servers" option to `AmazonProvidedDNS` to ensure successful cluster creation and operation. Customers who want to use custom DNS servers for DNS resolution must do additional configuration to ensure successful {product-title} cluster creation and operation. 
 
 In this tutorial, we will configure our DNS server to forward DNS lookups for specific DNS zones (further detailed below) to an link:https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resolver.html[Amazon Route 53 Inbound Resolver]. 
 
 [NOTE]
 ====
-This tutorial uses the open-source BIND DNS server (`named`) to demonstrate the configuration necessary to forward DNS lookups to an Amazon Route 53 Inbound Resolver located in the VPC you plan to deploy a ROSA cluster into. Refer to the documentation of your preferred DNS server for how to configure zone forwarding.
+This tutorial uses the open-source BIND DNS server (`named`) to demonstrate the configuration necessary to forward DNS lookups to an Amazon Route 53 Inbound Resolver located in the VPC you plan to deploy a {product-title} cluster into. Refer to the documentation of your preferred DNS server for how to configure zone forwarding.
 ====
 
 [id="cloud-experts-custom-dns-resolver-prerequisites"]
@@ -124,9 +124,9 @@ $ aws route53resolver list-resolver-endpoint-ip-addresses \
 
 Use the following procedure to configure your DNS server to forward the necessary private hosted zones to your Amazon Route 53 Inbound Resolver. 
 
-//ifdef::openshift-rosa-hcp[]
-=== ROSA with HCP
-ROSA with HCP clusters require you to configure DNS forwarding for two private hosted zones:
+ifdef::openshift-rosa-hcp[]
+=== {product-title}
+{product-title} clusters require you to configure DNS forwarding for two private hosted zones:
 
 * `<cluster-name>.hypershift.local`
 * `rosa.<domain-prefix>.<unique-ID>.p3.openshiftapps.com`
@@ -148,10 +148,10 @@ zone "<cluster-name>.hypershift.local" { <1>
   };
 };
 ----
-<1> Replace `<cluster-name>` with your ROSA HCP cluster name.
+<1> Replace `<cluster-name>` with your {product-title} cluster name.
 <2> Replace with the IP addresses of your inbound resolver endpoints collected above, ensuring that following each IP address there is a `;`.
 +
-. link:https://docs.openshift.com/rosa/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.html[Create your cluster].
+. xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[Create your cluster].
 +
 . Once your cluster has begun the creation process, locate the newly created private hosted zone:
 +
@@ -198,11 +198,11 @@ zone "rosa.<domain-prefix>.<unique-ID>.p3.openshiftapps.com" { <1>
 ----
 <1> Replace `<domain-prefix>` with your cluster domain prefix and `<unique-ID>` with your unique ID collected above.
 <2> Replace with the IP addresses of your inbound resolver endpoints collected above, ensuring that following each IP address there is a `;`.
-//endif::openshift-rosa-hcp[]
+endif::openshift-rosa-hcp[]
 
 ifdef::openshift-rosa[]
-=== ROSA Classic
-ROSA Classic clusters require you to configure DNS forwarding for one private hosted zones:
+=== {product-title}
+{product-title} clusters require you to configure DNS forwarding for one private hosted zones:
 
 * `<domain-prefix>.<unique-ID>.p1.openshiftapps.com`
 

cloud_experts_tutorials/cloud-experts-deploy-api-data-protection.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="cloud-experts-deploy-api-data-protection"]
-= Tutorial: Deploying OpenShift API for Data Protection on a ROSA cluster
+= Tutorial: Deploying OpenShift API for Data Protection on a {product-title} cluster
 include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: cloud-experts-deploy-api-data-protection
 
@@ -22,10 +22,10 @@ include::snippets/mobb-support-statement.adoc[leveloffset=+1]
 .Prerequisites
 
 ifndef::openshift-rosa-hcp[]
-* A xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[ROSA classic cluster]
+* A xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[{product-title} cluster]
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa-hcp[]
-* A link:https://docs.openshift.com/rosa-hcp/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.html[ROSA cluster]
+* A xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[{product-title} cluster]
 endif::openshift-rosa-hcp[]
 
 .Environment

cloud_experts_tutorials/cloud-experts-dynamic-certificate-custom-domain.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="cloud-experts-dynamic-certificate-custom-domain"]
-= Tutorial: Dynamically issuing certificates using the cert-manager Operator on ROSA
+= Tutorial: Dynamically issuing certificates using the cert-manager Operator on {product-title}
 include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: cloud-experts-dynamic-certificate-custom-domain
 
@@ -24,7 +24,7 @@ Learn how to use the link:https://docs.openshift.com/container-platform/latest/s
 [id="cloud-experts-dynamic-certificate-custom-domain-prerequisites"]
 == Prerequisites
 
-* A ROSA cluster (HCP or Classic)
+* A {product-title} cluster
 * A user account with `cluster-admin` privileges
 * The OpenShift CLI (`oc`)
 * The Amazon Web Services (AWS) CLI (`aws`)
@@ -71,7 +71,7 @@ $ export CLUSTER=my-custom-value
 [id="cloud-experts-dynamic-certificate-prep-aws"]
 == Preparing your AWS account
 
-When cert-manager requests a certificate from Let’s Encrypt (or another ACME certificate issuer), Let's Encrypt servers validate that you control the domain name in that certificate using _challenges_. For this tutorial, you are using a link:https://letsencrypt.org/docs/challenge-types/#dns-01-challenge[DNS-01 challenge] that proves that you control the DNS for your domain name by putting a specific value in a TXT record under that domain name. This is all done automatically by cert-manager. To allow cert-manager permission to modify the Amazon Route 53 public hosted zone for your domain, you need to create an Identity Access Management (IAM) role with specific policy permissions and a trust relationship to allow access to the pod.
+When cert-manager requests a certificate from Let's Encrypt (or another ACME certificate issuer), Let's Encrypt servers validate that you control the domain name in that certificate using _challenges_. For this tutorial, you are using a link:https://letsencrypt.org/docs/challenge-types/#dns-01-challenge[DNS-01 challenge] that proves that you control the DNS for your domain name by putting a specific value in a TXT record under that domain name. This is all done automatically by cert-manager. To allow cert-manager permission to modify the Amazon Route 53 public hosted zone for your domain, you need to create an Identity Access Management (IAM) role with specific policy permissions and a trust relationship to allow access to the pod.
 
 The public hosted zone that is used in this tutorial is in the same AWS account as the ROSA cluster. If your public hosted zone is in a different account, a few additional steps for link:https://cert-manager.io/docs/configuration/acme/dns01/route53/#cross-account-access[Cross Account Access] are required.
 

cloud_experts_tutorials/cloud-experts-entra-id-idp.adoc

@@ -19,7 +19,7 @@ toc::[]
 //   - Thatcher Hubbard
 // ---
 
-You can configure Microsoft Entra ID (formerly Azure Active Directory) as the cluster identity provider in {product-title} (ROSA).
+You can configure Microsoft Entra ID (formerly Azure Active Directory) as the cluster identity provider in {product-title}.
 
 This tutorial guides you to complete the following tasks:
 

cloud_experts_tutorials/cloud-experts-external-dns.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="cloud-experts-external-dns"]
-= Tutorial: Deploying the External DNS Operator on ROSA
+= Tutorial: Deploying the External DNS Operator on {product-title}
 include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: cloud-experts-external-dns
 
@@ -18,7 +18,7 @@ toc::[]
 //  - Dustin Scott
 //---
 
-The External DNS Operator deploys and manages `ExternalDNS` to provide the name resolution for services and routes from the external DNS provider, like Amazon Route 53, to {product-title} (ROSA) clusters. In this tutorial, we will deploy and configure the External DNS Operator with a secondary ingress controller to manage DNS records in Amazon Route 53. 
+The External DNS Operator deploys and manages `ExternalDNS` to provide the name resolution for services and routes from the external DNS provider, like Amazon Route 53, to {product-title} clusters. In this tutorial, we will deploy and configure the External DNS Operator with a secondary ingress controller to manage DNS records in Amazon Route 53. 
 
 [IMPORTANT]
 ====