Skip to content

Commit 4c334c3

Browse files
authored
Merge pull request #46242 from asa3311/sync-zh-117
[zh] sync control-plane-flags encrypt-data
2 parents df7bcdc + 31c962c commit 4c334c3

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

content/zh-cn/docs/setup/production-environment/tools/kubeadm/control-plane-flags.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,19 +275,19 @@ For example, `kube-apiserver0+merge.yaml` or just `etcd.json`.
275275
<!--
276276
- `target` can be one of `kube-apiserver`, `kube-controller-manager`, `kube-scheduler`, `etcd`
277277
and `kubeletconfiguration`.
278+
- `suffix` is an optional string that can be used to determine which patches are applied first
279+
alpha-numerically.
278280
- `patchtype` can be one of `strategic`, `merge` or `json` and these must match the patching formats
279281
[supported by kubectl](/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch).
280282
The default `patchtype` is `strategic`.
281283
- `extension` must be either `json` or `yaml`.
282-
- `suffix` is an optional string that can be used to determine which patches are applied first
283-
alpha-numerically.
284284
-->
285285
- `target` 可以是 `kube-apiserver`、`kube-controller-manager`、`kube-scheduler`、`etcd` 和 `kubeletconfiguration` 之一。
286+
- `suffix` 是一个可选字符串,可用于确定首先按字母数字应用哪些补丁。
286287
- `patchtype` 可以是 `strategy`、`merge` 或 `json` 之一,并且这些必须匹配
287288
[kubectl 支持](/zh-cn/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch) 的补丁格式。
288289
默认补丁类型是 `strategic` 的。
289290
- `extension` 必须是 `json` 或 `yaml`。
290-
- `suffix` 是一个可选字符串,可用于确定首先按字母数字应用哪些补丁。
291291

292292
{{< note >}}
293293
<!--

content/zh-cn/docs/tasks/administer-cluster/encrypt-data.md

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ Generate a 32-byte random key and base64 encode it. You can use this command:
736736

737737
{{< note >}}
738738
<!--
739-
Keep the encryption key confidential, including whilst you generate it and
739+
Keep the encryption key confidential, including while you generate it and
740740
ideally even after you are no longer actively using it.
741741
-->
742742
保持加密密钥的机密性,包括在生成密钥时,甚至理想的情况下在你不再主动使用密钥后也要保密。
@@ -913,14 +913,34 @@ Kubernetes cluster has multiple control plane hosts, so there is more to do.
913913
914914
If you have multiple API servers in your cluster, you should deploy the
915915
changes in turn to each API server.
916-
917-
Make sure that you use the **same** encryption configuration on each
918-
control plane host.
919916
-->
920917
### 重新配置其他控制平面主机 {#api-server-config-update-more}
921918

922919
如果你的集群中有多个 API 服务器,应轮流将更改部署到每个 API 服务器。
923920

921+
{{< caution >}}
922+
<!--
923+
For cluster configurations with two or more control plane nodes, the encryption configuration
924+
should be identical across each control plane node.
925+
926+
If there is a difference in the encryption provider configuration between control plane
927+
nodes, this difference may mean that the kube-apiserver can't decrypt data.
928+
-->
929+
对于具有两个或更多控制平面节点的集群配置,每个控制平面节点的加密配置应该是相同的。
930+
931+
如果控制平面节点间的加密驱动配置不一致,这种差异可能导致 kube-apiserver 无法解密数据。
932+
{{< /caution >}}
933+
934+
<!--
935+
When you are planning to update the encryption configuration of your cluster, plan this
936+
so that the API servers in your control plane can always decrypt the stored data
937+
(even part way through rolling out the change).
938+
939+
Make sure that you use the **same** encryption configuration on each
940+
control plane host.
941+
-->
942+
你在计划更新集群的加密配置时,请确保控制平面中的 API 服务器在任何时候都能解密存储的数据(即使是在更改逐步实施的过程中也是如此)。
943+
924944
确保在每个控制平面主机上使用**相同的**加密配置。
925945

926946
<!--

0 commit comments

Comments
 (0)