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

[service-mesh-docs-3.0] Fix migrating cluster-wide assembly

Author: eromanova97

migrating/cluster-wide/ossm-migrating-cluster-wide.adoc

@@ -26,60 +26,23 @@ include::modules/ossm-migrating-a-cluster-wide-deployment-using-the-istio-revisi
 
 include::modules/ossm-migrating-workloads-using-the-istio-revision-label.adoc[leveloffset=+2]
 
-.Next steps
-
-If you are using gateways, you must migrate them before you complete the migration process.
-
-* xref:../../migrating/migrating-gateways/ossm-migrating-gateways.adoc#ossm-migrating-gateways[Migrating gateways]
-
-If you are not using gateways, and have verified your cluster-wide migration, you can proceed to complete the migration and remove {SMProduct} 2 resources.
-
-* xref:../../migrating/done/ossm-migrating-complete.adoc#ossm-migrating-complete[Completing the Migration]
-
 // This sets the context to build the tasks for cluster-wide migration using the Istio revision label with cert-manager tasks
 :context: cw-revision-cm
 
 include::modules/ossm-migrating-a-cluster-wide-deployment-using-the-istio-revision-label.adoc[leveloffset=+1]
 
 include::modules/ossm-migrating-workloads-using-the-istio-revision-label.adoc[leveloffset=+2]
 
-.Next steps
-
-If you are using gateways, you must migrate them before you complete the migration process.
-
-* xref:../../migrating/migrating-gateways/ossm-migrating-gateways.adoc#ossm-migrating-gateways[Migrating gateways]
-
-If you are not using gateways, and have verified your cluster-wide migration, you can proceed to complete the migration and remove {SMProduct} 2 resources.
-
-* xref:../../migrating/done/ossm-migrating-complete.adoc#ossm-migrating-complete[Completing the Migration]
-
 // This sets the context to build the tasks for cluster-wide migration using the Istio injection label
 :context: cw-injection
 
 include::modules/ossm-migrating-a-cluster-wide-deployment-using-the-istio-injection-label.adoc[leveloffset=+1]
 
 include::modules/ossm-migrating-workloads-using-the-istio-injection-label.adoc[leveloffset=+2]
 
-.Next steps
-
-If you are using gateways, you must migrate them before you complete the migration process.
-
-* xref:../../migrating/migrating-gateways/ossm-migrating-gateways.adoc#ossm-migrating-gateways[Migrating gateways]
-
-If you are not using gateways, and have verified your cluster-wide migration, create a default revision tag and relabel namespaces.
-
 include::modules/ossm-creating-a-default-revision-tag-and-relabeling-the-namespaces.adoc[leveloffset=+2]
 
-.Next steps
-
-You can proceed to complete the migration and remove {SMProduct} 2 resources.
-
-* xref:../../migrating/done/ossm-migrating-complete.adoc#ossm-migrating-complete[Completing the Migration]
-
-[IMPORTANT]
-====
-Before creating a default revision tag and relabelling the namespaces, you must migrate all remaining workload namespaces, including gateways.
-====
+include::snippets/ossm-migrate-all-namespaces.adoc[]
 
 // This sets the context to build the tasks for cluster-wide migration using the Istio injection label with cert-manager
 :context: cw-injection-cm
@@ -88,18 +51,7 @@ include::modules/ossm-migrating-a-cluster-wide-deployment-using-the-istio-inject
 
 include::modules/ossm-migrating-workloads-using-the-istio-injection-label.adoc[leveloffset=+2]
 
-.Next steps
-
-If you are using gateways, you must migrate them before you complete the migration process.
-
-* xref:../../migrating/migrating-gateways/ossm-migrating-gateways.adoc#ossm-migrating-gateways[Migrating gateways]
-
-If you are not using gateways, and have verified your cluster-wide migration, create a default revision tag and relabel namespaces.
-
-[IMPORTANT]
-====
-Before creating a default revision tag and relabelling the namespaces, you must migrate all remaining workload namespaces, including gateways.
-====
+include::snippets/ossm-migrate-all-namespaces.adoc[]
 
 include::modules/ossm-creating-a-default-revision-tag-and-relabeling-the-namespaces-with-cert-manager.adoc[leveloffset=+2]
 
@@ -109,16 +61,6 @@ include::modules/ossm-creating-a-default-revision-tag-and-relabeling-the-namespa
 include::modules/ossm-migrating-a-cluster-wide-deployment-using-the-simple-migration-method.adoc[leveloffset=+1]
 include::modules/ossm-migrating-workloads-using-the-simple-migration-method.adoc[leveloffset=+2]
 
