Skip to content

Commit 144a846

Browse files
committed
Updated the docs to add MergeDefaultEvictionSettings Kubelet Config
1 parent ed460eb commit 144a846

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

content/en/docs/concepts/scheduling-eviction/node-pressure-eviction.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,10 @@ These default values of hard eviction thresholds will only be set if none
227227
of the parameters is changed. If you change the value of any parameter,
228228
then the values of other parameters will not be inherited as the default
229229
values and will be set to zero. In order to provide custom values, you
230-
should provide all the thresholds respectively.
230+
should provide all the thresholds respectively Or you can set the Kubelet Config
231+
MergeDefaultEvictionSettings to true in the Kubelet Configuration file.
232+
If set to true and any paramater is changed, then the other parameters will
233+
inherit their default values instead of 0.
231234

232235
The `containerfs.available` and `containerfs.inodesFree` (Linux nodes) default
233236
eviction thresholds will be set as follows:

content/en/docs/tasks/administer-cluster/kubelet-config-file.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ In the example, by changing the default value of only one parameter for
6969
evictionHard, the default values of other parameters will not be inherited and
7070
will be set to zero. In order to provide custom values, you should provide all
7171
the threshold values respectively.
72+
Alternatively, you can set the MergeDefaultEvictionSettings to true in the kubelet
73+
configuration file, if any parameter is changed then the other parameters will inherit
74+
their default values instead of 0.
7275
{{< /note >}}
7376

7477
The `imagefs` is an optional filesystem that container runtimes use to store container
@@ -246,6 +249,7 @@ they can follow these steps to inspect the kubelet configuration:
246249
"nodefs.inodesFree": "5%"
247250
},
248251
"evictionPressureTransitionPeriod": "1m0s",
252+
"mergeDefaultEvictionSettings": false,
249253
"enableControllerAttachDetach": true,
250254
"makeIPTablesUtilChains": true,
251255
"iptablesMasqueradeBit": 14,

0 commit comments

Comments
 (0)