Merge master into dev-1.21 to keep in sync, plus latest API reference
This sync merge includes API reference updates.
This commit is contained in:
@@ -153,7 +153,7 @@ data:
|
||||
ttl 30
|
||||
}
|
||||
prometheus :9153
|
||||
forward ./etc/resolv.conf
|
||||
forward . /etc/resolv.conf
|
||||
cache 30
|
||||
loop
|
||||
reload
|
||||
|
||||
@@ -79,7 +79,7 @@ Refer to your cloud provider for instructions on enabling the cloud provider-spe
|
||||
-->
|
||||
### 启用由云服务驱动支持的 KMS
|
||||
|
||||
有关启用云服务驱动特定的 KMS 插件的说明,请咨询你的云服务驱动。
|
||||
有关启用云服务驱动特定的 KMS 插件的说明,请咨询你的云服务驱动商。
|
||||
|
||||
<!--
|
||||
### Developing a KMS plugin gRPC server
|
||||
|
||||
@@ -269,7 +269,7 @@ to do so are available at [Install Docker Engine - Enterprise on Windows Servers
|
||||
All code snippets in Windows sections are to be run in a PowerShell environment
|
||||
with elevated permissions (Administrator) on the Windows worker node.
|
||||
-->
|
||||
### 加入 Windows 工作节点 {joining-a-windows-worker-node}
|
||||
### 加入 Windows 工作节点 {#joining-a-windows-worker-node}
|
||||
|
||||
你必须安装 `Containers` 功能特性并安装 Docker 工具。相关的指令可以在
|
||||
[Install Docker Engine - Enterprise on Windows Servers](https://hub.docker.com/editions/enterprise/docker-ee-server-windows)
|
||||
|
||||
@@ -160,20 +160,21 @@ kubernetes 系统守护进程记述其资源预留值。
|
||||
kubernetes 系统守护进程预留指定数量的进程 ID。
|
||||
|
||||
<!--
|
||||
To optionally enforce `kube-reserved` on system daemons, specify the parent
|
||||
To optionally enforce `kube-reserved` on kubernetes system daemons, specify the parent
|
||||
control group for kube daemons as the value for `--kube-reserved-cgroup` kubelet
|
||||
flag.
|
||||
|
||||
It is recommended that the kubernetes system daemons are placed under a top
|
||||
level control group (`runtime.slice` on systemd machines for example). Each
|
||||
system daemon should ideally run within its own child control group. Refer to
|
||||
[this doc](https://git.k8s.io/community/contributors/design-proposals/node/node-allocatable.md#recommended-cgroups-setup)
|
||||
[this
|
||||
doc](https://git.k8s.io/community/contributors/design-proposals/node/node-allocatable.md#recommended-cgroups-setup)
|
||||
for more details on recommended control group hierarchy.
|
||||
|
||||
Note that Kubelet **does not** create `--kube-reserved-cgroup` if it doesn't
|
||||
exist. Kubelet will fail if an invalid cgroup is specified.
|
||||
-->
|
||||
要选择性地对系统守护进程上执行 `kube-reserved` 保护,需要把 kubelet 的
|
||||
要选择性地对 kubernetes 系统守护进程上执行 `kube-reserved` 保护,需要把 kubelet 的
|
||||
`--kube-reserved-cgroup` 标志的值设置为 kube 守护进程的父控制组。
|
||||
|
||||
推荐将 kubernetes 系统守护进程放置于顶级控制组之下(例如 systemd 机器上的
|
||||
|
||||
Reference in New Issue
Block a user