Skip to content

Commit

Permalink
Merge pull request #46380 from my-git9/pt-1953
Browse files Browse the repository at this point in the history
[zh-cn] sync kms-provider kubelet-config-file
  • Loading branch information
k8s-ci-robot committed May 15, 2024
2 parents 9570ba4 + a2daa62 commit 55f203d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions content/zh-cn/docs/tasks/administer-cluster/kms-provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -514,11 +514,15 @@ defined in a CustomResourceDefinition, your cluster must be running Kubernetes v
2. 设置 kube-apiserver 的 `--encryption-provider-config` 参数指向配置文件的位置。

<!--
1. `--encryption-provider-config-automatic-reload` boolean argument determines if the file set by `--encryption-provider-config` should be automatically reloaded if the disk contents change. This enables key rotation without API server restarts.
1. `--encryption-provider-config-automatic-reload` boolean argument
determines if the file set by `--encryption-provider-config` should be
[automatically reloaded](/docs/tasks/administer-cluster/encrypt-data/#configure-automatic-reloading)
if the disk contents change. This enables key rotation without API server restarts.
1. Restart your API server.
-->
3. `--encryption-provider-config-automatic-reload` 布尔参数决定了磁盘内容发生变化时是否应自动重新加载
3. `--encryption-provider-config-automatic-reload` 布尔参数决定了磁盘内容发生变化时是否应自动
[重新加载](/zh-cn/docs/tasks/administer-cluster/encrypt-data/#configure-automatic-reloading)
通过 `--encryption-provider-config` 设置的文件。这样可以在不重启 API 服务器的情况下进行密钥轮换。

4. 重启你的 API 服务器。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ However, it's important to note that the behavior varies based on the data type

<!--
Different data types in the kubelet configuration structure merge differently. See the
[reference document](/docs/reference/node/kubelet-config-directory-merging.md)
[reference document](/docs/reference/node/kubelet-config-directory-merging)
for more information.
-->
kubelet 配置结构中不同数据类型的合并方式不同。
有关详细信息,请参阅[参考文档](/zh-cn/docs/reference/node/kubelet-config-directory-merging.md)
有关详细信息,请参阅[参考文档](/zh-cn/docs/reference/node/kubelet-config-directory-merging)

<!--
### Kubelet configuration merging order
Expand Down

0 comments on commit 55f203d

Please sign in to comment.