Skip to content

Commit aba285b

Browse files
authored
Merge pull request #38211 from libander/RHDEVDOCS-3428
RHDEVDOCS-3428 - Replaced instances of 8Gi req mem with 16Gi.
2 parents 9ade713 + fd53b69 commit aba285b

6 files changed

+26
-17
lines changed

modules/cluster-logging-about-crd.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ spec:
4141
nodeSelector:
4242
node-role.kubernetes.io/worker: ""
4343
resources:
44-
request:
45-
memory: 8G
44+
limits:
45+
memory: "16Gi"
46+
requests:
47+
memory: "16Gi"
4648
proxy:
4749
resources:
4850
limits:

modules/cluster-logging-deploy-cli.adoc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,10 @@ spec:
311311
redundancyPolicy: "SingleRedundancy"
312312
nodeSelector:
313313
node-role.kubernetes.io/worker: ""
314-
resources:
315-
request:
316-
memory: 8G
314+
limits:
315+
memory: "16Gi"
316+
requests:
317+
memory: "16Gi"
317318
visualization:
318319
type: "kibana"
319320
kibana:
@@ -354,8 +355,10 @@ spec:
354355
storageClassName: "<storage-class-name>" <6>
355356
size: 200G
356357
resources: <7>
358+
limits:
359+
memory: "16Gi"
357360
requests:
358-
memory: "8Gi"
361+
memory: "16Gi"
359362
proxy: <8>
360363
resources:
361364
limits:
@@ -379,7 +382,7 @@ However, an unmanaged deployment does not receive updates until OpenShift Loggin
379382
<4> Specify the length of time that Elasticsearch should retain each log source. Enter an integer and a time designation: weeks(w), hours(h/H), minutes(m) and seconds(s). For example, `7d` for seven days. Logs older than the `maxAge` are deleted. You must specify a retention policy for each log source or the Elasticsearch indices will not be created for that source.
380383
<5> Specify the number of Elasticsearch nodes. See the note that follows this list.
381384
<6> Enter the name of an existing storage class for Elasticsearch storage. For best performance, specify a storage class that allocates block storage. If you do not specify a storage class, {product-title} deploys OpenShift Logging with ephemeral storage only.
382-
<7> Specify the CPU and memory requests for Elasticsearch as needed. If you leave these values blank, the OpenShift Elasticsearch Operator sets default values that should be sufficient for most deployments. The default values are `16G` for the memory request and `1` for the CPU request.
385+
<7> Specify the CPU and memory requests for Elasticsearch as needed. If you leave these values blank, the OpenShift Elasticsearch Operator sets default values that are sufficient for most deployments. The default values are `16Gi` for the memory request and `1` for the CPU request.
383386
<8> Specify the CPU and memory requests for the Elasticsearch proxy as needed. If you leave these values blank, the OpenShift Elasticsearch Operator sets default values that should be sufficient for most deployments. The default values are `256Mi` for the memory request and `100m` for the CPU request.
384387
<9> Settings for configuring Kibana. Using the CR, you can scale Kibana for redundancy and configure the CPU and memory for your Kibana pods. For more information, see *Configuring the log visualizer*.
385388
<10> Settings for configuring Fluentd. Using the CR, you can configure Fluentd CPU and memory limits. For more information, see *Configuring Fluentd*.

