Merge pull request #90362 from openshift-cherrypick-robot/cherry-pick-89492-to-service-mesh-docs-3.0

Author: JoeAldinger

_topic_maps/_topic_map.yml

@@ -13,43 +13,43 @@ Dir: migrating
 Distros: openshift-service-mesh
 Topics:
 - Name: Migrating from Service Mesh 2 to Service Mesh 3
-  File: ossm-migrating-from-service-mesh-2-to-3-assembly
+  File: ossm-migrating-from-service-mesh-2-to-3
 - Name: Before migrating
   Dir: checklists
   Topics:
   - Name: Important information to know before migrating
-    File: ossm-migrating-read-me-assembly
+    File: ossm-migrating-read-me
   - Name: Premigration checklists
-    File: ossm-migrating-premigration-checklists-assembly
+    File: ossm-migrating-premigration-checklists
   - Name: Migrating network policies
-    File: ossm-migrating-network-policies-assembly
+    File: ossm-migrating-network-policies
   - Name: Kiali differences for Service Mesh 3
-    File: ossm-migrating-kiali-differences-assembly
+    File: ossm-migrating-kiali-differences
 - Name: Multitenant migration guide
   Dir: multitenant
   Topics:
-  - Name: Migrating a multitenant deployment
-    File: ossm-migrating-multitenant-assembly
+  - Name: Multitenant migration guide
+    File: ossm-migrating-multitenant
 - Name: Cluster-wide migration guide
   Dir: cluster-wide
   Topics:
-  - Name: Migrating a cluster-wide deployment
-    File: ossm-migrating-cluster-wide-assembly
+  - Name: Cluster-wide migration guide
+    File: ossm-migrating-cluster-wide
 - Name: Migrating gateways
   Dir: migrating-gateways
   Topics:
-  - Name: Migrating gateways from Service Mesh 2 to Service Mesh 3
-    File: ossm-migrating-gateways-assembly
+  - Name: Migrating gateways
+    File: ossm-migrating-gateways
 - Name: Completing the migration
   Dir: done
   Topics:
   - Name: Completing the Migration
-    File: ossm-migrating-complete-assembly
+    File: ossm-migrating-complete
 - Name: Reference
   Dir: reference
   Topics:
   - Name: Migrating references
-    File: ossm-migrating-references-assembly
+    File: ossm-migrating-references
 ---
 Name: About
 Dir: about

about/ossm-about-concepts-assembly.adoc

@@ -1,15 +1,9 @@
 :_content-type: ASSEMBLY
-[id=ossm-understanding-service-mesh-assembly_{context}]
+[id="ossm-understanding-service-mesh-assembly"]
 = Understanding OpenShift Service Mesh
 include::_attributes/common-attributes.adoc[]
 :context: ossm-about-concepts-assembly
 
-//Conceptual information that is needed for users moving from 2.x to 3, and for new users to understand and orient themselves OSSM 3.x.
-//Customers who are using 3.O TP1 have expressed a need for this content.
-//Did not like calling it "Service Mesh Concepts", though not sold on "Understanding Service Mesh" but like it better than "Service Mesh concepts".
-//TP1 content so likely all info architecture, content, etc will change by GA
-//Kiali attributes are influx
-
 toc::[]
 
 {SMProductName} is composed of two parts:
@@ -31,7 +25,7 @@ Kali provided by Red Hat is composed of three parts:
 ** {OTELOperator}
 * cert-manager
 * Argo rollouts
-// * Integration of {SMProduct} with 3rd party components that support community Istio integrations --> commented out as none are currently documented in prod docs that are not supported by Red Hat, but support may change for GA so leaving as place holder.
+// * Integration of {SMProduct} with 3rd party components that support community Istio integrations --> commented out as none are currently documented in prod docs that are not supported by Red Hat, but support may change.
 
 include::modules/ossm-about-concepts-resources.adoc[leveloffset=+1]
 

install/ossm-deploying-multiple-service-meshes-on-single-cluster.adoc

@@ -1,5 +1,5 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="ossm-deploying-multiple-service-meshes-on-single-cluster_{context}"]
+[id="ossm-deploying-multiple-service-meshes-on-single-cluster"]
 = Deploying multiple service meshes on a single cluster
 include::_attributes/common-attributes.adoc[]
 :context: ossm-deploying-multiple-service-meshes-on-single-cluster

install/ossm-enabling-mtls.adoc

@@ -1,5 +1,5 @@
 :_content-type: ASSEMBLY
-[id="ossm-enabling-mtls_{context}"]
+[id="ossm-enabling-mtls"]
 = Enabling mutual Transport Layer Security
 include::_attributes/common-attributes.adoc[]
 :context: ossm-enabling-mtls

install/ossm-installing-openshift-service-mesh.adoc

@@ -10,7 +10,7 @@ Installing {ocp-short-name} {SMProductShortName} consists of three main tasks: i
 
 [WARNING]
 ====
