Skip to content

Commit eacc3c8

Browse files
authored
Merge pull request #90045 from openshift-cherrypick-robot/cherry-pick-89727-to-service-mesh-docs-3.0
[service-mesh-docs-3.0] OSSM-8951: Add additional resources xrefs to cluster-wide migration conceptual topic
2 parents 98c5d9b + 472515b commit eacc3c8

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

install/ossm-sidecar-injection-assembly.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:_content-type: ASSEMBLY
2-
[id="ossm-sidecar-injection_{context}"]
2+
[id="ossm-sidecar-injection"]
33
= Sidecar injection
44
include::_attributes/common-attributes.adoc[]
55
:context: ossm-sidecar-injection-assembly

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ You must complete the premigration checklists before you start migrating your de
1919

2020
include::modules/ossm-control-plane-configuration-migration-requirements.adoc[leveloffset=+1]
2121

22+
[role="_additional-resources"]
23+
.Additional resources
24+
25+
* xref:../../install/ossm-sidecar-injection-assembly.adoc#ossm-about-sidecar-injection_ossm-sidecar-injection-assembly[About sidecar injection]
26+
27+
* 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]
28+
29+
* xref:../../install/ossm-installing-openshift-service-mesh.adoc#ossm-scoping-service-mesh-with-discoveryselectors_ossm-creating-istiocni-resource[Scoping the mesh with discoverySelectors]
30+
2231
include::modules/ossm-cluster-wide-migration-methods.adoc[leveloffset=+1]
2332

2433

modules/ossm-control-plane-configuration-migration-requirements.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ For both control planes, during the migration ensure that network policies do no
3636
* The data plane namespaces and the control plane
3737
* The data plane namespaces themselves
3838

39-
In the premigration checklist, you are instructed to disable network policies. However, you can manually re-create them. Manually created network policies must allow traffic for both control planes. When a data plane namespace is migrated to 3.0, the `maistra.io/member-of` label is automatically removed. Do not use this label in network policies. For more information, see "Migration of Network Policies".
39+
In the premigration checklist, you are instructed to disable network policies. However, you can manually re-create them. Manually created network policies must allow traffic for both control planes. When a data plane namespace is migrated to 3.0, the `maistra.io/member-of` label is automatically removed. Do not use this label in network policies. For more information, see "Set up network policies to use during migration".
4040

4141
[NOTE]
4242
====
4343
In {SMProduct} 2.6 installations, the `maistra.io/member-of` label is automatically created. This label cannot be used because it is automatically removed during the migration process.
4444
====
4545

46-
Incorrectly configured network policies can disrupt mesh traffic. When you run the migration, be careful when you create network policies to prevent traffic disruption. For more information, see "Network Policy migration".
46+
Incorrectly configured network policies can disrupt mesh traffic. When you run the migration, be careful when you create network policies to prevent traffic disruption. For more information, see "Set up network policies to use during migration".
4747

4848
[id="ossm-cluster-wide-migration-sidecar-injection_{context}"]
4949
== Sidecar injection
@@ -58,7 +58,7 @@ During the migration, you must disable the 2.6 injector. Use the `maistra.io/ign
5858
[id="ossm-cluster-wide-migration-label-selection_{context}"]
5959
== Label selection
6060

61-
For {SMProduct} 3.0, you must decide if you want to use the `istio.io/rev` label or the `istio-injection` label to configure sidecar injection. For more information, see "Installing the Sidecar".
61+
For {SMProduct} 3.0, you must decide if you want to use the `istio.io/rev` label or the `istio-injection` label to configure sidecar injection. For more information, see "About sidecar injection".
6262

6363
In the {SMProduct} 2.6 installation, the member selection configuration in the `ServiceMeshMemberRoll` resource can impact how injection labels are used in the {SMProduct} 3.0 installation.
6464

0 commit comments

Comments
 (0)