Skip to content

Commit c6e98f2

Browse files
authored
Merge pull request #89958 from openshift-cherrypick-robot/cherry-pick-89942-to-service-mesh-docs-3.0
[service-mesh-docs-3.0] OSSM-9033 Fix indent in Istio resource in Multitenant migration doc
2 parents 42a00b4 + 0c059f5 commit c6e98f2

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

modules/ossm-migrating-a-multitenant-deployment.adoc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,25 @@ apiVersion: sailoperator.io/v1
3434
kind: Istio
3535
metadata:
3636
name: istio-tenant-a
37-
spec:
38-
namespace: istio-system-tenant-a <1>
39-
version: v1.24.3
40-
values:
41-
meshConfig:
42-
discoverySelectors: <2>
43-
- matchLabels:
44-
tenant: tenant-a
45-
extensionProviders: <3>
46-
- name: prometheus
47-
prometheus: {}
48-
- name: otel
49-
opentelemetry:
50-
port: 4317
51-
service: otel-collector.opentelemetrycollector-3.svc.cluster.local
37+
spec:
38+
namespace: istio-system-tenant-a <1>
39+
version: v1.24.3
40+
values:
41+
meshConfig:
42+
discoverySelectors: <2>
43+
- matchLabels:
44+
tenant: tenant-a
45+
extensionProviders: <3>
46+
- name: prometheus
47+
prometheus: {}
48+
- name: otel
49+
opentelemetry:
50+
port: 4317
51+
service: otel-collector.opentelemetrycollector-3.svc.cluster.local
5252
----
5353
+
5454
<1> The `spec.namespace` field in your `Istio` resource must be the same namespace as your `ServiceMeshControlPlane` resource. If you set the `spec.namespace` field in your `Istio` resource to a different namespace than your `ServiceMeshControlPlane` resource, the migration does not complete successfully.
55-
<2> By default, control planes watch the entire cluster. When managing multiple control planes on a single cluster, you must narrow the scope of each control plane by setting `discoverySelectors` fields. In this example, the label `tenant` is used, but you can use any label or combination of labels.
55+
<2> By default, control planes watch the entire cluster. When managing multiple control planes on a single cluster, you must narrow the scope of each control plane by setting `discoverySelectors` fields. In this example, the label `tenant-a` is used, but you can use any label or combination of labels.
5656
<3> Optional: If you are migrating metrics and tracing, update the `extensionProviders` fields according to your tracing and metrics configurations.
5757

5858
. Add your `tenant` label to each one of your dataplane namespaces by running the following command for each dataplane namespace:

modules/ossm-migrating-multitenant-with-cert-manager.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ spec:
7979
version: v1.24.3
8080
values:
8181
meshConfig:
82-
discoverySelectors:
82+
discoverySelectors: <2>
8383
- matchLabels:
84-
tenant: tenant-a <2>
84+
tenant: tenant-a
8585
extensionProviders: <3>
8686
- name: prometheus
8787
prometheus: {}
@@ -97,7 +97,7 @@ spec:
9797
----
9898
+
9999
<1> The `spec.namespace` field in your `Istio` resource must be the _same_ namespace as your `ServiceMeshControlPlane` resource. If you set the `spec.namespace` field in your `Istio` resource to a different namespace than your `ServiceMeshControlPlane` resource, the migration will not work properly.
100-
<2> By default, control planes watch the entire cluster. When managing multiple control planes on a single cluster, you must narrow the scope of each control plane by setting `discoverySelectors` fields. In this example, the label `tenant` is used, but you can use any label or combination of labels.
100+
<2> By default, control planes watch the entire cluster. When managing multiple control planes on a single cluster, you must narrow the scope of each control plane by setting `discoverySelectors` fields. In this example, the label `tenant-a` is used, but you can use any label or combination of labels.
101101
<3> Optional: If you are migrating metrics and tracing, update the `extensionProviders` fields according to your tracing and metrics configurations.
102102
103103
. Add your `tenant` label to each one of your dataplane namespaces by running the following command for each dataplane namespace:

0 commit comments

Comments
 (0)