-Before migrating from {SMProduct} 2, make sure you are not running {SMProduct} 3 and {SMProduct} 2 in the same cluster, because it causes conflicts unless configured correctly. To migrate from {SMProduct} 2, see xref:../migrating/checklists/ossm-migrating-read-me-assembly.adoc#ossm-migrating-read-me-assembly[Migrating from {SMProduct} 2.6].
+Before migrating from {SMProduct} 2, make sure you are not running {SMProduct} 3 and {SMProduct} 2 in the same cluster, because it causes conflicts unless configured correctly. To migrate from {SMProduct} 2, see xref:../migrating/checklists/ossm-migrating-read-me.adoc#ossm-migrating-read-me[Migrating from {SMProduct} 2.6].
 ====
 
 include::modules/ossm-about-deploying-istio-using-service-mesh-operator.adoc[leveloffset=+1]

install/ossm-running-v2-same-cluster-as-v3-assembly.adoc

@@ -1,5 +1,5 @@
 :_content-type: ASSEMBLY
-[id="ossm-running-v2-same-cluster-as-v3_{context}"]
+[id="ossm-running-v2-same-cluster-as-v3"]
 = Running {SMProduct} 2.6 in the same cluster as {SMProduct} 3
 include::_attributes/common-attributes.adoc[]
 :context: ossm-running-v2-same-cluster-as-v3-assembly

migrating/checklists/ossm-migrating-kiali-differences-assembly.adoc renamed to migrating/checklists/ossm-migrating-kiali-differences.adoc

@@ -3,10 +3,10 @@
 // * migrating/checklists/ossm-kiali-differences-assembly.adoc
 
 :_mod-docs-content-type: ASSEMBLY
-[id="ossm-migrating-kiali-differences-assembly"]
+[id="ossm-migrating-kiali-differences"]
 = Kiali differences for {SMProductName} 3
 include::_attributes/common-attributes.adoc[]
-:context: ossm-migrating-kiali-differences-assembly
+:context: ossm-migrating-kiali-differences
 
 toc::[]
 

migrating/checklists/ossm-migrating-network-policies-assembly.adoc renamed to migrating/checklists/ossm-migrating-network-policies.adoc

@@ -1,8 +1,8 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="ossm-migrating-network-policies-assembly"]
+[id="ossm-migrating-network-policies"]
 = Migrating network policies from Service Mesh 2 to Service Mesh 3
 include::_attributes/common-attributes.adoc[]
-:context: ossm-migrating-network-policies-assembly
+:context: ossm-migrating-network-policies
 
 toc::[]
 

migrating/checklists/ossm-migrating-premigration-checklists-assembly.adoc renamed to migrating/checklists/ossm-migrating-premigration-checklists.adoc

@@ -1,19 +1,16 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="ossm-migrating-premigration-checklists-assembly"]
+[id="ossm-migrating-premigration-checklists"]
 = Premigration checklists
 include::_attributes/common-attributes.adoc[]
-:context: ossm-migrating-premigration-checklists-assembly
+:context: ossm-migrating-premigration-checklists
 
 toc::[]
 
-//Kathryn suggested I try to follow this: https://github.com/openshift/openshift-docs/blob/enterprise-4.18/migrating_from_ocp_3_to_4/premigration-checklists-3-4.adoc?plain=1
-
-
 .Before you begin
 
 * You have read "Migrating from Service Mesh 2 to Service Mesh 3".
-* You have read and understand the xref:../../migrating/checklists/ossm-migrating-read-me-assembly.adoc#ossm-2-and-3-differences_ossm-migrating-read-me-assembly[differences between OpenShift Service Mesh 2 and OpenShift Service Mesh 3].
-* You have reviewed the xref:../../migrating/reference/ossm-migrating-references-assembly.adoc[Migrating references] material.
+* You have read and understand the xref:../../migrating/checklists/ossm-migrating-read-me.adoc#ossm-2-and-3-differences_ossm-migrating-read-me[differences between OpenShift Service Mesh 2 and OpenShift Service Mesh 3].
+* You have reviewed the xref:../../migrating/reference/ossm-migrating-references.adoc[Migrating references] material.
 * You want to migrate from {SMProduct} 2 to {SMProduct} 3.
 * You are running {SMProduct} {SMv2Version}.
 * You have upgraded your `ServiceMeshControlPlane` resource to the latest version.
@@ -66,7 +63,7 @@ If you do not want your network policies in place during your migration:
 
 If you want your network policies in place during your migration:
 
-* [ ] Manually xref:../../migrating/checklists/ossm-migrating-network-policies-assembly.adoc#ossm-migrating-network-policies-setup-during-migration_ossm-migrating-network-policies-assembly[set up network policies to use during migration].
+* [ ] Manually xref:../../migrating/checklists/ossm-migrating-network-policies.adoc#ossm-migrating-network-policies-setup-during-migration_ossm-migrating-network-policies[set up network policies to use during migration].
 * [ ] Disable network policy management in the {SMProduct} 2 `ServiceMeshControlPlane` resource: `spec.security.manageNetworkPolicy=false`.
 * [ ] Complete the rest of the checklists.
 * [ ] Migrate your deployment and workloads.
