Skip to content

Commit 56c237a

Browse files
committed
OSSM-8509: minor edits
1 parent 5843af5 commit 56c237a

2 files changed

+11
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
This procedure performs a canary upgrade with the gradual migration of data plane namespaces for a cluster-wide deployment using the `istio.io/rev` label with cert-manager.
1010

11-
The `bookinfo` example application is being used for demonstration purposes with a minimal example for the `Istio` resource. For more information on configuration differences between the {SMProduct} 2 `ServiceMeshControlPlane` resource and the {SMProduct} 3 `Istio` resource, see "ServiceMeshControlPlane resource to Istio resource fields mapping".
11+
The `bookinfo` example application is being used for demonstration purposes with a minimal example for the `Istio` resource. For more information on configuration differences between the {SMProduct} 2 `ServiceMeshControlPlane` resource and the {SMProduct} 3 `Istio` resource, see "Configuration fields mapping between Service Mesh 2 and Service Mesh 3".
1212

1313
You can follow these same steps with your own workloads
1414

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ $ oc get istios istio-tenant-a
2929
[source,terminal]
3030
----
3131
NAME REVISIONS READY IN USE ACTIVE REVISION STATUS VERSION AGE
32-
istio-tenant-a 1 1 0 istio-tenant-a Healthy v1.24.1 30s
32+
ossm-3 1 1 0 ossm-3-v1-24-3 Healthy v1.24.3 30s
3333
----
3434
+
35+
Copy the "ACTIVE REVISION" to use as your istio.io/rev label in the next step.
36+
+
3537
[NOTE]
3638
====
3739
The naming format of your revisions depends on which upgrade strategy you choose for your `Istio` instance.
@@ -44,20 +46,18 @@ The naming format of your revisions depends on which upgrade strategy you choose
4446
$ oc label ns bookinfo istio.io/rev=ossm-3-v1-24-3 maistra.io/ignore-namespace="true" istio-injection- --overwrite=true
4547
----
4648
+
47-
The command adds the following labels to the namespace:
48-
+
49-
.. The `istio.io/rev=ossm-3-v1-24-3` label: Ensures that any newly created or restarted pods in that namespace connect to the {SMProduct} 3.0 proxy. In this example, the 3.0 revision is named `ossm-3-v1-24-3`.
50-
+
51-
.. The `maistra.io/ignore-namespace: "true"` label: Disables sidecar injection for {SMProduct} 2.6 proxies in the namespace so {SMProduct} 2.6 stops injecting proxies in this namespace, and any new proxies are injected by {SMProduct} 3.0. Without this label, the {SMProduct} 2.6 injection webhook tries to inject the pod and the injected sidecar proxy will refuse to start since it will have both the {SMProduct} 2.6 and the {SMProduct} 3.0 Container Network Interface(CNI) annotations.
49+
Running the command performs the following actions:
50+
51+
.. Removes the `istio-injection` label: This label takes precedence over `istio.io/rev` label, which must be removed. Leaving the `istio-injection=enabled` label applied prevents proxy injection.
52+
53+
.. Adds the `istio.io/rev=ossm-3-v1-24-3` label: This label ensures that any newly created or restarted pods in the namespace connect to the {SMProduct} 3.0 proxy. In this example, the 3.0 revision is named `ossm-3-v1-24-3`.
54+
55+
.. Adds the `maistra.io/ignore-namespace: "true"` label: This label disables sidecar injection for {SMProduct} 2.6 proxies in the namespace so {SMProduct} 2.6 stops injecting proxies in this namespace, and any new proxies are injected by {SMProduct} 3.0. Without this label, the {SMProduct} 2.6 injection webhook tries to inject the pod and the injected sidecar proxy will refuse to start since it will have both the {SMProduct} 2.6 and the {SMProduct} 3.0 Container Network Interface(CNI) annotations.
5256
+
5357
[NOTE]
5458
====
5559
Once you apply the `maistra.io/ignore-namespace` label, any new pod that gets created in the namespace connects to the {SMProduct} 3.0 proxy. Workloads can still communicate with each other regardless of which controlplane they are connected to.
5660
====
57-
+
58-
. The command also removes the following label from the namespace:
59-
60-
.. The `istio-injection` label: Takes precedence over `istio.io/rev` label, so it must be removed. Leaving the `istio-injection=enabled` label applied prevents proxy injection.
6161

6262
. Restart the workloads by using one of the following options:
6363
+

0 commit comments

Comments
 (0)