Merge pull request #100208 from JoeAldinger/route-fix

OSDOCS-16026 4 category restructure

Author: JoeAldinger

_topic_maps/_topic_map.yml

@@ -1662,14 +1662,18 @@ Topics:
   Dir: ingress_load_balancing
   Distros: openshift-enterprise,openshift-origin
   Topics:
-  - Name: Configuring Routes
+  - Name: Routes
     Dir: routes
     Distros: openshift-enterprise,openshift-origin
     Topics:
-    - Name: Route configuration
-      File: route-configuration
-    - Name: Secured routes
-      File: secured-routes
+    - Name: Creating basic routes
+      File: creating-basic-routes
+    - Name: Securing routes
+      File: securing-routes
+    - Name: Configuring routes
+      File: nw-configuring-routes
+    - Name: Creating advanced routes
+      File: creating-advanced-routes
   - Name: Configuring ingress cluster traffic
     Dir: configuring_ingress_cluster_traffic
     Distros: openshift-enterprise,openshift-origin

_topic_maps/_topic_map_osd.yml

@@ -782,13 +782,17 @@ Topics:
   Dir: ingress_load_balancing
   Distros: openshift-dedicated
   Topics:
-    - Name: Configuring Routes
+    - Name: Routes
       Dir: routes
       Topics:
-      - Name: Route configuration
-        File: route-configuration
-      - Name: Secured routes
-        File: secured-routes
+      - Name: Creating basic routes
+        File: creating-basic-routes
+      - Name: Securing routes
+        File: securing-routes
+      - Name: Configuring Routes
+        File: nw-configuring-routes
+      - Name: Creating advanced Routes
+        File: creating-advanced-routes
 ---
 Name: Building applications
 Dir: applications

_topic_maps/_topic_map_rosa.yml

@@ -1010,14 +1010,18 @@ Topics:
   Dir: ingress_load_balancing
   Distros: openshift-rosa
   Topics:
-  - Name: Configuring Routes
+  - Name: Routes
     Dir: routes
     Distros: openshift-rosa
     Topics:
-    - Name: Route configuration
-      File: route-configuration
-    - Name: Secured routes
-      File: secured-routes
+      - Name: Creating basic routes
+        File: creating-basic-routes
+      - Name: Securing routes
+        File: securing-routes
+      - Name: Configuring Routes
+        File: nw-configuring-routes
+      - Name: Creating advanced Routes
+        File: creating-advanced-routes
 ---
 Name: Building applications
 Dir: applications

_topic_maps/_topic_map_rosa_hcp.yml

@@ -1059,14 +1059,18 @@ Topics:
   Dir: ingress_load_balancing
   Distros: openshift-rosa-hcp
   Topics:
-  - Name: Configuring Routes
+  - Name: Routes
     Dir: routes
     Distros: openshift-rosa-hcp
     Topics:
-    - Name: Route configuration
-      File: route-configuration
-    - Name: Secured routes
-      File: secured-routes
+      - Name: Creating basic routes
+        File: creating-basic-routes
+      - Name: Securing routes
+        File: securing-routes
+      - Name: Configuring Routes
+        File: nw-configuring-routes
+      - Name: Creating advanced Routes
+        File: creating-advanced-routes
 ---
 Name: Nodes
 Dir: nodes

applications/deployments/route-based-deployment-strategies.adoc

@@ -39,11 +39,9 @@ include::modules/deployments-ab-testing.adoc[leveloffset=+1]
 
 include::modules/deployments-ab-testing-lb.adoc[leveloffset=+2]
 
-ifndef::openshift-rosa-hcp[]
 // Remove conditionals when Networking content is in ROSA HCP
 [role="_additional-resources"]
 [id="additional-resources_{context}"]
 == Additional resources
 
-* xref:../../networking/ingress_load_balancing/routes/route-configuration.adoc#nw-route-specific-annotations_route-configuration[Route-specific annotations].
-endif::[]
+* xref:../../networking/ingress_load_balancing/routes/nw-configuring-routes.adoc#nw-route-specific-annotations[Route-specific annotations]

applications/odc-monitoring-project-and-application-metrics-using-developer-perspective.adoc

