Skip to content

Commit 1f2a8f1

Browse files
authored
Merge pull request #66250 from PoornimaSingour/patch-3
/lgtm, merging
2 parents a0c5ccf + 1a9ccc4 commit 1f2a8f1

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

modules/create-a-containerruntimeconfig-crd.adoc

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ $ oc get ctrcfg
5050
[source,terminal]
5151
----
5252
NAME AGE
53-
ctr-pid 24m
5453
ctr-overlay 15m
5554
ctr-level 5m45s
5655
----
@@ -75,7 +74,7 @@ $ oc get mc | grep container
7574
...
7675
----
7776

78-
The following example raises the `pids_limit` to 2048, sets the `log_level` to `debug`, sets the overlay size to 8 GB, and sets the `log_size_max` to unlimited:
77+
The following example sets the `log_level` field to `debug` and sets the overlay size to 8 GB:
7978

8079
.Example `ContainerRuntimeConfig` CR
8180
[source,yaml]
@@ -89,19 +88,14 @@ spec:
8988
matchLabels:
9089
pools.operator.machineconfiguration.openshift.io/worker: '' <1>
9190
containerRuntimeConfig:
92-
pidsLimit: 2048 <2>
93-
logLevel: debug <3>
94-
overlaySize: 8G <4>
95-
logSizeMax: "-1" <5>
96-
defaultRuntime: "crun" <6>
91+
logLevel: debug <2>
92+
overlaySize: 8G <3>
93+
defaultRuntime: "crun" <4>
9794
----
9895
<1> Specifies the machine config pool label.
99-
<2> Optional: Specifies the maximum number of processes allowed in a container.
100-
<3> Optional: Specifies the level of verbosity for log messages.
101-
<4> Optional: Specifies the maximum size of a container image.
102-
<5> Optional: Specifies the maximum size allowed for the container log file. If
103-
set to a positive number, it must be at least 8192.
104-
<6> Optional: Specifies the container runtime to deploy to new containers. The default is `runc`.
96+
<2> Optional: Specifies the level of verbosity for log messages.
97+
<3> Optional: Specifies the maximum size of a container image.
98+
<4> Optional: Specifies the container runtime to deploy to new containers. The default value is `runc`.
10599

106100
.Procedure
107101

@@ -120,10 +114,8 @@ spec:
120114
matchLabels:
121115
pools.operator.machineconfiguration.openshift.io/worker: '' <1>
122116
containerRuntimeConfig: <2>
123-
pidsLimit: 2048
124117
logLevel: debug
125118
overlaySize: 8G
126-
logSizeMax: "-1"
127119
----
128120
<1> Specify a label for the machine config pool that you want you want to modify.
129121
<2> Set the parameters as needed.
@@ -195,15 +187,13 @@ sh-4.4# chroot /host
195187
+
196188
[source,terminal]
197189
----
198-
sh-4.4# crio config | egrep 'log_level|pids_limit|log_size_max'
190+
sh-4.4# crio config | grep 'log_level'
199191
----
200192
+
201193
.Example output
202194
+
203195
[source,terminal]
204196
----
205-
pids_limit = 2048
206-
log_size_max = -1
207197
log_level = "debug"
208198
----
209199

modules/set-the-default-max-container-root-partition-size-for-overlay-with-crio.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
The root partition of each container shows all of the available disk space of the underlying host. Follow this guidance to set a maximum partition size for the root disk of all containers.
1010

11-
To configure the maximum Overlay size, as well as other CRI-O options like the log level and PID limit, you can create the following `ContainerRuntimeConfig` custom resource definition (CRD):
11+
To configure the maximum Overlay size, as well as other CRI-O options like the log level, you can create the following `ContainerRuntimeConfig` custom resource definition (CRD):
1212

1313
[source,yaml]
1414
----
@@ -21,7 +21,6 @@ spec:
2121
matchLabels:
2222
custom-crio: overlay-size
2323
containerRuntimeConfig:
24-
pidsLimit: 2048
2524
logLevel: debug
2625
overlaySize: 8G
2726
----

0 commit comments

Comments
 (0)