OSDOCS-11830 Split Networking content for ROSA with HCP

Author: laubai

_topic_maps/_topic_map_rosa_hcp.yml

@@ -779,6 +779,80 @@ Topics:
 #  - Name: Advanced OADP features and functionalities
 #    File: oadp-advanced-topics
 ---
+Name: Networking
+Dir: networking
+Distros: openshift-rosa-hcp
+Topics:
+- Name: About networking
+  File: about-managed-networking
+- Name: Networking Operators
+  Dir: networking_operators
+  Distros: openshift-rosa-hcp
+  Topics:
+  - Name: AWS Load Balancer Operator
+    File: aws-load-balancer-operator
+  - Name: DNS Operator in Red Hat OpenShift Service on AWS
+    File: dns-operator
+  - Name: Ingress Operator in Red Hat OpenShift Service on AWS
+    File: ingress-operator
+  - Name: Ingress Node Firewall Operator in Red Hat OpenShift Service on AWS
+    File: ingress-node-firewall-operator
+- Name: Network verification
+  File: network-verification
+- Name: Configuring a cluster-wide proxy during installation
+  File: configuring-cluster-wide-proxy
+- Name: CIDR range definitions
+  File: cidr-range-definitions
+- Name: Network security
+  Dir: network_security
+  Distros: openshift-rosa-hcp
+  Topics:
+  - Name: Understanding network policy APIs
+    File: network-policy-apis
+  - Name: Admin network policy
+    Dir: AdminNetworkPolicy
+    Distros: openshift-rosa-hcp
+    Topics:
+    - Name: About AdminNetworkPolicy
+      File: ovn-k-anp
+    - Name: About BaselineAdminNetworkPolicy
+      File: ovn-k-banp
+  - Name: Network policy
+    Dir: network_policy
+    Distros: openshift-rosa-hcp
+    Topics:
+    - Name: About network policy
+      File: about-network-policy
+    - Name: Creating a network policy
+      File: creating-network-policy
+    - Name: Viewing a network policy
+      File: viewing-network-policy
+    - Name: Editing a network policy
+      File: editing-network-policy
+    - Name: Deleting a network policy
+      File: deleting-network-policy
+    - Name: Defining a default network policy for projects
+      File: default-network-policy
+    - Name: Configuring multitenant isolation with network policy
+      File: multitenant-network-policy
+- Name: Configuring the primary cluster network
+  Dir: ovn_kubernetes_network_provider
+  Distros: openshift-rosa-hcp
+  Topics:
+  - Name: About the OVN-Kubernetes network plugin
+    File: about-ovn-kubernetes
+  - Name: Configuring an egress IP address
+    File: configuring-egress-ips-ovn
+# OpenShift SDN not supported for HCP
+- Name: Configuring Routes
+  Dir: routes
+  Distros: openshift-rosa-hcp
+  Topics:
+  - Name: Route configuration
+    File: route-configuration
+  - Name: Secured routes
+    File: secured-routes
+---
 Name: Nodes
 Dir: nodes
 Distros: openshift-rosa-hcp

modules/running-network-verification-manually-ocm.adoc

@@ -33,6 +33,7 @@ ROSA
 endif::openshift-rosa[]
 cluster.
 * You are the cluster owner or you have the cluster editor role.
+//TODO OSDOCS-11830 I am both of these things and I can't see anything related to this in OCM; is this only available after a specific version? upgrading test cluster to see if this appears for later cluster versions
 
 .Procedure
 

networking/about-managed-networking.adoc

@@ -10,42 +10,28 @@ toc::[]
 
 The following are some of the most commonly used {openshift-networking} features available on your cluster:
 
-* Cluster Network Operator for network plugin management
-+
+* Cluster Network Operator for network plugin management.
+
+ifdef::openshift-rosa-hcp[]
+* Primary cluster network provided by xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes], the default Container Network Interface (CNI) plugin.
+endif::openshift-rosa-hcp[]
+
+ifndef::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], which is the default CNI plugin.
 ** {OCP-short} SDN network plugin, which was deprecated in {OCP-short} 4.16 and removed in {OCP-short} 4.17.
 