-.Next steps
-
-If you are using gateways, you must migrate them before you complete the migration process.
-
-* xref:../../migrating/migrating-gateways/ossm-migrating-gateways.adoc#ossm-migrating-gateways[Migrating gateways]
-
-If you are not using gateways, you can complete your migration.
-
-* xref:../../migrating/done/ossm-migrating-complete.adoc#ossm-migrating-complete[Completing the Migration]
-
 [role="_additional-resources"]
 [id="additional-resources_{context}"]
 == Additional resources
@@ -130,3 +72,7 @@ If you are not using gateways, you can complete your migration.
 * xref:../../install/ossm-installing-openshift-service-mesh.adoc#ossm-scoping-service-mesh-with-discoveryselectors_ossm-installing-openshift-service-mesh[Scoping the mesh with discoverySelectors]
 
 * xref:../../install/ossm-sidecar-injection.adoc#ossm-identifying-revision-name_ossm-sidecar-injection[Identifying the revision name]
+
+* xref:../../migrating/migrating-gateways/ossm-migrating-gateways.adoc#ossm-migrating-gateways[Migrating gateways]
+
+* xref:../../migrating/done/ossm-migrating-complete.adoc#ossm-migrating-complete[Completing the Migration]

modules/ossm-creating-a-default-revision-tag-and-relabeling-the-namespaces.adoc

@@ -118,3 +118,9 @@ reviews-v2-65cb66b45c-6ggp9.bookinfo         Kubernetes     SYNCED (57s)     SYN
 reviews-v2-698b86b848-v92xq.bookinfo         Kubernetes     SYNCED (3s)      SYNCED (3s)      SYNCED (3s)     SYNCED (3s)      IGNORED     istiod-ossm-3-v1-24-3-6595bf8695-s8ktn     1.24.3
 reviews-v3-6cbc49c8c8-v4jck.bookinfo         Kubernetes     SYNCED (11s)     SYNCED (11s)     SYNCED (3s)     SYNCED (11s)     IGNORED     istiod-ossm-3-v1-24-3-6595bf8695-s8ktn     1.24.3
 ----
+
+.Next steps
+
+You can proceed to complete the migration and remove {SMProduct} 2 resources.
+
+* See: "Completing the Migration"

modules/ossm-migrating-workloads-using-the-istio-injection-label.adoc

@@ -126,4 +126,12 @@ ifeval::["{context}" == "cw-injection"]
 endif::[]
 ifeval::["{context}" == "cw-injection-cm"]
 :!ossm-cert-manager-istio-injection:
-endif::[]
+endif::[]
+
+.Next steps
+
+If you are using gateways, you must migrate them before you complete the migration process.
+
+* See: "Migrating gateways"
+
+If you are not using gateways, and have verified your cluster-wide migration, create a default revision tag and relabel namespaces.

modules/ossm-migrating-workloads-using-the-istio-revision-label.adoc

@@ -129,4 +129,14 @@ ifeval::["{context}" == "cw-revision"]
 endif::[]
 ifeval::["{context}" == "cw-revision-cm"]
 :!ossm-cert-manager-istio-revision:
-endif::[]
+endif::[]
+
+.Next steps
+
+If you are using gateways, you must migrate them before you complete the migration process.
+
+* See: "Migrating gateways"
+
+If you are not using gateways, and have verified your cluster-wide migration, you can proceed to complete the migration and remove {SMProduct} 2 resources.
+
+* See: "Completing the Migration"

modules/ossm-migrating-workloads-using-the-simple-migration-method.adoc

@@ -83,4 +83,14 @@ The output shows that the `productpage-v1` deployment is the only deployment tha
 [NOTE]
 ====
 Remove the `maistra.io/ignore-namespace="true"` label only after the 2.6 control plane has been uninstalled.
-====
+====
+
+.Next steps
+
+If you are using gateways, you must migrate them before you complete the migration process.
+
+* See: "Migrating gateways"
+
+If you are not using gateways, you can complete your migration.
+
+* See: "Completing the Migration"

snippets/ossm-migrate-all-namespaces.adoc

@@ -0,0 +1,9 @@
+// snippet included in the following assembly:
+//
+// * migrating/cluster-wide/ossm-migrating-cluster-wide.adoc
+:_mod-docs-content-type: SNIPPET
+
+[IMPORTANT]
+====
+Before creating a default revision tag and relabelling the namespaces, you must migrate all remaining workload namespaces, including gateways.
+====