Skip to content

Commit 9526541

Browse files
committed
[zh-cn] sync encrypt-data create-cluster-kubeadm encrypt-data localization
Signed-off-by: xin.li <[email protected]>
1 parent 75ad0a2 commit 9526541

File tree

4 files changed

+71
-30
lines changed

4 files changed

+71
-30
lines changed

content/zh-cn/docs/contribute/localization.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,21 @@ script and use it in the theme. Assign "language name in latin script" to
341341
例如,`languageNameLatinScript ="Korean"``languageNameLatinScript = "Deutsch"`
342342

343343
<!--
344-
When assigning a `weight` parameter for your block, find the language block with
345-
the highest weight and add 1 to that value.
344+
The `weight` parameter determines the order of languages in the language selection bar.
345+
A lower weight takes precedence, resulting in the language appearing first.
346+
When assigning the `weight` parameter, it is important to examine the existing languages
347+
block and adjust their weights to ensure they are in a sorted order relative to all languages,
348+
including any newly added language.
349+
-->
350+
`weight` 参数决定语言选择栏中的语言顺序,
351+
优先显示权重较低的语言。
352+
分配 `weight` 参数时,检查现有语言块并调整其权重以确保它们相对于所有语言
353+
(包括任何新添加的语言)按排序顺序非常重要。
346354

355+
<!--
347356
For more information about Hugo's multilingual support, see
348357
"[Multilingual Mode](https://gohugo.io/content-management/multilingual/)".
349358
-->
350-
为你的语言块分配一个 `weight` 参数时,找到权重最高的语言块并将其加 1。
351359

352360
有关 Hugo 多语言支持的更多信息,请参阅"[多语言模式](https://gohugo.io/content-management/multilingual/)"。
353361

