Skip to content

Commit d69a723

Browse files
committed
OSSM-8509: edits from QA review
1 parent 189d8ab commit d69a723

2 files changed

+7
-12
lines changed

modules/ossm-migrating-a-cluster-wide-deployment-using-the-istio-revision-label-with-cert-manager.adoc

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
--reuse-values \
6060
--namespace istio-system \
6161
--wait \
62-
--set "app.istio.revisions={basic,istio-tenant-a}" <1>
62+
--set "app.istio.revisions={basic,ossm-3-v1-24-3}" <1>
6363
----
6464
+
6565
<1> The `app.istio.revisions` field must include your {SMProduct} 3.0 control plane revision _before_ you create your `Istio` resource so that proxies can properly communicate with the {SMProduct} 3.0 control plane.
@@ -101,20 +101,15 @@ spec:
101101
opentelemetry:
102102
port: 4317
103103
service: otel-collector.opentelemetrycollector-3.svc.cluster.local
104-
global:
105-
caAddress: cert-manager-istio-csr.istio-system.svc:443
106-
pilot:
107-
env:
108-
ENABLE_CA_SERVER: "false"
104+
global:
105+
caAddress: cert-manager-istio-csr.istio-system.svc:443
106+
pilot:
107+
env:
108+
ENABLE_CA_SERVER: "false"
109109
----
110110
<1> The `name`, `updateStrategy` and `version` fields specify how the `IstioRevision` resource name is created. For more information, see "Identifying the revision name".
111111
<2> The 3.0 and 2.6 control planes must run in the same namespace.
112112
<3> If you are migrating metrics and tracing, update the `extensionProviders` fields according to your tracing and metrics configurations.
113-
+
114-
[NOTE]
115-
====
116-
Namespaces that have `istio-injection=enabled` label applied and are managed by {SMProduct} 2.6 control plane. To prevent the {SMProduct} 3.0 control pane from injecting proxies in workloads, do not use use the `default` name for the {istio} resource, and do not create the `default` revision tag at this time. You will create the `default` revision tag later in this procedure.
117-
====
118113
119114
. Apply the YAML file by running the following command:
120115
+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ You can migrate workloads and gateways separately, and in any order. For more in
2121
+
2222
[source,terminal]
2323
----
24-
$ oc get istios istio-tenant-a
24+
$ oc get istios
2525
----
2626
+
2727
.Example output

0 commit comments

Comments
 (0)