Merge pull request #99155 from EricPonvelle/OSDOCS-14508_Networking-Pruning

OSDOCS-14508: Prune networking

Author: EricPonvelle

_attributes/attributes-openshift-dedicated.adoc

@@ -56,7 +56,7 @@
 :hcp-title: ROSA with HCP
 :rosa-classic-title: Red Hat OpenShift Service on AWS (classic architecture)
 :rosa-classic-short: ROSA (classic)
-:rosa-title: Red Hat OpenShift Service on AWS (ROSA) with hosted control planes (HCP)
+:rosa-title: Red Hat OpenShift Service on AWS
 :rosa-short: ROSA with HCP
 :egress-zero: egress zero
 :egress-zero-title: {product-title} clusters with {egress-zero}

_topic_maps/_topic_map_rosa.yml

@@ -1005,7 +1005,7 @@ Topics:
     File: configuring-egress-ips-ovn
   - Name: Migrating from OpenShift SDN network plugin to OVN-Kubernetes network plugin
     File: migrate-from-openshift-sdn
-  - Name: Configuring a cluster-wide proxy during installation
+  - Name: Configuring a cluster-wide proxy
     File: configuring-cluster-wide-proxy
 - Name: OpenShift SDN network plugin
   Dir: ovn_kubernetes_network_provider

_topic_maps/_topic_map_rosa_hcp.yml

@@ -1041,7 +1041,7 @@ Topics:
  #   File: configuring-egress-ips-ovn
  # - Name: Migrating from OpenShift SDN network plugin to OVN-Kubernetes network plugin
  #   File: migrate-from-openshift-sdn
-  - Name: Configuring a cluster-wide proxy during installation
+  - Name: Configuring a cluster-wide proxy
     File: configuring-cluster-wide-proxy
 #- Name: OpenShift SDN network plugin
 #  Dir: ovn_kubernetes_network_provider

modules/albo-installation.adoc

@@ -68,33 +68,12 @@ $ aws iam create-role --role-name "${CLUSTER_NAME}-alb-operator" \
 ----
 +
 Take note of the Operator role ARN in the output. This is referred to as the `$OPERATOR_ROLE_ARN` for the remainder of this process.
-
 .. Associate the Operator role and policy:
 +
 ----
 $ aws iam attach-role-policy --role-name "${CLUSTER_NAME}-alb-operator" \
     --policy-arn $OPERATOR_POLICY_ARN
 ----
-////
-. Create a secret for the AWS Load Balancer Operator to assume our newly created AWS IAM role:
-+
-[source,terminal]
-----
- $ cat << EOF | oc apply -f -
- apiVersion: v1
- kind: Secret
- metadata:
-   name: aws-load-balancer-operator
-   namespace: aws-load-balancer-operator
- stringData:
-   credentials: |
-    [default]
-   role_arn = $ROLE_ARN
-   web_identity_token_file = /var/run/secrets/openshift/serviceaccount/token
-EOF
-----
-////
-+
 . Install the AWS Load Balancer Operator by creating an `OperatorGroup` and a `Subscription`:
 +
 [source,terminal,subs="quotes,verbatim"]
@@ -170,7 +149,7 @@ $ cat <<EOF > ${SCRATCH}/controller-trust-policy.json
 EOF
 ----
 
-. Create the Controller role using the trust policy:
+.. Create the Controller role using the trust policy:
 +
 [source,terminal]
 ----

modules/albo-prerequisites.adoc

@@ -121,8 +121,8 @@ aws ec2 create-tags \
 
 EOF
 ----
-+
-.. Run the script: 
+
+. Run the script: 
 +
 [source,bash]
 ----

modules/configmap-removing-ca.adoc

@@ -6,7 +6,7 @@
 [id="configmap-removing-ca_{context}"]
 = Removing certificate authorities on a {product-title} cluster
 