@@ -2,7 +2,7 @@
 [id="odc-monitoring-project-and-application-metrics-using-developer-perspective"]
 = Monitoring project and application metrics using the Developer perspective
 include::_attributes/common-attributes.adoc[]
-:context: monitoring-project-and-application-metrics-using-developer-perspective
+:context: odc-monitoring-project-and-application-metrics-using-developer-perspective
 
 toc::[]
 

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

@@ -22,7 +22,7 @@ include::snippets/mobb-support-statement.adoc[leveloffset=+1]
 
 [TIP]
 ====
-Load Balancers created by the AWS Load Balancer Operator cannot be used for xref:../networking/ingress_load_balancing/routes/route-configuration.adoc#route-configuration[OpenShift Routes], and should only be used for individual services or ingress resources that do not need the full layer 7 capabilities of an OpenShift Route.
+Load Balancers created by the AWS Load Balancer Operator cannot be used for xref:../networking/ingress_load_balancing/routes/nw-configuring-routes.adoc#route-configuration[OpenShift Routes], and should only be used for individual services or ingress resources that do not need the full layer 7 capabilities of an OpenShift Route.
 ====
 
 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.

cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-getting-started-openshift-concepts.adoc

@@ -127,7 +127,7 @@ An individual route can override some defaults by providing specific configurati
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../networking/ingress_load_balancing/routes/route-configuration.adoc#nw-route-specific-annotations_route-configuration[Route-specific annotations]
+* xref:../../networking/ingress_load_balancing/routes/nw-configuring-routes.adoc#nw-route-specific-annotations[Route-specific annotations]
 
 [id="cloud-experts-getting-started-openshift-concepts-imagestreams"]
 == Image streams

modules/nw-creating-a-route.adoc

@@ -6,9 +6,11 @@
 [id="nw-creating-a-route_{context}"]
 = Creating an HTTP-based route
 
-Create a route to host your application at a public URL. The route can either be secure or unsecured, depending on the network security configuration of your application. An HTTP-based route is an unsecured route that uses the basic HTTP routing protocol and exposes a service on an unsecured application port.
+[role="_abstract"]
+You can use the following procedure to create a simple HTTP-based route to a web application, using the `hello-openshift` application as an example.
+
+You can create a route to host your application at a public URL. The route can either be secure or unsecured, depending on the network security configuration of your application. An HTTP-based route is an unsecured route that uses the basic HTTP routing protocol and exposes a service on an unsecured application port.
 
-The following procedure describes how to create a simple HTTP-based route to a web application, using the `hello-openshift` application as an example.
 //link:https://github.com/openshift/origin/tree/master/examples/hello-openshift[hello-openshift]
 
 .Prerequisites
@@ -53,28 +55,29 @@ $ oc expose svc hello-openshift
 +
 [source,terminal]
 ----
-$ oc get routes -o yaml <name of resource> <1>
+$ oc get routes -o yaml hello-openshift
 ----
-<1> In this example, the route is named `hello-openshift`.
-
-.Sample YAML definition of the created unsecured route
++
+.Example YAML definition of the created unsecured route
 [source,yaml]
 ----
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: hello-openshift
 spec:
-  host: www.example.com <1>
+  host: www.example.com
   port:
-    targetPort: 8080 <2>
+    targetPort: 8080
   to:
     kind: Service
     name: hello-openshift
 ----
-<1> The `host` field is an alias DNS record that points to the service. This field can be any valid DNS name, such as `www.example.com`. The DNS name must follow DNS952 subdomain conventions. If not specified, a route name is automatically generated. 
-<2> The `targetPort` field is the target port on pods that is selected by the service that this route points to.
++
+where:
 
+`host`:: Specifies an alias DNS record that points to the service. This field can be any valid DNS name, such as `www.example.com`. The DNS name must follow DNS952 subdomain conventions. If not specified, a route name is automatically generated.
+`targetPort`:: Specifies the target port on pods that is selected by the service that this route points to.
 +
 [NOTE]
 ====

modules/odc-deleting-applications-using-developer-perspective.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * applications/odc-deleting-applications.adoc
+// odc-deleting-applications.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="odc-deleting-applications-using-developer-perspective_{context}"]