From ba9083372dc827169c3c73415fdd4c8958e4bfdc Mon Sep 17 00:00:00 2001
From: dfitzmau <dfitzmau@redhat.com>
Date: Tue, 29 Jul 2025 11:46:05 +0100
Subject: [PATCH] OCPBUGS-59795: Reorg the troubleshooting disconnected docs

---
 ...leshooting-dns-disconnected-bind9-dns.adoc | 63 +++++++++++++++++++
 ...-troubleshooting-dns-disconnected-env.adoc | 57 -----------------
 ...derstanding-networking-service-to-pod.adoc |  2 +-
 ...-nmstate-troubleshooting-node-network.adoc |  7 ++-
 4 files changed, 69 insertions(+), 60 deletions(-)
 create mode 100644 modules/k8s-nmstate-troubleshooting-dns-disconnected-bind9-dns.adoc

diff --git a/modules/k8s-nmstate-troubleshooting-dns-disconnected-bind9-dns.adoc b/modules/k8s-nmstate-troubleshooting-dns-disconnected-bind9-dns.adoc
new file mode 100644
index 0000000000..fa0ad66de8
--- /dev/null
+++ b/modules/k8s-nmstate-troubleshooting-dns-disconnected-bind9-dns.adoc
@@ -0,0 +1,63 @@
+// Module included in the following assemblies:
+//
+// * networking/k8s_nmstate/k8s-nmstate-troubleshooting-node-network.adoc
+
+:_mod-docs-content-type: PROCEDURE
+[id="k8s-nmstate-troubleshooting-dns-disconnected-bind9-dns_{context}"]
+= Configuring the bind9 DNS named server  
+
+For a cluster configured to query a `bind9` DNS server, you can add the `root-servers.net` zone to a configuration file that contains at least one DNS record. For example you can use the `/var/named/named.localhost` as a zone file that already matches this criteria.
+
+.Procedure
+
+. Add the `root-servers.net` zone at the end of the `/etc/named.conf` configuration file by running the following command:
++
+[source,terminal]
+----
+$ cat >> /etc/named.conf <<EOF
+zone "root-servers.net" IN {
+    	type master;
+    	file "named.localhost";
+};
+EOF
+----
+
+. Restart the `named` service by running the following command:
++
+[source,terminal]
+----
+$ systemctl restart named
+----
+
+. Confirm that the `root-servers.net` zone is present by running the following command:
++
+[source,terminal]
+----
+$ journalctl -u named|grep root-servers.net
+----
++
+.Example output
+[source,terminal]
+----
+Jul 03 15:16:26 rhel-8-10 bash[xxxx]: zone root-servers.net/IN: loaded serial 0
+Jul 03 15:16:26 rhel-8-10 named[xxxx]: zone root-servers.net/IN: loaded serial 0
+----
+
+. Verify that the DNS server can resolve the NS record for the `root-servers.net` domain by running the following command:
++
+[source,terminal]
+----
+$ host -t NS root-servers.net. 127.0.0.1
+----
++
+.Example output
++
+[source,terminal]
+----
+Using domain server:
+Name: 127.0.0.1
+Address: 127.0.0.53
+Aliases:
+root-servers.net name server root-servers.net.
+----
+
diff --git a/modules/k8s-nmstate-troubleshooting-dns-disconnected-env.adoc b/modules/k8s-nmstate-troubleshooting-dns-disconnected-env.adoc
index f3c6cc2a74..737ba6761e 100644
--- a/modules/k8s-nmstate-troubleshooting-dns-disconnected-env.adoc
+++ b/modules/k8s-nmstate-troubleshooting-dns-disconnected-env.adoc
@@ -12,60 +12,3 @@ If you experience health check probe issues when configuring `nmstate` in a disc
 ====
 Ensure that the DNS server includes a name server (NS) entry for the `root-servers.net` zone. The DNS server does not need to forward a query to an upstream resolver, but the server must return a correct answer for the NS query.
 ====
