OSDOCS-13051: Porting the ALBO book from OCP to ROSA and ROSA classic

openshift · Jan 22, 2025 · 99e6bc3 · 99e6bc3
1 parent 49baaa6
commit 99e6bc3
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 2 deletions.
diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml
@@ -1084,6 +1084,20 @@ Topics:
   Dir: networking_operators
   Distros: openshift-rosa
   Topics:
+  - Name: AWS Load Balancer Operator
+    Dir: aws_load_balancer_operator
+    Distros: openshift-rosa
+    Topics:
+    - Name: AWS Load Balancer Operator release notes
+      File: aws-load-balancer-operator-release-notes
+    - Name: AWS Load Balancer Operator in OpenShift Container Platform
+      File: understanding-aws-load-balancer-operator
+    - Name: Preparing an AWS STS cluster for the AWS Load Balancer Operator
+      File: preparing-sts-cluster-for-albo
+    - Name: Installing the AWS Load Balancer Operator
+      File: install-aws-load-balancer-operator
+    - Name: Configuring the AWS Load Balancer Operator
+      File: configuring-aws-load-balancer-operator
   - Name: AWS Load Balancer Operator
     File: aws-load-balancer-operator
   - Name: DNS Operator in Red Hat OpenShift Service on AWS

diff --git a/_topic_maps/_topic_map_rosa_hcp.yml b/_topic_maps/_topic_map_rosa_hcp.yml
@@ -359,6 +359,35 @@ Topics:
 - Name: Upgrading ROSA with HCP
   File: rosa-hcp-upgrading
 ---
+Name: Networking
+Dir: networking
+Distros: openshift-rosa-hcp
+Topics:
+- Name: About networking
+  File: about-networking
+- Name: Understanding networking
+  File: understanding-networking
+- Name: Networking Operators
+  Dir: networking_operators
+  Distros: openshift-rosa-hcp
+  Topics:
+  - Name: AWS Load Balancer Operator
+    Dir: aws_load_balancer_operator
+    Distros: openshift-enterprise,openshift-origin
+    Topics:
+    - Name: AWS Load Balancer Operator release notes
+      File: aws-load-balancer-operator-release-notes
+    - Name: AWS Load Balancer Operator in OpenShift Container Platform
+      File: understanding-aws-load-balancer-operator
+    - Name: Preparing an AWS STS cluster for the AWS Load Balancer Operator
+      File: preparing-sts-cluster-for-albo
+    - Name: Installing the AWS Load Balancer Operator
+      File: install-aws-load-balancer-operator
+    - Name: Configuring the AWS Load Balancer Operator
+      File: configuring-aws-load-balancer-operator
+  - Name: AWS Load Balancer Operator
+    File: aws-load-balancer-operator    
+---
 Name: CI/CD
 Dir: cicd
 Distros: openshift-rosa-hcp

diff --git a/networking/about-networking.adoc b/networking/about-networking.adoc
@@ -11,9 +11,14 @@ toc::[]
 
 The following list highlights some of the most commonly used {openshift-networking} features available on your cluster:
 
+ifndef::openshift-rosa,openshift-rosa-hcp[]
+- Primary cluster network provided by ither of the following Container Network Interface (CNI) plugins:
+  * xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes network plugin], the default plugin.
+endif::openshift-rosa,openshift-rosa-hcp[]
+ifdef::openshift-rosa,openshift-rosa-hcp[]
 - Primary cluster network provided by either of the following Container Network Interface (CNI) plugins:
-  * xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes network plugin], the default plugin
-  * xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[About the OVN-Kubernetes network plugin]
+  * link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.17/html/networking/ovn-kubernetes-network-plugin#about-ovn-kubernetes[OVN-Kubernetes network plugin], the default plugin.
+endif::openshift-rosa,openshift-rosa-hcp[]
 - Certified 3rd-party alternative primary network plugins
 - Cluster Network Operator for network plugin management
 - Ingress Operator for TLS encrypted web traffic

diff --git a/...perators/aws_load_balancer_operator/configuring-aws-load-balancer-operator.adoc b/...perators/aws_load_balancer_operator/configuring-aws-load-balancer-operator.adoc
@@ -8,10 +8,12 @@ toc::[]
 
 include::modules/configuring-egress-proxy.adoc[leveloffset=+1]
 
+ifndef::openshift-rosa,openshift-rosa-hcp[]
 [role="_additional-resources"]
 .Additional resources
 
 * xref:../../../networking/configuring-a-custom-pki.adoc#certificate-injection-using-operators_configuring-a-custom-pki[Certificate injection using Operators]
+endif::openshift-rosa,openshift-rosa-hcp[]
 
 include::modules/adding-tls-termination.adoc[leveloffset=+1]
 

diff --git a/...orking_operators/aws_load_balancer_operator/preparing-sts-cluster-for-albo.adoc b/...orking_operators/aws_load_balancer_operator/preparing-sts-cluster-for-albo.adoc
@@ -39,7 +39,12 @@ An additional {aws-first} Identity and Access Management (IAM) role is required
 
 You can create the IAM role by using the following options:
 
+ifdef::openshift-rosa,openshift-rosa-hcp[]
+* Using the Cloud Credential Operator utility (`ccoctl`) and a predefined `CredentialsRequest` object.
+endif::openshift-rosa,openshift-rosa-hcp[]
+ifndef::openshift-rosa,openshift-rosa-hcp[]
 * Using xref:../../../installing/installing_aws/ipi/installing-aws-customizations.adoc#cco-ccoctl-configuring_installing-aws-customizations[the Cloud Credential Operator utility (`ccoctl`)] and a predefined `CredentialsRequest` object.
+endif::openshift-rosa,openshift-rosa-hcp[]
 * Using the {aws-short} CLI and predefined {aws-short} manifests.
 
 Use the {aws-short} CLI if your environment does not support the `ccoctl` command.
@@ -60,7 +65,12 @@ The `CredentialsRequest` object for the {aws-short} Load Balancer Controller mus
 
 You can create the IAM role by using the following options:
 
+ifdef::openshift-rosa,openshift-rosa-hcp[]
+* Using the Cloud Credential Operator utility (`ccoctl`) and a predefined `CredentialsRequest` object.
+endif::openshift-rosa,openshift-rosa-hcp[]
+ifndef::openshift-rosa,openshift-rosa-hcp[]
 * Using xref:../../../installing/installing_aws/ipi/installing-aws-customizations.adoc#cco-ccoctl-configuring_installing-aws-customizations[the Cloud Credential Operator utility (`ccoctl`)] and a predefined `CredentialsRequest` object.
+endif::openshift-rosa,openshift-rosa-hcp[]
 * Using the {aws-short} CLI and predefined {aws-short} manifests.
 
 Use the {aws-short} CLI if your environment does not support the `ccoctl` command.
@@ -71,6 +81,8 @@ include::modules/using-ccoctl-create-iam-role-alb-controller.adoc[leveloffset=+2
 // Creating an AWS IAM role for the controller by using the AWS CLI
 include::modules/using-aws-cli-create-iam-role-alb-controller.adoc[leveloffset=+2]
 
+ifndef::openshift-rosa,openshift-rosa-hcp[]
 [role="_additional-resources"]
 == Additional resources
 * xref:../../../installing/installing_aws/ipi/installing-aws-customizations.adoc#cco-ccoctl-configuring_installing-aws-customizations[Configuring the Cloud Credential Operator utility]
+endif::openshift-rosa,openshift-rosa-hcp[]