Skip to content

Commit 8a8b694

Browse files
authored
Merge pull request #109861 from eromanova97/manual-cp-109850-3.0
[service-mesh-docs-3.0] OSSM-13164 Fix issues in modules
2 parents 41b3d4f + 2419cc7 commit 8a8b694

50 files changed

Lines changed: 165 additions & 134 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

modules/ossm-about-directing-egress-traffic-through-a-gateway.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// * gateways/ossm-directing-outbound-traffic-through-a-gateway
44

5-
:_mod-docs-content-type: PROCEDURE
5+
:_mod-docs-content-type: CONCEPT
66
[id="ossm-about-directing-egress-traffic-through-a-gateway_{context}"]
77
= About directing egress traffic through a gateway
88

modules/ossm-about-installing-console-plugin.adoc

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

55
:_mod-docs-content-type: CONCEPT
66
[id="ossm-about-installing-console-plugin_{context}"]
7-
== About installing {sm-plugin-full}
7+
= About installing {sm-plugin-full}
88

99
[role="_abstract"]
1010

modules/ossm-about-uninstalling-console-plugin.adoc

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

55
:_mod-docs-content-type: CONCEPT
66
[id="ossm-about-uninstalling-console-plugin_{context}"]
7-
== About uninstalling {sm-plugin-full}
7+
= About uninstalling {sm-plugin-full}
88

99
[role="_abstract"]
1010

modules/ossm-config-openshift-monitoring-only.adoc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ apiVersion: monitoring.coreos.com/v1
6060
kind: PodMonitor
6161
metadata:
6262
name: istio-proxies-monitor
63-
namespace: istio-system # <1>
63+
namespace: istio-system
6464
spec:
6565
selector:
6666
matchExpressions:
@@ -101,11 +101,12 @@ spec:
101101
action: replace
102102
targetLabel: namespace
103103
- action: replace
104-
replacement: "the-mesh-identification-string" # <2>
104+
replacement: "the-mesh-identification-string"
105105
targetLabel: mesh_id
106106
----
107-
<1> Specifies that the `PodMonitor` object must be applied in all mesh namespaces, including the Istio control plane namespace, because {ocp-product-title} monitoring ignores the `namespaceSelector` spec in `ServiceMonitor` and `PodMonitor` objects.
108-
<2> Specify the actual mesh ID.
107+
+
108+
* `metadata.namespace` specifies that the `PodMonitor` object must be applied in all mesh namespaces, including the Istio control plane namespace, because {ocp-product-title} monitoring ignores the `namespaceSelector` spec in `ServiceMonitor` and `PodMonitor` objects.
109+
* `spec.podMetricsEndpoints.relabelings.replacement: "the-mesh-identification-string"` specifies the actual mesh ID.
109110
110111
. Apply the YAML file by running the following command:
111112
+

modules/ossm-config-otel-kiali.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Analyze service communication and troubleshoot request flows within the mesh by
2020

2121
. Update the `Kiali` resource `spec` configuration for tracing:
2222
+
23-
Example `Kiali` resource `spec` configuration for tracing::
23+
*Example `Kiali` resource `spec` configuration for tracing:*
2424
+
2525
[source,yaml]
2626
----
@@ -58,7 +58,7 @@ spec:
5858
$ oc patch -n istio-system kiali kiali --type merge -p "$(cat kiali_cr.yaml)"
5959
----
6060
+
61-
.Example output:
61+
*Example output:*
6262
+
6363
[source, terminal]
6464
----

modules/ossm-creating-a-default-revision-tag-and-relabeling-the-namespaces-with-cert-manager.adoc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ The `bookinfo` application is used as an example.
2020

2121
. Create a YAML file called `rev-tag.yaml` that defines the `IstioRevisionTag` resource:
2222
+
23-
.Example `IstioRevisionTag` resource
23+
*Example `IstioRevisionTag` resource:*
24+
+
2425
[source,yaml,subs="attributes,verbatim"]
2526
----
2627
apiVersion: sailoperator.io/v1
@@ -47,7 +48,8 @@ $ oc apply -f rev-tag.yaml
4748
$ oc get istiorevisiontags
4849
----
4950
+
50-
.Example output
51+
*Example output:*
52+
+
5153
[source,terminal]
5254
----
5355
NNAME STATUS IN USE REVISION AGE
@@ -87,7 +89,8 @@ Repeat steps 4 and 5 for each namespace you are migrating.
8789
$ oc get istiorevisiontags
8890
----
8991
+
90-
.Example output
92+
*Example output:*
93+
+
9194
[source,terminal]
9295
----
9396
NAME STATUS IN USE REVISION AGE
@@ -101,7 +104,8 @@ default Healthy True ossm-3-v1-24-3 28s
101104
$ istioctl ps -n bookinfo
102105
----
103106
+
104-
.Example output
107+
*Example output:*
108+
+
105109
[source,terminal]
106110
----
107111
NAME CLUSTER CDS LDS EDS RDS ECDS ISTIOD VERSION

modules/ossm-creating-a-default-revision-tag-and-relabeling-the-namespaces.adoc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ The `bookinfo` application is used as an example.
2020

2121
. Create a YAML file called `rev-tag.yaml` that defines the `IstioRevisionTag` resource:
2222
+
23-
.Example `IstioRevisionTag` resource
23+
*Example `IstioRevisionTag` resource:*
24+
+
2425
[source,yaml,subs="attributes,verbatim"]
2526
----
2627
apiVersion: sailoperator.io/v1
@@ -47,7 +48,8 @@ $ oc apply -f rev-tag.yaml
4748
$ oc get istiorevisiontags
4849
----
4950
+
50-
.Example output
51+
*Example output:*
52+
+
5153
[source,terminal]
5254
----
5355
NNAME STATUS IN USE REVISION AGE
@@ -87,7 +89,8 @@ Repeat steps 4 and 5 for each namespace you are migrating.
8789
$ oc get istiorevisiontags
8890
----
8991
+
90-
.Example output
92+
*Example output:*
93+
+
9194
[source,terminal]
9295
----
9396
NAME STATUS IN USE REVISION AGE
@@ -101,7 +104,8 @@ default Healthy True ossm-3-v1-24-3 28s
101104
$ istioctl ps -n bookinfo
102105
----
103106
+
104-
.Example output
107+
*Example output:*
108+
+
105109
[source,terminal]
106110
----
107111
NAME CLUSTER CDS LDS EDS RDS ECDS ISTIOD VERSION

modules/ossm-creating-istio-cni-project-using-console.adoc

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

1111
The {SMProductShortName} Operator deploys the {istio} CNI plugin to a project that you create. In this example, `istio-cni` is the name of the project.
1212

13-
.Prerequisties
13+
.Prerequisites
1414

1515
* You have installed the {SMProductName} Operator.
1616

modules/ossm-creating-istio-project-using-console.adoc

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

1111
The {SMProductShortName} Operator deploys the {istio} control plane to a project that you create. In this example, `istio-system` is the name of the project.
1212

13-
.Prerequisties
13+
.Prerequisites
1414

1515
* You have installed the {SMProductName} Operator.
1616

modules/ossm-creating-istio-resource-using-console.adoc

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

1111
Create the {istio} resource that will contain the YAML configuration file for your {istio} deployment. The {SMProductName} Operator uses information in the YAML file to create an instance of the {istio} control plane.
1212

13-
.Prerequisties
13+
.Prerequisites
1414

1515
* You have installed the {SMProductShortName} Operator.
1616

0 commit comments

Comments
 (0)