Skip to content

Commit 9a334f3

Browse files
committed
sync cpu-management-policies dns-debugging-resolution kubelet-config-file
Update cpu-management-policies.md
1 parent bfce28e commit 9a334f3

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

content/zh-cn/docs/tasks/administer-cluster/cpu-management-policies.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ using the following feature gates:
269269
You will still have to enable each option using the `CPUManagerPolicyOptions` kubelet option.
270270
271271
The following policy options exist for the static `CPUManager` policy:
272-
* `full-pcpus-only` (beta, visible by default) (1.22 or higher)
273-
* `distribute-cpus-across-numa` (alpha, hidden by default) (1.23 or higher)
272+
* `full-pcpus-only` (GA, visible by default) (1.33 or higher)
273+
* `distribute-cpus-across-numa` (beta, visible by default) (1.33 or higher)
274274
* `align-by-socket` (alpha, hidden by default) (1.25 or higher)
275275
* `distribute-cpus-across-cores` (alpha, hidden by default) (1.31 or higher)
276276
* `strict-cpu-reservation` (beta, visible by default) (1.32 or higher)
@@ -284,8 +284,8 @@ The following policy options exist for the static `CPUManager` policy:
284284
你仍然必须使用 `CPUManagerPolicyOptions` kubelet 选项启用每个选项。
285285

286286
静态 `CPUManager` 策略存在以下策略选项:
287-
* `full-pcpus-only`Beta,默认可见)(1.22 或更高版本)
288-
* `distribute-cpus-across-numa`Alpha,默认隐藏)(1.23 或更高版本)
287+
* `full-pcpus-only`GA,默认可见)(1.33 或更高版本)
288+
* `distribute-cpus-across-numa`Beta,默认可见)(1.33 或更高版本)
289289
* `align-by-socket`(Alpha,默认隐藏)(1.25 或更高版本)
290290
* `distribute-cpus-across-cores` (Alpha,默认隐藏) (1.31 或更高版本)
291291
* `strict-cpu-reservation` (Beta,默认可见) (1.32 或更高版本)

content/zh-cn/docs/tasks/administer-cluster/dns-debugging-resolution.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -290,20 +290,20 @@ more information.
290290
<!--
291291
### Are DNS endpoints exposed?
292292
293-
You can verify that DNS endpoints are exposed by using the `kubectl get endpoints`
293+
You can verify that DNS endpoints are exposed by using the `kubectl get endpointslice`
294294
command.
295295
-->
296296
### DNS 的端点公开了吗? {#are-dns-endpoints-exposed}
297297

298-
你可以使用 `kubectl get endpoints` 命令来验证 DNS 的端点是否公开了。
298+
你可以使用 `kubectl get endpointslice` 命令来验证 DNS 的端点是否公开了。
299299

300300
```shell
301-
kubectl get endpoints kube-dns --namespace=kube-system
301+
kubectl get endpointslices -l k8s.io/service-name=kube-dns --namespace=kube-system
302302
```
303303

304304
```
305-
NAME ENDPOINTS AGE
306-
kube-dns 10.180.3.17:53,10.180.3.17:53 1h
305+
NAME ADDRESSTYPE PORTS ENDPOINTS AGE
306+
kube-dns-zxoja IPv4 53 10.180.3.17,10.180.3.17 1h
307307
```
308308

309309
<!--
@@ -398,15 +398,15 @@ linux/amd64, go1.10.3, 2e322f6
398398
### Does CoreDNS have sufficient permissions?
399399
400400
CoreDNS must be able to list {{< glossary_tooltip text="service"
401-
term_id="service" >}} and {{< glossary_tooltip text="endpoint"
402-
term_id="endpoint" >}} related resources to properly resolve service names.
401+
term_id="service" >}} and {{< glossary_tooltip text="endpointslice"
402+
term_id="endpoint-slice" >}} related resources to properly resolve service names.
403403
404404
Sample error message:
405405
-->
406406
### CoreDNS 是否有足够的权限? {#does-coredns-have-sufficient-permissions}
407407

408408
CoreDNS 必须能够列出 {{< glossary_tooltip text="service" term_id="service" >}} 和
409-
{{< glossary_tooltip text="endpoint" term_id="endpoint" >}} 相关的资源来正确解析服务名称。
409+
{{< glossary_tooltip text="endpointslice" term_id="endpoint-slice" >}} 相关的资源来正确解析服务名称。
410410

411411
示例错误消息:
412412

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

+6
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,14 @@ In the example, by changing the default value of only one parameter for
113113
evictionHard, the default values of other parameters will not be inherited and
114114
will be set to zero. In order to provide custom values, you should provide all
115115
the threshold values respectively.
116+
Alternatively, you can set the MergeDefaultEvictionSettings to true in the kubelet
117+
configuration file, if any parameter is changed then the other parameters will inherit
118+
their default values instead of 0.
116119
-->
117120
在此示例中,只更改 evictionHard 的一个参数的默认值,
118121
这样其他参数的默认值将不会被继承,其他参数会被设置为零。如果要提供自定义值,你应该分别设置所有阈值。
122+
或者,你也可以在 kubelet 配置文件中将 MergeDefaultEvictionSettings 设置为 true,
123+
这样如果修改了其中某个参数,其他参数将继承其默认值,而不是被设为 0。
119124
{{< /note >}}
120125

121126
<!--
@@ -384,6 +389,7 @@ they can follow these steps to inspect the kubelet configuration:
384389
"imagefs.inodesFree": "5%"
385390
},
386391
"evictionPressureTransitionPeriod": "1m0s",
392+
"mergeDefaultEvictionSettings": false,
387393
"enableControllerAttachDetach": true,
388394
"makeIPTablesUtilChains": true,
389395
"iptablesMasqueradeBit": 14,

0 commit comments

Comments
 (0)