-You can remove certificate authorities (CA) from your cluster with the {product-title} (ROSA) CLI, `rosa`.
+You can remove certificate authorities (CA) from your cluster with the ROSA CLI, `rosa`.
 
 .Prerequisites
 

modules/configuring-a-proxy-after-installation-cli.adoc

@@ -6,7 +6,7 @@
 [id="configuring-a-proxy-after-installation-cli_{context}"]
 = Configuring a proxy after installation using the CLI
 
-You can use the {product-title} (ROSA) CLI (`rosa`) to add a cluster-wide proxy configuration to an existing ROSA cluster in a Virtual Private Cloud (VPC).
+You can use the ROSA CLI (`rosa`) to add a cluster-wide proxy configuration to an existing ROSA cluster in a Virtual Private Cloud (VPC).
 
 You can also use `rosa` to update an existing cluster-wide proxy configuration. For example, you might need to update the network address for the proxy or replace the additional trust bundle if any of the certificate authorities for the proxy expire.
 
@@ -18,7 +18,7 @@ The cluster applies the proxy configuration to the control plane and compute nod
 .Prerequisites
 
 * You have installed and configured the latest ROSA (`rosa`) and OpenShift (`oc`) CLIs on your installation host.
-* You have a ROSA cluster that is deployed in a VPC.
+* You have a {product-title} cluster that is deployed in a VPC.
 
 .Procedure
 

modules/configuring-a-proxy-during-installation-cli.adoc

@@ -6,7 +6,7 @@
 [id="configuring-a-proxy-during-installation-cli_{context}"]
 = Configuring a proxy during installation using the CLI
 
-If you are installing a {product-title} (ROSA) cluster into an existing Virtual Private Cloud (VPC), you can use the ROSA CLI (`rosa`) to enable a cluster-wide HTTP or HTTPS proxy during installation.
+If you are installing a {product-title} cluster into an existing Virtual Private Cloud (VPC), you can use the ROSA CLI (`rosa`) to enable a cluster-wide HTTP or HTTPS proxy during installation.
 
 The following procedure provides details about the ROSA CLI (`rosa`) arguments that are used to configure a cluster-wide proxy during installation.
 

modules/configuring-a-proxy-during-installation-ocm.adoc

@@ -10,9 +10,9 @@ If you are installing
 ifdef::openshift-dedicated[]
 an {product-title}
 endif::openshift-dedicated[]
-ifdef::openshift-rosa[]
-a {product-title} (ROSA)
-endif::openshift-rosa[]
+ifdef::openshift-rosa,openshift-rosa-hcp[]
+a {product-title}
+endif::openshift-rosa,openshift-rosa-hcp[]
 cluster into an existing Virtual Private Cloud (VPC), you can use {cluster-manager-first} to enable a cluster-wide HTTP or HTTPS proxy during installation.
 ifdef::openshift-dedicated[]
 You can enable a proxy only for clusters that use the Customer Cloud Subscription (CCS) model.

modules/modifying-template-for-new-projects.adoc

@@ -7,18 +7,17 @@
 [id="modifying-template-for-new-projects_{context}"]
 = Modifying the template for new projects
 
-As a cluster administrator, you can modify the default project template so that
-new projects are created using your custom requirements.
+As a cluster administrator, you can modify the default project template so that new projects are created using your custom requirements.
 
 To create your own custom project template:
 
 .Prerequisites
-ifndef::openshift-rosa,openshift-dedicated[]
+ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 * You have access to an {product-title} cluster using an account with `cluster-admin` permissions.
-endif::openshift-rosa,openshift-dedicated[]
-ifdef::openshift-rosa,openshift-dedicated[]
-* You have access to an {product-title} cluster using an account with `dedicated-admin` permissions.
-endif::openshift-rosa,openshift-dedicated[]
+endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
+* You have access to a {product-title} cluster using an account with `dedicated-admin` permissions.
+endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 
 .Procedure