Merge pull request #38337 from rh-tokeefe/OSSMDOC-383

OSSMDOC-383: Tasks to publish OSSM 2.1

Author: abrennan89

_topic_map.yml

@@ -2753,6 +2753,8 @@ Topics:
     File: servicemesh-release-notes
   - Name: Service Mesh architecture
     File: ossm-architecture
+  - Name: Service Mesh deployment models
+    File: ossm-deployment-models
   - Name: Service Mesh and Istio differences
     File: ossm-vs-community
   - Name: Preparing to install Service Mesh
@@ -2765,6 +2767,8 @@ Topics:
     File: ossm-create-mesh
   - Name: Enabling sidecar injection
     File: prepare-to-deploy-applications-ossm
+  - Name: Upgrading from 2.0 to 2.1
+    File: upgrading-ossm-to-2-1
   - Name: Upgrading from 1.1 to 2.0
     File: upgrading-ossm
   - Name: Managing users and profiles
@@ -2779,6 +2783,8 @@ Topics:
     File: ossm-performance-scalability
   - Name: Deploying to production
     File: ossm-deploy-production
+  - Name: Federation
+    File: ossm-federation
   - Name: Extensions
     File: ossm-extensions
   - Name: Using the 3scale Istio adapter

service_mesh/v2x/ossm-federation.adoc

@@ -15,10 +15,30 @@ include::modules/ossm-federation-features.adoc[leveloffset=+2]
 
 include::modules/ossm-federation-security.adoc[leveloffset=+2]
 
+include::modules/ossm-federation-limitations.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-prerequisites.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-planning.adoc[leveloffset=+2]
+
 include::modules/ossm-federation-across-cluster.adoc[leveloffset=+2]
 
 include::modules/ossm-federation-checklist.adoc[leveloffset=+2]
 
+include::modules/ossm-federation-config-smcp.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-config-meshPeer.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-create-meshPeer.adoc[leveloffset=+3]
+
+include::modules/ossm-federation-config-export.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-create-export.adoc[leveloffset=+3]
+
+include::modules/ossm-federation-config-import.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-create-import.adoc[leveloffset=+3]
+
 include::modules/ossm-federation-remove-service.adoc[leveloffset=+2]
 
 include::modules/ossm-federation-remove-mesh.adoc[leveloffset=+2]

service_mesh/v2x/upgrading-ossm-to-2-1.adoc

@@ -1,7 +1,7 @@
-[id="ossm-upgrade-to-2-1"]
+[id="upgrading-ossm-to-2-1"]
 = Upgrading {ProductName} from version 2.0 to version 2.1
 include::modules/ossm-document-attributes.adoc[]
-:context: oossm-upgrading-to-2-1
+:context: upgrading-ossm-to-2-1
 
 toc::[]
 
@@ -35,8 +35,11 @@ $ oc project istio-system
 ----
 $ oc get smcp -o yaml
 ----
-
-TIP: Back up your control plane configuration.
++
+[TIP]
+====
+Back up your control plane configuration.
+====
 
 . Update the `.spec.version` field from v2.0 to v2.1, and apply the configuration.
 +