@@ -95,13 +92,13 @@ oc get smcp <smcp-name> -n <smcp-namespace> -o jsonpath='{.spec.mode}'
 If you did not set a value for the `.spec.mode` parameter in your `ServiceMeshControlPlane` resource, your deployment is multitenant.
 ====
 
-[id="migrate-based-on-your-deployment-model"]
+[id="migrate-based-on-your-deployment-model_{context}"]
 == Migrate based on your deployment model
 
 If you are not using the cert-manager tool with your deployment, you are ready to migrate your deployment.
 
-* xref:../../migrating/multitenant/ossm-migrating-multitenant-assembly.adoc[Multitenant migration guide]
-* xref:../../migrating/cluster-wide/ossm-migrating-cluster-wide-assembly.adoc[Cluster-wide migration guide]
+* xref:../../migrating/multitenant/ossm-migrating-multitenant.adoc[Multitenant migration guide]
+* xref:../../migrating/cluster-wide/ossm-migrating-cluster-wide.adoc[Cluster-wide migration guide]
 
 If you are unsure, you can check if you are using the cert-manager tool with your deployment.
 
@@ -111,8 +108,8 @@ include::modules/ossm-migrating-premigration-checklists-using-the-cert-manager-t
 
 There are some configurations you must complete first before you can start migrating your deployments.
 
-* xref:../../migrating/multitenant/ossm-migrating-multitenant-assembly.adoc#migrating-multitenant-with-cert-manager_ossm-migrating-multitenant-assembly[Migrating a multitenant deployment with the cert-manager tool]
-* xref:../../migrating/cluster-wide/ossm-migrating-cluster-wide-assembly.adoc#ossm-cluster-wide-migration-methods_ossm-migrating-cluster-wide-assembly[Cluster-wide migration methods]
+* xref:../../migrating/multitenant/ossm-migrating-multitenant.adoc#migrating-multitenant-with-cert-manager_ossm-migrating-multitenant[Migrating a multitenant deployment with the cert-manager tool]
+* xref:../../migrating/cluster-wide/ossm-migrating-cluster-wide.adoc#ossm-cluster-wide-migration-methods_ossm-migrating-cluster-wide[Cluster-wide migration methods]
 
 //Per engineering, uncomment Final check after GA
 //move to module when uncommenting

migrating/checklists/ossm-migrating-read-me-assembly.adoc renamed to migrating/checklists/ossm-migrating-read-me.adoc

@@ -1,16 +1,13 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="ossm-migrating-read-me-assembly"]
+[id="ossm-migrating-read-me"]
 = Important information to know if you are migrating from OpenShift Service Mesh 2.6
 include::_attributes/common-attributes.adoc[]
-:context: ossm-migrating-read-me-assembly
+:context: ossm-migrating-read-me
 
 toc::[]
 
 If you are moving from {SMProductName} 2.6 to {SMProductName} 3, read the content in this section first as it contains important information and explanations on the differences between the versions. These differences have a direct impact on your installation and configuration of {SMProduct} 3.
 
-//Note to reviewers: this is existing content: https://docs.redhat.com/en/documentation/red_hat_openshift_service_mesh/3.0.0tp1/html/migrating_from_openshift_service_mesh_2.6/important-information-to-know-before-migrating
-//There were exref updates as this content is moving into a different dir under dir: Migrating
-
 include::modules/ossm-migrating-2-and-3-differences.adoc[leveloffset=+1]
 include::modules/ossm-migrating-read-me-new-operator.adoc[leveloffset=+1]
 include::modules/ossm-migrating-read-me-new-resources.adoc[leveloffset=+1]
@@ -51,7 +48,7 @@ include::modules/ossm-migrating-read-me-kubernetes-network-policy-management.ado
 include::modules/ossm-migrating-read-me-tls-configuration-change.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
-[id="addition-resource_{context}"]
+[id="additional-resource_{context}"]
 == Additional Resources
 
 * link:https://docs.redhat.com/en/documentation/openshift_container_platform/#Observability[Red Hat OpenShift Observability]
@@ -61,5 +58,3 @@ include::modules/ossm-migrating-read-me-tls-configuration-change.adoc[leveloffse
 * link:https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/[Labels and Selectors] (Kubernetes documentation)
 * link:https://istio.io/latest/docs/tasks/security/tls-configuration/workload-min-tls-version/[Istio Workload Minimum TLS Version Configuration] (Istio documentation)
 * link:https://istio.io/latest/docs/reference/config/security/authorization-policy/[Authorization Policies] (Istio documentation)
-
-//Migration likely to resemble https://docs.openshift.com/container-platform/4.17/migrating_from_ocp_3_to_4/about-migrating-from-3-to-4.html#about-migrating-from-3-to-4 when done for OSSM 3.0 GA.