Skip to content

Commit aaaf8c1

Browse files
authored
Merge pull request #47490 from asa3311/sync-zh-140
[zh] sync configure-cgroup-driver configure-service-account configure-pdb
2 parents 2aa6efa + 77647cd commit aaaf8c1

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

content/zh-cn/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ A minimal example of configuring the field explicitly:
9090
```yaml
9191
# kubeadm-config.yaml
9292
kind: ClusterConfiguration
93-
apiVersion: kubeadm.k8s.io/v1beta3
93+
apiVersion: kubeadm.k8s.io/v1beta4
9494
kubernetesVersion: v1.21.0
9595
---
9696
kind: KubeletConfiguration

content/zh-cn/docs/tasks/configure-pod-container/configure-service-account.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,23 +301,25 @@ token might be shorter, or could even be longer).
301301
你可以使用 `kubectl create token` 命令的 `--duration` 参数来请求特定的令牌有效期
302302
(实际签发的令牌的有效期可能会稍短一些,也可能会稍长一些)。
303303

304+
{{< feature-state feature_gate_name="ServiceAccountTokenNodeBinding" >}}
305+
304306
<!--
305307
When the `ServiceAccountTokenNodeBinding` and `ServiceAccountTokenNodeBindingValidation`
306-
features are enabled and the `KUBECTL_NODE_BOUND_TOKENS` environment variable is set to `true`,
307-
it is possible to create a service account token that is directly bound to a `Node`:
308+
features are enabled, and using `kubectl` v1.31 or later, it is possible to create a service
309+
account token that is directly bound to a Node:
308310
-->
309311
当启用了 `ServiceAccountTokenNodeBinding` 和 `ServiceAccountTokenNodeBindingValidation`
310-
特性,并将 `KUBECTL_NODE_BOUND_TOKENS` 环境变量设置为 `true` 时,
312+
特性,并使用 v1.31 或更高版本的 `kubectl` 时,
311313
可以创建一个直接绑定到 `Node` 的服务账号令牌:
312314

313315
```shell
314-
KUBECTL_NODE_BOUND_TOKENS=true kubectl create token build-robot --bound-object-kind Node --bound-object-name node-001 --bound-object-uid 123...456
316+
kubectl create token build-robot --bound-object-kind Node --bound-object-name node-001 --bound-object-uid 123...456
315317
```
316318

317319
<!--
318-
The token will be valid until it expires or either the associated `Node` or service account are deleted.
320+
The token will be valid until it expires or either the associated Node or service account are deleted.
319321
-->
320-
此令牌将有效直至其过期或关联的 `Node` 或服务账户被删除。
322+
此令牌将有效直至其过期或关联的 Node 或服务账户被删除。
321323

322324
{{< note >}}
323325
<!--

content/zh-cn/docs/tasks/run-application/configure-pdb.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -431,18 +431,6 @@ These pods are tracked via `.status.currentHealthy` field in the PDB status.
431431

432432
{{< feature-state feature_gate_name="PDBUnhealthyPodEvictionPolicy" >}}
433433

434-
{{< note >}}
435-
<!--
436-
This feature is enabled by default. You can disable it by disabling the `PDBUnhealthyPodEvictionPolicy`
437-
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
438-
on the [API server](/docs/reference/command-line-tools-reference/kube-apiserver/).
439-
-->
440-
此特性默认启用,你可以通过在
441-
[API 服务器](/zh-cn/docs/reference/command-line-tools-reference/kube-apiserver/)上禁用
442-
`PDBUnhealthyPodEvictionPolicy`
443-
[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)来禁用它。
444-
{{< /note >}}
445-
446434
<!--
447435
PodDisruptionBudget guarding an application ensures that `.status.currentHealthy` number of pods
448436
does not fall below the number specified in `.status.desiredHealthy` by disallowing eviction of healthy pods.

0 commit comments

Comments
 (0)