-ifdef::openshift-rosa[]
-
-[IMPORTANT]
-====
-Before upgrading {rosa-classic} clusters that are configured with the OpenShift SDN network plugin to version 4.17, you must migrate to the OVN-Kubernetes network plugin. For more information, see _Migrating from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin_ in the  _Additional resources_ section.
-====
-endif::openshift-rosa[]
-
-ifdef::openshift-dedicated[]
-
+ifdef::openshift-rosa,openshift-dedicated[]
 [IMPORTANT]
 ====
-Before upgrading {product-title} clusters that are configured with the OpenShift SDN network plugin to version 4.17, you must migrate to the OVN-Kubernetes network plugin. For more information, see _Migrating from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin_ in the  _Additional resources_ section.
+Before upgrading {rosa-classic} clusters that are configured with the OpenShift SDN network plugin to version 4.17, you must migrate to the OVN-Kubernetes network plugin. For more information, see _Migrating from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin_.
 ====
-endif::openshift-dedicated[]
-
 
 [discrete]
 [role="_additional-resources"]
 [id="additional-resources_{context}"]
 == Additional resources
-
 * link:https://access.redhat.com/articles/7065170[{OCP-short} SDN CNI removal in OCP 4.17]
-ifdef::openshift-rosa[]
 * xref:../networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc#migrate-from-openshift-sdn[Migrating from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin]
-endif::openshift-rosa[]
-
-ifdef::openshift-dedicated[]
-
-* xref:../networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn-osd.adoc#migrate-from-openshift-sdn-osd[Migrating from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin]
-endif::openshift-dedicated[]
-
+endif::openshift-rosa,openshift-dedicated[]

networking/network-verification.adoc

@@ -44,6 +44,8 @@ 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#osd-aws-privatelink-firewall-prerequisites_rosa-sts-aws-prereqs[AWS firewall prerequisites] section.
 endif::openshift-rosa[]
 
+// TODO OSDOCS-11830 - should we be using the terms that get used in the AWS UI, e.g. "DNS resolution" and "DNS hostnames" options are enabled? 
+
 include::modules/automatic-network-verification-bypassing.adoc[leveloffset=+1]
 ifdef::openshift-dedicated[]
 include::modules/running-network-verification-manually-ocm.adoc[leveloffset=+1]
@@ -53,3 +55,7 @@ include::modules/running-network-verification-manually.adoc[leveloffset=+1]
 include::modules/running-network-verification-manually-ocm.adoc[leveloffset=+2]
 include::modules/running-network-verification-manually-cli.adoc[leveloffset=+2]
 endif::openshift-rosa[]
+ifdef::openshift-rosa-hcp[]
+//TODO OSDOCS-11830 I can't see the manual OCM verification at all so setting this up while I wait for cluster upgrades to work out if this only comes in after a certain version
+include::modules/running-network-verification-manually-cli.adoc[leveloffset=+1]
+endif::openshift-rosa-hcp[]

networking/network_security/network_policy/about-network-policy.adoc

@@ -2,9 +2,9 @@
 [id="about-network-policy"]
 = About network policy
 include::_attributes/common-attributes.adoc[]
-ifdef::openshift-dedicated,openshift-rosa[]
+ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 include::_attributes/attributes-openshift-dedicated.adoc[]
-endif::openshift-dedicated,openshift-rosa[]
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 :context: about-network-policy
 
 toc::[]
@@ -19,7 +19,7 @@ include::modules/nw-networkpolicy-optimize-ovn.adoc[leveloffset=+1]
 == Next steps
 
 * xref:../../../networking/network_security/network_policy/creating-network-policy.adoc#creating-network-policy[Creating a network policy]
-ifndef::openshift-rosa,openshift-dedicated[]
+ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 * Optional: xref:../../../networking/network_security/network_policy/default-network-policy.adoc#default-network-policy[Defining a default network policy for projects]
 
 [role="_additional-resources"]

networking/network_security/network_policy/creating-network-policy.adoc

@@ -2,9 +2,9 @@
 [id="creating-network-policy"]
 = Creating a network policy
 include::_attributes/common-attributes.adoc[]