-
-== Configuring the bind9 DNS named server  
-
-For a cluster configured to query a `bind9` DNS server, you can add the `root-servers.net` zone to a configuration file that contains at least one DNS record. For example you can use the `/var/named/named.localhost` as a zone file that already matches this criteria.
-
-.Procedure
-
-. Add the `root-servers.net` zone at the end of the `/etc/named.conf` configuration file by running the following command:
-+
-[source,terminal]
-----
-$ cat >> /etc/named.conf <<EOF
-zone "root-servers.net" IN {
-    	type master;
-    	file "named.localhost";
-};
-EOF
-----
-
-. Restart the `named` service by running the following command:
-+
-[source,terminal]
-----
-$ systemctl restart named
-----
-
-. Confirm that the `root-servers.net` zone is present by running the following command:
-+
-[source,terminal]
-----
-$ journalctl -u named|grep root-servers.net
-----
-+
-.Example output
-[source,terminal]
-----
-Jul 03 15:16:26 rhel-8-10 bash[xxxx]: zone root-servers.net/IN: loaded serial 0
-Jul 03 15:16:26 rhel-8-10 named[xxxx]: zone root-servers.net/IN: loaded serial 0
-----
-
-. Verify that the DNS server can resolve the NS record for the `root-servers.net` domain by running the following command:
-+
-[source,terminal]
-----
-$ host -t NS root-servers.net. 127.0.0.1
-----
-+
-.Example output
-+
-[source,terminal]
-----
-Using domain server:
-Name: 127.0.0.1
-Address: 127.0.0.53
-Aliases:
-root-servers.net name server root-servers.net.
-----
diff --git a/modules/nw-understanding-networking-service-to-pod.adoc b/modules/nw-understanding-networking-service-to-pod.adoc
index c1c770a1ef..016ea04e57 100644
--- a/modules/nw-understanding-networking-service-to-pod.adoc
+++ b/modules/nw-understanding-networking-service-to-pod.adoc
@@ -28,7 +28,7 @@ Key concepts of service-to-pod communication include:
 
 Services use selectors to identify the pods that should receive the traffic. The selectors match labels on the pods to determine which pods are part of the service. Example: A service with the selector `app: myapp` will route traffic to all pods with the label `app: myapp`.
 
-Endpoints are dynamically updated to reflect the current IP addresses of the pods that match the service selector. {product-name} maintains these endpoints and ensures that the service routes traffic to the correct pods.
+Endpoints are dynamically updated to reflect the current IP addresses of the pods that match the service selector. {product-title} maintains these endpoints and ensures that the service routes traffic to the correct pods.
 
 The communication flow refers to the sequence of steps and interactions that occur when a service in Kubernetes routes traffic to the appropriate pods. The typical communication flow for service-to-pod communication is as follows:
 
diff --git a/networking/k8s_nmstate/k8s-nmstate-troubleshooting-node-network.adoc b/networking/k8s_nmstate/k8s-nmstate-troubleshooting-node-network.adoc
index aa7d0dc6ec..fcebbe0f51 100644
--- a/networking/k8s_nmstate/k8s-nmstate-troubleshooting-node-network.adoc
+++ b/networking/k8s_nmstate/k8s-nmstate-troubleshooting-node-network.adoc
@@ -21,7 +21,10 @@ include::modules/virt-troubleshooting-incorrect-policy-config.adoc[leveloffset=+
 include::modules/k8s-nmstate-troubleshooting-dns-disconnected-env.adoc[leveloffset=+1]
 
 // Creating a custom DNS host name to resolve DNS connectivity issues
-include::modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc[leveloffset=+2]
+include::modules/k8s-nmstate-troubleshooting-dns-disconnected-bind9-dns.adoc[leveloffset=+2]
 
 // Configuring the dnsmasq DNS server
-include::modules/k8s-nmstate-troubleshooting-dns-disconnected-env-dnsmasq.adoc[leveloffset=+2]
\ No newline at end of file
+include::modules/k8s-nmstate-troubleshooting-dns-disconnected-env-dnsmasq.adoc[leveloffset=+2]
+
+// Creating a custom DNS host name to resolve DNS connectivity issues
+include::modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc[leveloffset=+2]
\ No newline at end of file