Skip to content

Commit c118781

Browse files
authored
Merge pull request #90200 from shreyasiddhartha/OSSM-8856
OSSM-8856 [DOC] Add warning to installation instructions about conflicts with existing OSSM 3 installations
2 parents aa7801e + a4d50b7 commit c118781

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,17 @@ Installing {ocp-short-name} {SMProductShortName} consists of three main tasks: i
1010

1111
[WARNING]
1212
====
13-
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].
13+
Before installing {SMProduct} 3, 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].
1414
====
1515

1616
include::modules/ossm-about-deploying-istio-using-service-mesh-operator.adoc[leveloffset=+1]
1717
include::modules/ossm-about-deployment-and-update-strategies.adoc[leveloffset=+2]
1818
include::modules/ossm-installing-operator.adoc[leveloffset=+1]
19+
20+
[role="_additional-resources"]
21+
.Additional resources
22+
* xref:../install/ossm-deploying-multiple-service-meshes-on-single-cluster.adoc#ossm-deploying-multiple-service-meshes-on-single-cluster[Deploying multiple service meshes on a single cluster]
23+
1924
include::modules/ossm-about-service-mesh-custom-resource-definitions.adoc[leveloffset=+2]
2025
include::modules/ossm-about-istio-deployment.adoc[leveloffset=+1]
2126
include::modules/ossm-creating-istio-project-using-console.adoc[leveloffset=+2]

modules/ossm-installing-operator.adoc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44
:_mod-docs-content-type: PROCEDURE
55
[id="ossm-installing-operator_{context}"]
66
= Installing the {SMProductShortName} Operator
7-
:context: ossm-installing-operator
7+
8+
[WARNING]
9+
====
10+
For clusters without {SMProduct} instances, install the {SMProductShortName} Operator. {SMProduct} operates cluster-wide and needs a scope configuration to prevent conflicts between {istio} control planes. For clusters with {SMProduct} 3 or later, see "Deploying multiple service meshes on a single cluster".
11+
====
812

913
.Prerequisites
1014

11-
You have deployed a cluster on {ocp-product-title} 4.14 or later.
15+
* You have deployed a cluster on {ocp-product-title} 4.14 or later.
1216
13-
You are logged in to the {ocp-product-title} web console as a user with the cluster-admin role.
17+
* You are logged in to the {ocp-product-title} web console as a user with the cluster-admin role.
1418
1519
.Procedure
1620

0 commit comments

Comments
 (0)