From 8e2794c4e7bd81ca0a02651f050955fb3bbcc185 Mon Sep 17 00:00:00 2001
From: yanrongshi <yanrong.shi@daocloud.io>
Date: Sun, 11 Sep 2022 13:57:50 +0800
Subject: [PATCH] fix some layout
---
.../feature-gates.md | 29 +++++++++++--------
.../reference/node/kubelet-checkpoint-api.md | 8 ++---
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/content/zh-cn/docs/reference/command-line-tools-reference/feature-gates.md b/content/zh-cn/docs/reference/command-line-tools-reference/feature-gates.md
index a8a66f5041..048afadf2a 100644
--- a/content/zh-cn/docs/reference/command-line-tools-reference/feature-gates.md
+++ b/content/zh-cn/docs/reference/command-line-tools-reference/feature-gates.md
@@ -106,7 +106,7 @@ different Kubernetes components.
| `AnyVolumeDataSource` | `false` | Alpha | 1.18 | 1.23 |
| `AnyVolumeDataSource` | `true` | Beta | 1.24 | |
| `AppArmor` | `true` | Beta | 1.4 | |
-| `CheckpointContainer` | `false` | Alpha | 1.25 | |
+| `ContainerCheckpoint` | `false` | Alpha | 1.25 | |
| `CPUManager` | `false` | Alpha | 1.8 | 1.9 |
| `CPUManager` | `true` | Beta | 1.10 | |
| `CPUManagerPolicyAlphaOptions` | `false` | Alpha | 1.23 | |
@@ -727,14 +727,16 @@ Each feature gate is designed for enabling/disabling a specific feature:
- `APIResponseCompression`: Compress the API responses for `LIST` or `GET` requests.
- `APIServerIdentity`: Assign each API server an ID in a cluster.
- `APIServerTracing`: Add support for distributed tracing in the API server.
- See [Traces for Kubernetes System Components](/docs/concepts/cluster-administration/traces-for-kubernetes-system-components) for more details.
+ See [Traces for Kubernetes System Components](/docs/concepts/cluster-administration/system-traces)
+ for more details.
-->
- `APIListChunking`：启用 API 客户端以块的形式从 API 服务器检索（“LIST” 或 “GET”）资源。
- `APIPriorityAndFairness`：在每个服务器上启用优先级和公平性来管理请求并发（由 `RequestManagement` 重命名而来）。
- `APIResponseCompression`：压缩 “LIST” 或 “GET” 请求的 API 响应。
- `APIServerIdentity`：为集群中的每个 API 服务器赋予一个 ID。
- `APIServerTracing`：为集群中的每个 API 服务器添加对分布式跟踪的支持。
- 参阅[针对 Kubernetes 系统组件的追踪](/zh-cn/docs/concepts/cluster-administration/system-traces/)获取更多详细信息。
+ 参阅[针对 Kubernetes 系统组件的追踪](/zh-cn/docs/concepts/cluster-administration/system-traces/)
+ 获取更多详细信息。
<!--
- `Accelerators`: Provided an early form of plugin to enable Nvidia GPU support when using
Docker Engine; no longer available. See
@@ -779,7 +781,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
flag `--service-account-extend-token-expiration=false`.
Check [Bound Service Account Tokens](https://github.com/kubernetes/enhancements/blob/master/keps/sig-auth/1205-bound-service-account-tokens/README.md)
for more details.
-- `CheckpointContainer`: Enables the kubelet `checkpoint` API.
+- `ContainerCheckpoint`: Enables the kubelet `checkpoint` API.
See [Kubelet Checkpoint API](/docs/reference/node/kubelet-checkpoint-api/) for more details.
- `ControllerManagerLeaderMigration`: Enables Leader Migration for
[kube-controller-manager](/docs/tasks/administer-cluster/controller-manager-leader-migration/#initial-leader-migration-configuration) and
@@ -800,7 +802,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
如果没有这种类型的负载，你可以在启动 `kube-apiserver` 时添加
`--service-account-extend-token-expiration=false` 参数关闭扩展令牌。
查看[绑定服务账号令牌](https://github.com/kubernetes/enhancements/blob/master/keps/sig-auth/1205-bound-service-account-tokens/README.md)获取更多详细信息。
-- `CheckpointContainer`：启用 kubelet `checkpoint` API。
+- `ContainerCheckpoint`：启用 kubelet `checkpoint` API。
参阅 [Kubelet Checkpoint API](/zh-cn/docs/reference/node/kubelet-checkpoint-api/) 获取更多详细信息。
- `ControllerManagerLeaderMigration`：为
[kube-controller-manager](/zh-cn/docs/tasks/administer-cluster/controller-manager-leader-migration/#initial-leader-migration-configuration) 和
@@ -1467,7 +1469,8 @@ Each feature gate is designed for enabling/disabling a specific feature:
- `KubeletTracing`: Add support for distributed tracing in the kubelet.
When enabled, kubelet CRI interface and authenticated http servers are instrumented to generate
OpenTelemetry trace spans.
- See [Traces for Kubernetes System Components](/docs/concepts/cluster-administration/traces-for-kubernetes-system-components) for more details.
+ See [Traces for Kubernetes System Components](/docs/concepts/cluster-administration/system-traces)
+ for more details.
- `LegacyServiceAccountTokenNoAutoGeneration`: Stop auto-generation of Secret-based
[service account tokens](/docs/reference/access-authn-authz/authentication/#service-account-tokens).
-->
@@ -1481,7 +1484,8 @@ Each feature gate is designed for enabling/disabling a specific feature:
`ServiceNodeExclusion` 对应特性所提供的标签。
- `KubeletTracing`：新增在 Kubelet 中对分布式追踪的支持。
启用时，kubelet CRI 接口和经身份验证的 http 服务器被插桩以生成 OpenTelemetry 追踪 span。
- 参阅[针对 Kubernetes 系统组件的追踪](/zh-cn/docs/concepts/cluster-administration/system-traces/)获取更多详细信息。
+ 参阅[针对 Kubernetes 系统组件的追踪](/zh-cn/docs/concepts/cluster-administration/system-traces/)
+ 获取更多详细信息。
- `LegacyServiceAccountTokenNoAutoGeneration`：停止基于 Secret
自动生成[服务账号令牌](/zh-cn/docs/reference/access-authn-authz/authentication/#service-account-tokens)。
<!--
@@ -1625,7 +1629,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
- `PodPriority`: Enable the descheduling and preemption of Pods based on their
[priorities](/docs/concepts/scheduling-eviction/pod-priority-preemption/).
- `PodReadinessGates`: Enable the setting of `PodReadinessGate` field for extending
- Pod readiness evaluation. See [Pod readiness gate](/docs/concepts/scheduling-eviction/lifecycle/#pod-readiness-gate)
+ Pod readiness evaluation. See [Pod readiness gate](/docs/concepts/workloads/pods/pod-lifecycle/#pod-readiness-gate)
for more details.
- `PodSecurity`: Enables the `PodSecurity` admission plugin.
- `PodShareProcessNamespace`: Enable the setting of `shareProcessNamespace` in a Pod for sharing
@@ -1639,7 +1643,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
的 Pod 调度和抢占。
- `PodReadinessGates`：启用 `podReadinessGate` 字段的设置以扩展 Pod 准备状态评估。
有关更多详细信息，请参见
- [Pod 就绪状态判别](/zh-cn/docs/concepts/scheduling-eviction/lifecycle/#pod-readiness-gate)。
+ [Pod 就绪状态判别](/zh-cn/docs/concepts/workloads/pods/pod-lifecycle/#pod-readiness-gate)。
- `PodSecurity`: 开启 `PodSecurity` 准入控制插件。
- `PodShareProcessNamespace`：在 Pod 中启用 `shareProcessNamespace` 的设置，
以便在 Pod 中运行的容器之间共享同一进程名字空间。更多详细信息，请参见
@@ -1720,7 +1724,8 @@ Each feature gate is designed for enabling/disabling a specific feature:
- `RootCAConfigMap`：配置 `kube-controller-manager`，使之发布一个名为 `kube-root-ca.crt`
的 {{< glossary_tooltip text="ConfigMap" term_id="configmap" >}}，
到所有名字空间中。该 ConfigMap 包含用来验证与 kube-apiserver 之间连接的 CA 证书包。
- 参阅[绑定服务账户令牌](https://github.com/kubernetes/enhancements/blob/master/keps/sig-auth/1205-bound-service-account-tokens/README.md)以了解更多细节。
+ 参阅[绑定服务账户令牌](https://github.com/kubernetes/enhancements/blob/master/keps/sig-auth/1205-bound-service-account-tokens/README.md)
+ 以了解更多细节。
<!--
- `RotateKubeletClientCertificate`: Enable the rotation of the client TLS certificate on the kubelet.
See [kubelet configuration](/docs/reference/access-authn-authz/kubelet-tls-bootstrapping/#kubelet-configuration)
@@ -1825,7 +1830,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
- `SizeMemoryBackedVolumes`: Enable kubelets to determine the size limit for
memory-backed volumes (mainly `emptyDir` volumes).
- `StartupProbe`: Enable the
- [startup](/docs/concepts/scheduling-eviction/lifecycle/#when-should-you-use-a-startup-probe)
+ [startup](/docs/concepts/workloads/pods/pod-lifecycle/#when-should-you-use-a-startup-probe)
probe in the kubelet.
- `StatefulSetMinReadySeconds`: Allows `minReadySeconds` to be respected by
the StatefulSet controller.
@@ -1834,7 +1839,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
请参见[为 Pod 设置 `setHostnameAsFQDN` 字段](/zh-cn/docs/concepts/services-networking/dns-pod-service/#pod-sethostnameasfqdn-field)。
- `SizeMemoryBackedVolumes`：允许 kubelet 检查基于内存制备的卷的尺寸约束（目前主要针对 `emptyDir` 卷）。
- `StartupProbe`：在 kubelet
- 中启用[启动探针](/zh-cn/docs/concepts/scheduling-eviction/lifecycle/#when-should-you-use-a-startup-probe)。
+ 中启用[启动探针](/zh-cn/docs/concepts/workloads/pods/pod-lifecycle/#when-should-you-use-a-startup-probe)。
- `StatefulSetMinReadySeconds`: 允许 StatefulSet 控制器采纳 `minReadySeconds` 设置。
<!--
- `StorageObjectInUseProtection`: Postpone the deletion of PersistentVolume or
diff --git a/content/zh-cn/docs/reference/node/kubelet-checkpoint-api.md b/content/zh-cn/docs/reference/node/kubelet-checkpoint-api.md
index a354ba62fd..f3c602d11c 100644
--- a/content/zh-cn/docs/reference/node/kubelet-checkpoint-api.md
+++ b/content/zh-cn/docs/reference/node/kubelet-checkpoint-api.md
@@ -139,7 +139,7 @@ POST /checkpoint/{namespace}/{pod}/{container}
401: Unauthorized
-404: Not Found (if the `CheckpointContainer` feature gate is disabled)
+404: Not Found (if the `ContainerCheckpoint` feature gate is disabled)
404: Not Found (if the specified `namespace`, `pod` or `container` cannot be found)
@@ -151,7 +151,7 @@ POST /checkpoint/{namespace}/{pod}/{container}
401: Unauthorized
-404: Not Found（如果 `CheckpointContainer` 特性门控被禁用）
+404: Not Found（如果 `ContainerCheckpoint` 特性门控被禁用）
404: Not Found（如果指定的 `namespace`、`pod` 或 `container` 无法被找到）
@@ -163,10 +163,10 @@ POST /checkpoint/{namespace}/{pod}/{container}
<!--
TODO: Add more information about return codes once CRI implementation have checkpoint/restore.
This TODO cannot be fixed before the release, because the CRI implementation need
- the Kubernetes changes to be merged to implement the new CheckpointContainer CRI API
+ the Kubernetes changes to be merged to implement the new ContainerCheckpoint CRI API
call. We need to wait after the 1.25 release to fix this.
-->
TODO：一旦 CRI 实现具有检查点/恢复能力，就会添加有关返回码的更多信息。
这个 TODO 在发布之前无法被修复，因为 CRI 实现需要先合并对 Kubernetes 的变更，
- 才能实现新的 CheckpointContainer CRI API 调用。我们需要等到 1.25 发布后才能修复此问题。
+ 才能实现新的 ContainerCheckpoint CRI API 调用。我们需要等到 1.25 发布后才能修复此问题。
{{< /comment >}}