modules/cluster-logging-deploy-console.adoc

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,10 @@ spec:
154154
nodeSelector:
155155
node-role.kubernetes.io/worker: ""
156156
resources:
157+
limits:
158+
memory: "16Gi"
157159
request:
158-
memory: 8G
160+
memory: "16Gi"
159161
visualization:
160162
type: "kibana"
161163
kibana:
@@ -196,14 +198,16 @@ spec:
196198
storageClassName: "<storage_class_name>" <6>
197199
size: 200G
198200
resources: <7>
199-
requests:
200-
memory: "8Gi"
201+
limits:
202+
memory: "16Gi"
203+
requests:
204+
memory: "16Gi"
201205
proxy: <8>
202206
resources:
203207
limits:
204208
memory: 256Mi
205209
requests:
206-
memory: 256Mi
210+
memory: 256Mi
207211
redundancyPolicy: "SingleRedundancy"
208212
visualization:
209213
type: "kibana" <9>
@@ -221,7 +225,7 @@ However, an unmanaged deployment does not receive updates until OpenShift Loggin
221225
<4> Specify the length of time that Elasticsearch should retain each log source. Enter an integer and a time designation: weeks(w), hours(h/H), minutes(m) and seconds(s). For example, `7d` for seven days. Logs older than the `maxAge` are deleted. You must specify a retention policy for each log source or the Elasticsearch indices will not be created for that source.
222226
<5> Specify the number of Elasticsearch nodes. See the note that follows this list.
223227
<6> Enter the name of an existing storage class for Elasticsearch storage. For best performance, specify a storage class that allocates block storage. If you do not specify a storage class, OpenShift Logging uses ephemeral storage.
224-
<7> Specify the CPU and memory requests for Elasticsearch as needed. If you leave these values blank, the OpenShift Elasticsearch Operator sets default values that should be sufficient for most deployments. The default values are `16G` for the memory request and `1` for the CPU request.
228+
<7> Specify the CPU and memory requests for Elasticsearch as needed. If you leave these values blank, the OpenShift Elasticsearch Operator sets default values that should be sufficient for most deployments. The default values are `16Gi` for the memory request and `1` for the CPU request.
225229
<8> Specify the CPU and memory requests for the Elasticsearch proxy as needed. If you leave these values blank, the OpenShift Elasticsearch Operator sets default values that should be sufficient for most deployments. The default values are `256Mi` for the memory request and `100m` for the CPU request.
226230
<9> Settings for configuring Kibana. Using the CR, you can scale Kibana for redundancy and configure the CPU and memory for your Kibana nodes. For more information, see *Configuring the log visualizer*.
227231
<10> Settings for configuring Fluentd. Using the CR, you can configure Fluentd CPU and memory limits. For more information, see *Configuring Fluentd*.

modules/dedicated-cluster-install-deploy.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Your OpenShift Dedicated cluster includes 600 GiB of persistent storage that is
2323
exclusively available for deploying Elasticsearch for OpenShift Logging.
2424

2525
Elasticsearch is a memory-intensive application. Each Elasticsearch node needs
26-
8G of memory for both memory requests and limits. Each Elasticsearch node can
26+
16Gi of memory for both memory requests and limits. Each Elasticsearch node can
2727
operate with a lower memory setting, though this is not recommended for
2828
production deployments.
2929

@@ -100,9 +100,9 @@ spec:
100100
node-role.kubernetes.io/worker: ""
101101
resources:
102102
limits:
103-
memory: 16G
103+
memory: "16Gi"
104104
requests:
105-
memory: 16G
105+
memory: "16Gi"
106106
visualization:
107107
type: "kibana"
108108
kibana:

modules/images-create-metadata-define.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ exceed their user quota. The values must be compatible with
7575
Kubernetes quantity.
7676

7777
----
78-
LABEL io.openshift.min-memory 8Gi
78+
LABEL io.openshift.min-memory 16Gi
7979
LABEL io.openshift.min-cpu 4
8080
----
8181

modules/images-create-metadata.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ LABEL io.openshift.non-scalable true
5656
|This label suggests how much resources the container image needs to work properly. The UI can warn the user that deploying this container image may exceed their user quota. The values must be compatible with Kubernetes quantity.
5757

5858
----
59-
LABEL io.openshift.min-memory 8Gi
59+
LABEL io.openshift.min-memory 16Gi
6060
LABEL io.openshift.min-cpu 4
6161
----
6262

0 commit comments

Comments
 (0)