From bc4b240c8b75c27bd42eeed9bb3c97ea11b72d46 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Mon, 20 Mar 2023 16:20:49 -0400 Subject: [PATCH] Cherry pick of 2e856c4ec827582c1e0d6a2d20c0736032b0abcf --- microshift_networking/microshift-firewall.adoc | 2 +- microshift_networking/microshift-networking.adoc | 6 ++++++ microshift_troubleshooting/microshift-troubleshooting.adoc | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/microshift_networking/microshift-firewall.adoc b/microshift_networking/microshift-firewall.adoc index 2baa12091d..8557d88a9d 100644 --- a/microshift_networking/microshift-firewall.adoc +++ b/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] \ No newline at end of file diff --git a/microshift_networking/microshift-networking.adoc b/microshift_networking/microshift-networking.adoc index def9d68cf7..42fd662d83 100644 --- a/microshift_networking/microshift-networking.adoc +++ b/microshift_networking/microshift-networking.adoc @@ -29,3 +29,9 @@ 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] + +[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] diff --git a/microshift_troubleshooting/microshift-troubleshooting.adoc b/microshift_troubleshooting/microshift-troubleshooting.adoc index 776f20ea9d..3c482cd4ee 100644 --- a/microshift_troubleshooting/microshift-troubleshooting.adoc +++ b/microshift_troubleshooting/microshift-troubleshooting.adoc @@ -7,9 +7,12 @@ include::_attributes/attributes-microshift.adoc[] toc::[] //DEPRECATED: This assembly is being deprecated for 4.13 and removed from the topic map. Remove it and associated modules from repo for GA if not needed. +//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. //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] +//include::modules/microshift-nodeport-unreachable-workaround.adoc[leveloffset=+1]