Skip to content

Commit 1431010

Browse files
authored
Merge pull request #30281 from neal-timpe/ossmdoc-277
ossmdoc-277 and ossmdoc-262
2 parents 284fa03 + 4417bae commit 1431010

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

modules/ossm-cr-istio-global-1x.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ These parameters are specific to the proxy subset of global parameters.
7575
|===
7676
|Type |Parameter |Description |Values |Default value
7777

78-
|Resources
78+
|Requests
7979
|`cpu`
8080
|The amount of CPU resources requested for Envoy proxy.
8181
|CPU resources, specified in cores or millicores (for example, 200m, 0.5, 1) based on your environment’s configuration.
@@ -85,7 +85,7 @@ These parameters are specific to the proxy subset of global parameters.
8585
|`memory`
8686
|The amount of memory requested for Envoy proxy
8787
|Available memory in bytes(for example, 200Ki, 50Mi, 5Gi) based on your environment’s configuration.
88-
|`1024Mi`
88+
|`128Mi`
8989

9090
|Limits
9191
|`cpu`
@@ -97,5 +97,5 @@ These parameters are specific to the proxy subset of global parameters.
9797
|`memory`
9898
|The maximum amount of memory Envoy proxy is permitted to use.
9999
|Available memory in bytes (for example, 200Ki, 50Mi, 5Gi) based on your environment’s configuration.
100-
|`128Mi`
100+
|`1024Mi`
101101
|===

modules/ossm-cr-istio-global.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ These parameters are specific to the proxy subset of global parameters.
7575
|===
7676
|Type |Parameter |Description |Values |Default value
7777

78-
|Resources
78+
|Requests
7979
|`cpu`
8080
|The amount of CPU resources requested for Envoy proxy.
8181
|CPU resources, specified in cores or millicores (for example, 200m, 0.5, 1) based on your environment’s configuration.
@@ -85,7 +85,7 @@ These parameters are specific to the proxy subset of global parameters.
8585
|`memory`
8686
|The amount of memory requested for Envoy proxy
8787
|Available memory in bytes(for example, 200Ki, 50Mi, 5Gi) based on your environment’s configuration.
88-
|`1024Mi`
88+
|`128Mi`
8989

9090
|Limits
9191
|`cpu`
@@ -97,5 +97,5 @@ These parameters are specific to the proxy subset of global parameters.
9797
|`memory`
9898
|The maximum amount of memory Envoy proxy is permitted to use.
9999
|Available memory in bytes (for example, 200Ki, 50Mi, 5Gi) based on your environment’s configuration.
100-
|`128Mi`
100+
|`1024Mi`
101101
|===

modules/ossm-cr-mixer-1x.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ mixer:
5555
|===
5656
|Type |Parameter |Description |Values |Default
5757

58-
|Resources
58+
|Requests
5959
|`cpu`
6060
|The percentage of CPU resources requested for Mixer telemetry.
6161
|CPU resources in millicores based on your environment's configuration.

modules/ossm-cr-mixer.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ mixer:
5555
|===
5656
|Type |Parameter |Description |Values |Default
5757

58-
|Resources
58+
|Requests
5959
|`cpu`
6060
|The percentage of CPU resources requested for Mixer telemetry.
6161
|CPU resources in millicores based on your environment's configuration.

modules/ossm-document-attributes-1x.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
:ProductName: Red Hat OpenShift Service Mesh
1313
:ProductShortName: Service Mesh
1414
:ProductRelease:
15-
:ProductVersion: 1.1.11
15+
:ProductVersion: 1.1.12
1616
:MaistraVersion: 1.1
1717
:product-build:
1818
:DownloadURL: registry.redhat.io

modules/ossm-document-attributes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
:ProductName: Red Hat OpenShift Service Mesh
1313
:ProductShortName: Service Mesh
1414
:ProductRelease:
15-
:ProductVersion: 2.0.1
15+
:ProductVersion: 2.0.2
1616
:MaistraVersion: 2.0
1717
:product-build:
1818
:DownloadURL: registry.redhat.io

0 commit comments

Comments
 (0)