Skip to content

Commit 1f89936

Browse files
committed
Issue #30065 fix indentation issue in service_mesh/v1x/customizing-installation-ossm.adoc and similar files.
1 parent 2044671 commit 1f89936

File tree

4 files changed

+60
-62
lines changed

4 files changed

+60
-62
lines changed

modules/ossm-configuring-jaeger-v1x.adoc

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ The default Jaeger parameters specified in the `ServiceMeshControlPlane` are as
1818
.Default `all-in-one` Jaeger parameters
1919
[source,yaml]
2020
----
21-
apiVersion: maistra.io/v1
22-
kind: ServiceMeshControlPlane
23-
spec:
24-
version: v1.1
25-
istio:
26-
tracing:
27-
enabled: true
28-
jaeger:
29-
template: all-in-one
21+
apiVersion: maistra.io/v1
22+
kind: ServiceMeshControlPlane
23+
spec:
24+
version: v1.1
25+
istio:
26+
tracing:
27+
enabled: true
28+
jaeger:
29+
template: all-in-one
3030
----
3131

3232
.Jaeger parameters
@@ -67,27 +67,26 @@ Elasticsearch is a memory intensive application. The initial set of nodes specif
6767
.Default "production" Jaeger parameters with Elasticsearch
6868
[source,yaml]
6969
----
70-
apiVersion: maistra.io/v1
71-
kind: ServiceMeshControlPlane
72-
spec:
73-
istio:
74-
tracing:
70+
apiVersion: maistra.io/v1
71+
kind: ServiceMeshControlPlane
72+
spec:
73+
istio:
74+
tracing:
75+
enabled: true
76+
ingress:
7577
enabled: true
76-
ingress:
77-
enabled: true
78-
jaeger:
79-
template: production-elasticsearch
80-
elasticsearch:
81-
nodeCount: 3
82-
redundancyPolicy:
83-
resources:
84-
requests:
85-
cpu: "1"
86-
memory: "16Gi"
87-
limits:
88-
cpu: "1"
89-
memory: "16Gi"
90-
78+
jaeger:
79+
template: production-elasticsearch
80+
elasticsearch:
81+
nodeCount: 3
82+
redundancyPolicy:
83+
resources:
84+
requests:
85+
cpu: "1"
86+
memory: "16Gi"
87+
limits:
88+
cpu: "1"
89+
memory: "16Gi"
9190
----
9291

9392
.Elasticsearch parameters

modules/ossm-control-plane-templates-1x.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ deployments:
8686
+
8787
[source,yaml]
8888
----
89-
apiVersion: maistra.io/v1
90-
kind: ServiceMeshControlPlane
91-
metadata:
92-
name: minimal-install
93-
spec:
94-
template: default
89+
apiVersion: maistra.io/v1
90+
kind: ServiceMeshControlPlane
91+
metadata:
92+
name: minimal-install
93+
spec:
94+
template: default
9595
----

modules/ossm-jaeger-config-elasticsearch-v1x.adoc

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,26 @@ Elasticsearch is a memory intensive application. The initial set of nodes specif
1414
.Default "production" Jaeger parameters with Elasticsearch
1515
[source,yaml]
1616
----
17-
apiVersion: maistra.io/v1
18-
kind: ServiceMeshControlPlane
19-
spec:
20-
istio:
21-
tracing:
17+
apiVersion: maistra.io/v1
18+
kind: ServiceMeshControlPlane
19+
spec:
20+
istio:
21+
tracing:
22+
enabled: true
23+
ingress:
2224
enabled: true
23-
ingress:
24-
enabled: true
25-
jaeger:
26-
template: production-elasticsearch
27-
elasticsearch:
28-
nodeCount: 3
29-
redundancyPolicy:
30-
resources:
31-
requests:
32-
cpu: "1"
33-
memory: "16Gi"
34-
limits:
35-
cpu: "1"
36-
memory: "16Gi"
37-
25+
jaeger:
26+
template: production-elasticsearch
27+
elasticsearch:
28+
nodeCount: 3
29+
redundancyPolicy:
30+
resources:
31+
requests:
32+
cpu: "1"
33+
memory: "16Gi"
34+
limits:
35+
cpu: "1"
36+
memory: "16Gi"
3837
----
3938

4039
.Elasticsearch parameters

modules/ossm-tutorial-bookinfo-install.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ You need cluster-admin rights to edit the Istio Service Mesh Member Roll.
7272

7373
[source,yaml]
7474
----
75-
apiVersion: maistra.io/v1
76-
kind: ServiceMeshMemberRoll
77-
metadata:
78-
name: default
79-
spec:
80-
members:
81-
- bookinfo
75+
apiVersion: maistra.io/v1
76+
kind: ServiceMeshMemberRoll
77+
metadata:
78+
name: default
79+
spec:
80+
members:
81+
- bookinfo
8282
----
8383
+
8484
** Alternatively, you can run this command from the CLI to add the `bookinfo` project to the `ServiceMeshMemberRoll`. Replace `<control_plane_project>` with the name of your control plane project.

0 commit comments

Comments
 (0)