Merge pull request #67825 from lahinson/osdocs-5364-tp-wording-hcp

kcarmichael08 · web-flow · commit aa2bd1663511 · 2023-11-21T12:19:32.000-05:00
diff --git a/hosted_control_planes/hcp-backup-restore-dr.adoc b/hosted_control_planes/hcp-backup-restore-dr.adoc
@@ -8,9 +8,6 @@ toc::[]
 
 If you need to back up and restore etcd on a hosted cluster or provide disaster recovery for a hosted cluster, see the following procedures.
 
-:FeatureName: Hosted control planes
-include::snippets/technology-preview.adoc[]
-
 [id="hosted-etcd-non-disruptive-recovery"]
 == Recovering etcd pods for hosted clusters
 
@@ -21,11 +18,14 @@ include::modules/hosted-cluster-single-node-recovery.adoc[leveloffset=+2]
 include::modules/hosted-cluster-etcd-quorum-loss-recovery.adoc[leveloffset=+2]
 
 [id="hcp-backup-restore"]
-== Backing up and restoring etcd on a hosted cluster in AWS
+== Backing up and restoring etcd on a hosted cluster on {aws-short}
 
 If you use hosted control planes for {product-title}, the process to back up and restore etcd is different from xref:../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backing-up-etcd-data_backup-etcd[the usual etcd backup process].
 
-The following procedures are specific to hosted control planes on AWS.
+The following procedures are specific to hosted control planes on {aws-short}.
+
+:FeatureName: Hosted control planes on the {aws-short} platform
+include::snippets/technology-preview.adoc[]
 
 // Backing up etcd on a hosted cluster
 include::modules/backup-etcd-hosted-cluster.adoc[leveloffset=+2]
@@ -34,9 +34,9 @@ include::modules/backup-etcd-hosted-cluster.adoc[leveloffset=+2]
 include::modules/restoring-etcd-snapshot-hosted-cluster.adoc[leveloffset=+2]
 
 [id="hcp-dr-aws"]
-== Disaster recovery for a hosted cluster within an AWS region
+== Disaster recovery for a hosted cluster within an {aws-short} region
 
-In a situation where you need disaster recovery (DR) for a hosted cluster, you can recover a hosted cluster to the same region within AWS. For example, you need DR when the upgrade of a management cluster fails and the hosted cluster is in a read-only state.
+In a situation where you need disaster recovery (DR) for a hosted cluster, you can recover a hosted cluster to the same region within {aws-short}. For example, you need DR when the upgrade of a management cluster fails and the hosted cluster is in a read-only state.
 
 :FeatureName: Hosted control planes
 include::snippets/technology-preview.adoc[]
@@ -78,10 +78,10 @@ Consider an scenario where you have three clusters to restore. Two are managemen
 * HC Kubeconfig: The hosted cluster `kubeconfig` file
 * SSH key file: The SSH public key
 * Pull secret: The pull secret file to access the release images
-* AWS credentials
-* AWS region
+* {aws-short} credentials
+* {aws-short} region
 * Base domain: The DNS base domain to use as an external DNS
-* S3 bucket name: The bucket in the AWS region where you plan to upload the etcd backup
+* S3 bucket name: The bucket in the {aws-short} region where you plan to upload the etcd backup
 
 This information is shown in the following example environment variables.
 
