Skip to content

Commit 6ae6e40

Browse files
authored
Merge pull request #37183 from my-git9/zhsync5
[zh-cn]sync node-pressure-eviction secrets-good-practices update-api-object-kubectl-patch
2 parents d9f7bb0 + 92188ff commit 6ae6e40

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

content/zh-cn/docs/concepts/scheduling-eviction/node-pressure-eviction.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,17 @@ kubelet 具有以下默认硬驱逐条件:
293293
* `imagefs.available<15%`
294294
* `nodefs.inodesFree<5%`(Linux 节点)
295295

296+
<!--
297+
These default values of hard eviction thresholds will only be set if none
298+
of the parameters is changed. If you changed the value of any parameter,
299+
then the values of other parameters will not be inherited as the default
300+
values and will be set to zero. In order to provide custom values, you
301+
should provide all the thresholds respectively.
302+
-->
303+
只有在没有更改任何参数的情况下,硬驱逐阈值才会被设置成这些默认值。
304+
如果你更改了任何参数的值,则其他参数的取值不会继承其默认值设置,而将被设置为零。
305+
为了提供自定义值,你应该分别设置所有阈值。
306+
296307
<!--
297308
### Eviction monitoring interval
298309

content/zh-cn/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ Patch your Deployment:
450450
修补你的 Deployment:
451451

452452
```shell
453-
kubectl patch deployment retainkeys-demo --type merge --patch-file patch-file-no-retainkeys.yaml
453+
kubectl patch deployment retainkeys-demo --type strategic --patch-file patch-file-no-retainkeys.yaml
454454
```
455455

456456
<!--

0 commit comments

Comments
 (0)