-ifdef::openshift-dedicated,openshift-rosa[]
+ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 include::_attributes/attributes-openshift-dedicated.adoc[]
-endif::openshift-dedicated,openshift-rosa[]
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 :context: creating-network-policy
 
 toc::[]
@@ -23,11 +23,11 @@ include::modules/nw-networkpolicy-allow-application-all-namespaces.adoc[leveloff
 
 include::modules/nw-networkpolicy-allow-application-particular-namespace.adoc[leveloffset=+1]
 
-ifdef::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 include::modules/nw-networkpolicy-create-ocm.adoc[leveloffset=+1]
 endif::[]
 
-ifndef::openshift-rosa,openshift-dedicated[]
+ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 [role="_additional-resources"]
 == Additional resources
 

networking/network_security/network_policy/deleting-network-policy.adoc

@@ -2,16 +2,16 @@
 [id="deleting-network-policy"]
 = Deleting a network policy
 include::_attributes/common-attributes.adoc[]
-ifdef::openshift-dedicated,openshift-rosa[]
+ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 include::_attributes/attributes-openshift-dedicated.adoc[]
-endif::openshift-dedicated,openshift-rosa[]
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 :context: deleting-network-policy
 
 toc::[]
 
 As a user with the `admin` role, you can delete a network policy from a namespace.
 
 include::modules/nw-networkpolicy-delete-cli.adoc[leveloffset=+1]
-ifdef::openshift-dedicated,openshift-rosa[]
+ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 include::modules/nw-networkpolicy-delete-ocm.adoc[leveloffset=+1]
 endif::[]

networking/network_security/network_policy/multitenant-network-policy.adoc

@@ -2,9 +2,9 @@
 [id="multitenant-network-policy"]
 = Configuring multitenant isolation with network policy
 include::_attributes/common-attributes.adoc[]
-ifdef::openshift-dedicated,openshift-rosa[]
+ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 include::_attributes/attributes-openshift-dedicated.adoc[]
-endif::openshift-dedicated,openshift-rosa[]
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 :context: multitenant-network-policy
 
 toc::[]
@@ -18,7 +18,7 @@ Configuring network policies as described in this section provides network isola
 
 include::modules/nw-networkpolicy-multitenant-isolation.adoc[leveloffset=+1]
 
-ifndef::openshift-rosa,openshift-dedicated[]
+ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 [id="multitenant-network-policy-next-steps"]
 == Next steps
 

networking/network_security/network_policy/viewing-network-policy.adoc

@@ -2,9 +2,9 @@
 [id="viewing-network-policy"]
 = Viewing a network policy
 include::_attributes/common-attributes.adoc[]
-ifdef::openshift-dedicated,openshift-rosa[]
+ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 include::_attributes/attributes-openshift-dedicated.adoc[]
-endif::openshift-dedicated,openshift-rosa[]
+endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 :context: viewing-network-policy
 
 toc::[]
@@ -15,6 +15,6 @@ include::modules/nw-networkpolicy-object.adoc[leveloffset=+1]
 
 include::modules/nw-networkpolicy-view-cli.adoc[leveloffset=+1]
 
-ifdef::openshift-dedicated,openshift-rosa[]
+ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 include::modules/nw-networkpolicy-view-ocm.adoc[leveloffset=+1]
 endif::[]

networking/networking_operators/dns-operator.adoc

@@ -8,15 +8,15 @@ toc::[]
 
 In {product-title}, the DNS Operator deploys and manages a CoreDNS instance to provide a name resolution service to pods inside the cluster, enables DNS-based Kubernetes Service discovery, and resolves internal `cluster.local` names.
 
-ifndef::openshift-rosa,openshift-osd[]
+ifndef::openshift-rosa,openshift-rosa-hcp,openshift-osd[]
 include::modules/nw-dns-operator.adoc[leveloffset=+1]
 
 include::modules/nw-dns-view.adoc[leveloffset=+1]
 endif::[]
 
 include::modules/nw-dns-forward.adoc[leveloffset=+1]
 
-ifndef::openshift-rosa,openshift-osd[]
+ifndef::openshift-rosa,openshift-rosa-hcp,openshift-osd[]
 include::modules/nw-dns-operator-status.adoc[leveloffset=+1]
 
 include::modules/nw-dns-operator-logs.adoc[leveloffset=+1]