Skip to content

Commit 343e571

Browse files
authored
Merge pull request #73419 from gwynnemonahan/OSSM-3169
OSSM-3169 Missing Documentation for setting CPU/Memory requests/limits to OSSM components
2 parents 42d45d9 + 019c616 commit 343e571

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

modules/ossm-recommended-resources.adoc

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The settings in the following example are based on 1,000 services and 1,000 requ
2323
+
2424
.. Click the *YAML* tab.
2525
+
26-
.. Set the values for `spec.proxy.runtime.container.resources.requests.cpu` and `spec.proxy.runtime.container.resources.requests.memory` in your `ServiceMeshControlPlane` resource.
26+
.. Set the values for `spec.proxy.runtime.container.resources.requests.cpu`, `spec.proxy.runtime.container.resources.requests.memory`, `components.kiali.container`, and `components.global.oauthproxy` in your `ServiceMeshControlPlane` resource.
2727
+
2828
.Example version {MaistraVersion} ServiceMeshControlPlane
2929
[source,yaml, subs="attributes,verbatim"]
@@ -43,7 +43,6 @@ spec:
4343
cpu: 600m
4444
memory: 50Mi
4545
limits: {}
46-
4746
runtime:
4847
components:
4948
pilot:
@@ -53,8 +52,28 @@ spec:
5352
cpu: 1000m
5453
memory: 1.6Gi
5554
limits: {}
55+
kiali:
56+
container:
57+
resources:
58+
limits:
59+
cpu: "90m"
60+
memory: "245Mi"
61+
requests:
62+
cpu: "30m"
63+
memory: "108Mi"
64+
global.oauthproxy:
65+
container:
66+
resources:
67+
requests:
68+
cpu: "101m"
69+
memory: "256Mi"
70+
limits:
71+
cpu: "201m"
72+
memory: "512Mi"
5673
----
5774
+
75+
.. To set values for {JaegerName}, see "Configuring and deploying the distributed tracing platform Jaeger".
76+
+
5877
.. Click *Save*.
5978

6079
. Click *Reload* to verify the `ServiceMeshControlPlane` resource was configured correctly.

service_mesh/v2x/ossm-performance-scalability.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,13 @@ The default `ServiceMeshControlPlane` settings are not intended for production u
1212

1313
include::modules/ossm-recommended-resources.adoc[leveloffset=+1]
1414

15+
[role="_additional-resources"]
16+
.Additional resources
17+
ifndef::openshift-rosa,openshift-dedicated[]
18+
* xref:../../observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc#distr-tracing-deploy-default_deploying-distributed-tracing-platform[Configuring and deploying the distributed tracing platform Jaeger].
19+
endif::[]
20+
1521
include::modules/ossm-load-test-results.adoc[leveloffset=+1]
1622

23+
24+

0 commit comments

Comments
 (0)