@@ -781,7 +789,7 @@ German (`de`):
781789
[`data/i18n/en/en.toml`](https://github.com/kubernetes/website/blob/main/data/i18n/en/en.toml)
782790
的内容。以德语为例:`data/i18n/de/de.toml`。
783791

784-
将新的本地化文件和目录添加到 `data/i18n/`。例如德语 (`de`)
792+
将新的本地化文件和目录添加到 `data/i18n/`。例如德语`de`
785793

786794
```bash
787795
mkdir -p data/i18n/de

content/zh-cn/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,11 +1072,11 @@ Example:
10721072
### kubeadm 中 kubelet 的版本偏差 {#kubeadm-s-skew-against-the-kubelet}
10731073

10741074
<!--
1075-
Similarly to the Kubernetes version, kubeadm can be used with a kubelet version that is the same
1076-
version as kubeadm or one version older.
1075+
Similarly to the Kubernetes version, kubeadm can be used with a kubelet version that is
1076+
the same version as kubeadm or three version older.
10771077
-->
10781078
与 Kubernetes 版本类似,kubeadm 可以使用与 kubeadm 相同版本的 kubelet,
1079-
或者比 kubeadm 老一个版本的 kubelet。
1079+
或者比 kubeadm 老三个版本的 kubelet。
10801080

10811081
<!--
10821082
Example:

content/zh-cn/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ before CoreDNS may be deployed fully. Hence the `Pending` state before the netwo
227227
-->
228228
## `coredns` 停滞在 `Pending` 状态
229229

230-
这一行为是 **预期之中** 的,因为系统就是这么设计的。kubeadm 的网络供应商是中立的,
230+
这一行为是**预期之中**的,因为系统就是这么设计的。kubeadm 的网络供应商是中立的,
231231
因此管理员应该选择[安装 Pod 的网络插件](/zh-cn/docs/concepts/cluster-administration/addons/)。
232232
你必须完成 Pod 的网络配置,然后才能完全部署 CoreDNS。
233233
在网络被配置好之前,DNS 组件会一直处于 `Pending` 状态。
@@ -258,8 +258,8 @@ or use `HostNetwork=true`.
258258
有关更多信息,请参考 [CNI portmap 文档](https://github.com/containernetworking/plugins/blob/master/plugins/meta/portmap/README.md).
259259

260260
如果你的网络提供商不支持 portmap CNI 插件,你或许需要使用
261-
[NodePort 服务的功能](/zh-cn/docs/concepts/services-networking/service/#type-nodeport)
262-
或者使用 `HostNetwork=true`。
261+
[NodePort 服务的功能](/zh-cn/docs/concepts/services-networking/service/#type-nodeport)或者使用
262+
`HostNetwork=true`
263263

264264
<!--
265265
## Pods are not accessible via their Service IP
@@ -284,7 +284,8 @@ or use `HostNetwork=true`.
284284

285285
- 如果你正在使用 VirtualBox (直接使用或者通过 Vagrant 使用),你需要
286286
确保 `hostname -i` 返回一个可路由的 IP 地址。默认情况下,第一个接口连接不能路由的仅主机网络。
287-
解决方法是修改 `/etc/hosts`,请参考示例 [Vagrantfile](https://github.com/errordeveloper/k8s-playground/blob/22dd39dfc06111235620e6c4404a96ae146f26fd/Vagrantfile#L11)。
287+
解决方法是修改 `/etc/hosts`,请参考示例
288+
[Vagrantfile](https://github.com/errordeveloper/k8s-playground/blob/22dd39dfc06111235620e6c4404a96ae146f26fd/Vagrantfile#L11)。
288289

289290
<!--
290291
## TLS certificate errors
@@ -359,15 +360,16 @@ in kube-apiserver logs. To fix the issue you must follow these steps:
359360
`kubeadm kubeconfig user --org system:nodes --client-name system:node:$NODE > kubelet.conf`.
360361
`$NODE` must be set to the name of the existing failed node in the cluster.
361362
Modify the resulted `kubelet.conf` manually to adjust the cluster name and server endpoint,
362-
or pass `kubeconfig user --config` (it accepts `InitConfiguration`). If your cluster does not have
363+
(see [Generating kubeconfig files for additional users](/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/#kubeconfig-additional-users)). If your cluster does not have
363364
the `ca.key` you must sign the embedded certificates in the `kubelet.conf` externally.
364365
-->
365366
1. 从故障节点备份和删除 `/etc/kubernetes/kubelet.conf` 和 `/var/lib/kubelet/pki/kubelet-client*`。
366367
2. 在集群中具有 `/etc/kubernetes/pki/ca.key` 的、正常工作的控制平面节点上
367368
执行 `kubeadm kubeconfig user --org system:nodes --client-name system:node:$NODE > kubelet.conf`。
368369
`$NODE` 必须设置为集群中现有故障节点的名称。
369370
手动修改生成的 `kubelet.conf` 以调整集群名称和服务器端点,
370-
或传递 `kubeconfig user --config`(此命令接受 `InitConfiguration`)。
371+
或传递 `kubeconfig user --config`
372+
(请参阅[为其他用户生成 kubeconfig 文件](/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-certs/#kubeconfig-additional-users))。
371373
如果你的集群没有 `ca.key`,你必须在外部对 `kubelet.conf` 中的嵌入式证书进行签名。
372374
<!--
373375
1. Copy this resulted `kubelet.conf` to `/etc/kubernetes/kubelet.conf` on the failed node.
@@ -681,7 +683,7 @@ for the feature to work.
681683
在支持 [FlexVolume](https://github.com/kubernetes/community/blob/ab55d85/contributors/devel/sig-storage/flexvolume.md) 时,
682684
类似 kubelet 和 kube-controller-manager 这类 Kubernetes 组件使用默认路径
683685
`/usr/libexec/kubernetes/kubelet-plugins/volume/exec/`
684-
而 FlexVolume 的目录 **必须是可写入的**,该功能特性才能正常工作。
686+
而 FlexVolume 的目录**必须是可写入的**,该功能特性才能正常工作。
685687

686688
{{< note >}}
687689
<!--

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

Lines changed: 47 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -314,28 +314,57 @@ are determined by the order it's listed in the configuration.
314314
{{< /note >}}
315315

316316
<!--
317-
Opting out of encryption for specific resources while wildcard is enabled can be achieved by adding a new
318-
`resources` array item with the resource name, followed by the `providers` array item with the `identity` provider.
319-
For example, if '`*.*`' is enabled and you want to opt-out encryption for the `events` resource, add a new item
320-
to the `resources` array with `events` as the resource name, followed by the providers array item with `identity`.
321-
The new item should look like this:
317+
If you have a wildcard covering resources and want to opt out of at-rest encryption for a particular kind
318+
of resource, you achieve that by adding a separate `resources` array item with the name of the resource that
319+
you want to exempt, followed by a `providers` array item where you specify the `identity` provider. You add
320+
this item to the list so that it appears earlier than the configuration where you do specify encryption
321+
(a provider that is not `identity`).
322322
-->
323-
如果启用了通配符,但想要针对特定资源退出加密,则可以通过添加带有资源名称的新 `resources` 数组项
324-
后跟附带 `identity` 提供商的 `providers` 数组项。例如,如果启用了 “`*.*`
325-
但想要排除对 `events` 资源的加密,则应向 `resources` 数组添加一个新项(以 `events` 为资源名称),
326-
后跟包含 `identity` 的提供程序数组。新项应如下所示:
323+
如果你有一个涵盖资源(resource)的通配符,并且想要过滤掉静态加密的特定类型资源
324+
则可以通过添加一个单独的 `resources` 数组项来实现此目的
325+
其中包含要豁免的资源的名称,还可以在其后跟一个 `providers` 数组项来指定 `identity` 提供商。
326+
你可以将此数组项添加到列表中,以便它早于你指定加密的配置(不是 `identity` 的提供商)出现。
327327

328+
<!--
329+
For example, if '`*.*`' is enabled and you want to opt out of encryption for Events and ConfigMaps, add a
330+
new **earlier** item to the `resources`, followed by the providers array item with `identity` as the
331+
provider. The more specific entry must come before the wildcard entry.
332+
333+
The new item would look similar to:
334+
-->
335+
例如,如果启用了 '`*.*`',并且你想要选择不加密 Event 和 ConfigMap,
336+
请在 `resources`**靠前**的位置添加一个新的条目,后跟带有 `identity`
337+
的 providers 数组项作为提供程序。较为特定的条目必须位于通配符条目之前。
338+
339+
新项目看起来类似于:
340+
341+
<!--
328342
```yaml
329-
- resources:
330-
- events
331-
providers:
332-
- identity: {}
343+
...
344+
- resources:
345+
- configmaps. # specifically from the core API group,
346+
# because of trailing "."
347+
- events
348+
providers:
349+
- identity: {}
350+
# and then other entries in resources
351+
```
352+
-->
353+
```yaml
354+
...
355+
- resources:
356+
- configmaps. # 特定于来自核心 API 组的资源,因为结尾是 “.”
357+
- events
358+
providers:
359+
- identity: {}
360+
# 然后是资源中的其他条目
333361
```
334362

335363
<!--
336-
Ensure that the new item is listed before the wildcard '`*.*`' item in the resources array to give it precedence.
364+
Ensure that the new item is listed _before_ the wildcard '`*.*`' item in the resources array
365+
to give it precedence.
337366
-->
338-
确保新项列在资源数组中的通配符 “`*.*`” 项之前,使新项优先。
367+
确保新项列在资源数组中的通配符 “`*.*`**之前**,使新项优先。
339368

340369
<!--
341370
For more detailed information about the `EncryptionConfiguration` struct, please refer to the
@@ -396,7 +425,9 @@ Kubernetes 静态数据加密的提供程序
396425
<tr>
397426
<td colspan="4">
398427
<!--
399-
Resources written as-is without encryption. When set as the first provider, the resource will be decrypted as new values are written. Existing encrypted resources are <strong>not</strong> automatically overwritten with the plaintext data.
428+
Resources written as-is without encryption. When set as the first provider,
429+
the resource will be decrypted as new values are written.
430+
Existing encrypted resources are <strong>not</strong> automatically overwritten with the plaintext data.
400431
The <tt>identity</tt> provider is the default if you do not specify otherwise.
401432
-->
402433
不加密写入的资源。当设置为第一个提供程序时,已加密的资源将在新值写入时被解密。

0 commit comments

Comments
 (0)