OSDOCS-5451-FIX: add changes to main

Author: ShaunaDiaz

_topic_maps/_topic_map_ms.yml

@@ -180,5 +180,3 @@ Topics:
   File: microshift-version
 - Name: Additional information
   File: microshift-things-to-know
-- Name: Troubleshooting
-  File: microshift-troubleshooting

microshift_networking/microshift-firewall.adoc

@@ -15,4 +15,4 @@ include::modules/microshift-firewall-opt-settings.adoc[leveloffset=+1]
 include::modules/microshift-firewall-allow-traffic.adoc[leveloffset=+1]
 include::modules/microshift-firewall-apply-settings.adoc[leveloffset=+1]
 include::modules/microshift-firewall-verify-settings.adoc[leveloffset=+1]
-include::modules/microshift-firewall-known-issue.adoc[leveloffset=+1]
+include::modules/microshift-firewall-known-issue.adoc[leveloffset=+1]

microshift_networking/microshift-networking.adoc

@@ -16,11 +16,22 @@ Cluster Administrators have several options for exposing applications that run i
 
 By default, Kubernetes allocates each pod an internal IP address for applications running within the pod. Pods and their containers can have traffic between them, but clients outside the cluster do not have direct network access to pods except when exposed with a service such as NodePort.
 
+[NOTE]
+====
+To troubleshoot NodePort connection problems, read about the known issue in the Release Notes.
+====
+
 include::modules/microshift-cni.adoc[leveloffset=+1]
 include::modules/microshift-configuring-ovn.adoc[leveloffset=+1]
 include::modules/microshift-restart-ovnkube-master.adoc[leveloffset=+1]
 //include::modules/microshift-man-config-ovs-bridge.adoc[leveloffset=+1]
 include::modules/microshift-http-proxy.adoc[leveloffset=+1]
 include::modules/microshift-cri-o-container-runtime.adoc[leveloffset=+1]
 include::modules/microshift-ovs-snapshot.adoc[leveloffset=+1]
-include::modules/microshift-mDNS.adoc[leveloffset=+1]
+include::modules/microshift-mDNS.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+[id="additional-resources_microshift-understanding-networking-settings"]
+.Additional resources
+
+* xref:../microshift_release_notes/microshift-4-13-release-notes.adoc#microshift-4-13-known-issues[{product-title} {product-version} release notes --> Known issues]

microshift_troubleshooting/microshift-troubleshooting.adoc

@@ -2,14 +2,15 @@
 [id="microshift-troubleshooting"]
 = Troubleshooting
 include::_attributes/attributes-microshift.adoc[]
-:context: microshift-known-issues
+:context: microshift-troubleshooting
 
 toc::[]
 
-Read about troubleshooting and possible solutions for known issues.
+//DEPRECATED: This assembly is being deprecated for 4.13 and removed from the topic map.
+//TODO: Remove it and associated modules from repo for GA if not needed.
 
-include::modules/microshift-troubleshooting-nodeport.adoc[leveloffset=+1]
+//Read about troubleshooting and possible solutions for known issues.
 
+//include::modules/microshift-troubleshooting-nodeport.adoc[leveloffset=+1]
 //include::modules/microshift-ki-cni-iptables-deleted.adoc[leveloffset=+1]
-//include::modules/microshift-nodeport-unreachable-workaround.adoc[leveloffset=+1]
-//these two issues were resolved in 4.12 and 4.13; in 4.13, this last module was moved to KIs in the release notes and assembly in Troubleshooting removed
+//include::modules/microshift-nodeport-unreachable-workaround.adoc[leveloffset=+1]

modules/microshift-cni.adoc

@@ -47,7 +47,7 @@ Networking features not available with {product-title} {product-version}:
 
 //Q: are there immutable network settings we should tell users about?
 [id="microshift-network-comps-svcs_{context}"]
-== {product-title} networking components and services overview
+== {product-title} networking components and services
 This brief overview describes networking components and their operation in {product-title}. The `microshift-networking` RPM is a package that automatically pulls in any networking-related dependencies and systemd services to initialize networking, for example, the `microshift-ovs-init` systemd service.
 
 NetworkManager::