@@ -166,5 +166,4 @@ include::modules/dr-hosted-cluster-within-aws-region-restore.adoc[leveloffset=+2
 include::modules/dr-hosted-cluster-within-aws-region-delete.adoc[leveloffset=+2]
 
 //Helper script
-include::modules/dr-hosted-cluster-within-aws-region-script.adoc[leveloffset=+2]
-
+include::modules/dr-hosted-cluster-within-aws-region-script.adoc[leveloffset=+2]
diff --git a/hosted_control_planes/hcp-configuring.adoc b/hosted_control_planes/hcp-configuring.adoc
@@ -8,45 +8,46 @@ toc::[]
 
 To get started with hosted control planes for {product-title}, you first configure your hosted cluster on the provider that you want to use. Then, you complete a few management tasks.
 
-:FeatureName: Hosted control planes
-include::snippets/technology-preview.adoc[]
-
 You can view the procedures by selecting from one of the following providers:
 
-[id="hcp-configuring-aws"]
-== Amazon Web Services (AWS)
-
-* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#hosting-cluster-aws-infra-reqs[AWS infrastructure requirements]: Review the infrastructure requirements to create a hosted cluster on AWS.
-* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#hosting-service-cluster-configure-aws[Configuring the hosting cluster on AWS]: The tasks to configure a hosted cluster on AWS include creating the AWS S3 OIDC secret, creating a routable public zone, enabling external DNS, enabling AWS PrivateLink, enabling the hosted control planes feature, and installing the hosted control planes CLI.
-* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#hosted-control-planes-manage-aws[Managing hosted control plane clusters on AWS]: Management tasks include creating, importing, accessing, or deleting a hosted cluster on AWS.
-* xref:../networking/hardware_networks/configuring-sriov-operator.adoc#sriov-operator-hosted-control-planes_configuring-sriov-operator[Deploying the SR-IOV Operator for hosted control planes]: After you configure and deploy your hosting service cluster, you can create a subscription to the Single Root I/O Virtualization (SR-IOV) Operator on a hosted cluster. The SR-IOV pod runs on worker machines rather than the control plane.
-* xref:../scalability_and_performance/using-node-tuning-operator.adoc#node-tuning-hosted-cluster_node-tuning-operator[Configuring node tuning in a hosted cluster]: To set node-level tuning on the nodes in your hosted cluster, you can use the Node Tuning Operator. In hosted control planes, you can configure node tuning by creating config maps that contain `Tuned` objects and referencing those config maps in your node pools.
-* xref:../scalability_and_performance/using-node-tuning-operator.adoc#advanced-node-tuning-hosted-cluster_node-tuning-operator[Advanced node tuning for hosted clusters by setting kernel boot parameters]: More advanced tuning in hosted control planes requires setting kernel boot parameters.
-
 [id="hcp-configuring-bm"]
 == Bare metal
 
-* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#infrastructure-reqs-bare-metal[Bare metal infrastructure requirements]: Review the infrastructure requirements to create a hosted cluster on bare metal.
-* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#configuring-hosting-service-cluster-configure-bm[Configuring the hosting cluster on bare metal]:
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#infrastructure-reqs-bare-metal[Bare metal infrastructure requirements]: Review the infrastructure requirements to create a hosted cluster on bare metal.
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#configuring-hosting-service-cluster-configure-bm[Configuring the hosting cluster on bare metal]:
 ** Configure DNS
 ** Create an `InfraEnv` resource and add agents to it
 ** Create a hosted cluster and verify cluster creation
-* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#hosted-control-planes-manage-bm[Managing hosted control plane clusters on bare metal]:
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#hosted-control-planes-manage-bm[Managing hosted control plane clusters on bare metal]:
 ** Scale the `NodePool` object for a hosted cluster
-** Handle Ingress for a hosted cluster
+** Handle ingress traffic for a hosted cluster
 ** Enable node auto-scaling for a hosted cluster
 ** Destroy a hosted cluster
 
 [id="hcp-configuring-virt"]
 == {VirtProductName}
 
-* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#hosted-control-planes-manage-kubevirt[Managing hosted control plane clusters on OpenShift Virtualization]: Create {product-title} clusters with worker nodes that are hosted by KubeVirt virtual machines.
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#hosted-control-planes-manage-kubevirt[Managing hosted control plane clusters on OpenShift Virtualization]: Create {product-title} clusters with worker nodes that are hosted by KubeVirt virtual machines.
 
-// To be added after ACM 2.9 goes live:
+[id="hcp-configuring-aws"]
+== {aws-first}
 
-// IBM Power
-// IBM Z
+:FeatureName: Hosted control planes on the {aws-short} platform
+include::snippets/technology-preview.adoc[]
 
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#hosting-cluster-aws-infra-reqs[AWS infrastructure requirements]: Review the infrastructure requirements to create a hosted cluster on {aws-short}.
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#hosting-service-cluster-configure-aws[Configuring the hosting cluster on AWS]: The tasks to configure a hosted cluster on {aws-short} include creating the {aws-short} S3 OIDC secret, creating a routable public zone, enabling external DNS, enabling {aws-short} PrivateLink, enabling the hosted control planes feature, and installing the hosted control planes CLI.
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#hosted-control-planes-manage-aws[Managing hosted control plane clusters on AWS]: Management tasks include creating, importing, accessing, or deleting a hosted cluster on {aws-short}.
+* xref:../networking/hardware_networks/configuring-sriov-operator.adoc#sriov-operator-hosted-control-planes_configuring-sriov-operator[Deploying the SR-IOV Operator for hosted control planes]: After you configure and deploy your hosting service cluster, you can create a subscription to the Single Root I/O Virtualization (SR-IOV) Operator on a hosted cluster. The SR-IOV pod runs on worker machines rather than the control plane.
 
+[id="hcp-configuring-ibmz"]
+== {ibm-z-title}
 
+:FeatureName: Hosted control planes on the {ibm-z-title} platform
+include::snippets/technology-preview.adoc[]
+
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#configuring-hosting-service-cluster-ibmz[Configuring the hosting cluster on x86 bare metal for IBM Z compute nodes]
+
+// To be added after ACM 2.9 goes live:
 
+//{ibmpowerProductName}
diff --git a/hosted_control_planes/hcp-managing.adoc b/hosted_control_planes/hcp-managing.adoc
@@ -8,9 +8,6 @@ toc::[]
 
 After you configure your environment for hosted control planes and create a hosted cluster, you can further manage your clusters and nodes.
 
-:FeatureName: Hosted control planes
-include::snippets/technology-preview.adoc[]
-
 include::modules/updates-for-hosted-control-planes.adoc[leveloffset=+1]
 include::modules/updating-node-pools-for-hcp.adoc[leveloffset=+1]
 //restarting hosted control plane components
diff --git a/hosted_control_planes/hcp-troubleshooting.adoc b/hosted_control_planes/hcp-troubleshooting.adoc
@@ -12,4 +12,8 @@ If you encounter issues with hosted control planes, see the following informatio
 include::snippets/technology-preview.adoc[]
 
 include::modules/hosted-control-planes-troubleshooting.adoc[leveloffset=+1]
-include::modules/debug-nodes-hcp.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#trouble-hosted-cluster-backplane[Must-gather for a hosted cluster]
diff --git a/hosted_control_planes/index.adoc b/hosted_control_planes/index.adoc
@@ -12,9 +12,14 @@ include::modules/hosted-control-planes-overview.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
-* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#hypershift-addon-intro[HyperShift add-on (Technology Preview)]
 
-* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#hosted-control-planes-intro[Hosted control planes (Technology Preview)]
+* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#hosted-control-planes-intro[Hosted control planes]
 
 include::modules/hosted-control-planes-concepts-personas.adoc[leveloffset=+1]
 include::modules/hosted-control-planes-version-support.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+
+* xref:../scalability_and_performance/using-node-tuning-operator.adoc#node-tuning-hosted-cluster_node-tuning-operator[Configuring node tuning in a hosted cluster]
+* xref:../scalability_and_performance/using-node-tuning-operator.adoc#advanced-node-tuning-hosted-cluster_node-tuning-operator[Advanced node tuning for hosted clusters by setting kernel boot parameters]
diff --git a/modules/advanced-node-tuning-hosted-cluster.adoc b/modules/advanced-node-tuning-hosted-cluster.adoc
@@ -7,9 +7,6 @@
 [id="advanced-node-tuning-hosted-cluster_{context}"]
 = Advanced node tuning for hosted clusters by setting kernel boot parameters
 
-:FeatureName: Hosted control planes
-include::snippets/technology-preview.adoc[]
-
 For more advanced tuning in hosted control planes, which requires setting kernel boot parameters, you can also use the Node Tuning Operator. The following example shows how you can create a node pool with huge pages reserved.
 
 .Procedure
diff --git a/modules/hosted-control-planes-overview.adoc b/modules/hosted-control-planes-overview.adoc
@@ -6,14 +6,11 @@
 
 :_mod-docs-content-type: CONCEPT
 [id="hosted-control-planes-overview_{context}"]
-= Introduction to hosted control planes (Technology Preview)
+= Introduction to hosted control planes
 
 You can use hosted control planes for Red Hat {product-title} to reduce management costs, optimize cluster deployment time, and separate management and workload concerns so that you can focus on your applications.
 
-You can enable hosted control planes as a Technology Preview feature by using the link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#cluster_mce_overview[multicluster engine for Kubernetes operator version 2.0 or later] on Amazon Web Services (AWS), bare metal by using the Agent provider, or {VirtProductName}.
-
-:FeatureName: Hosted control planes
-include::snippets/technology-preview.adoc[]
+You can enable hosted control planes by using the link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#cluster_mce_overview[multicluster engine for Kubernetes operator version 2.0 or later] on bare metal by using the Agent provider, or {VirtProductName}. Hosted control planes is available as a Technology Preview feature on the {aws-first} and {ibm-z-title} platforms.
 
 [id="hosted-control-planes-architecture_{context}"]
 == Architecture of hosted control planes
diff --git a/modules/node-tuning-hosted-cluster.adoc b/modules/node-tuning-hosted-cluster.adoc
@@ -8,9 +8,6 @@
 
 //# Manage node-level tuning with the Node Tuning Operator
 
-:FeatureName: Hosted control planes
-include::snippets/technology-preview.adoc[]
-
 To set node-level tuning on the nodes in your hosted cluster, you can use the Node Tuning Operator. In hosted control planes, you can configure node tuning by creating config maps that contain `Tuned` objects and referencing those config maps in your node pools.
 
 .Procedure
diff --git a/modules/sriov-operator-hosted-control-planes.adoc b/modules/sriov-operator-hosted-control-planes.adoc
@@ -7,7 +7,7 @@
 [id="sriov-operator-hosted-control-planes_{context}"]
 = Deploying the SR-IOV Operator for hosted control planes
 
-:FeatureName: Hosted control planes
+:FeatureName: Hosted control planes on the AWS platform
 include::snippets/technology-preview.adoc[]
 
 [role="_abstract"]
diff --git a/scalability_and_performance/using-node-tuning-operator.adoc b/scalability_and_performance/using-node-tuning-operator.adoc
@@ -30,4 +30,4 @@ include::modules/advanced-node-tuning-hosted-cluster.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-For more information about hosted control planes, see link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#hosted-control-planes-intro[Hosted control planes (Technology Preview)].
+For more information about hosted control planes, see link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/clusters/cluster_mce_overview#hosted-control-planes-intro[Hosted control planes].
