Skip to content

Commit 94ce1fb

Browse files
committed
sync cluster-upgrade kubelet-credential-provider running-cloud-controller
1 parent 6f4039b commit 94ce1fb

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

content/zh-cn/docs/tasks/administer-cluster/cluster-upgrade.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,15 @@ kubelet, or upgrade the kubelet on that node and bring the node back into servic
116116
然后使用一个运行了 kubelet {{< skew currentVersion >}} 版本的新节点替换它;
117117
或者升级此节点的 kubelet,并使节点恢复服务。
118118

119+
{{< caution >}}
120+
<!--
121+
Draining nodes before upgrading kubelet ensures that pods are re-admitted and containers are
122+
re-created, which may be necessary to resolve some security issues or other important bugs.
123+
-->
124+
在升级 kubelet 之前先进行节点排空,这样可以确保 Pod 被重新准入并且容器被重新创建。
125+
这一步骤对于解决某些安全问题或其他关键错误是非常必要的。
126+
{{</ caution >}}
127+
119128
<!--
120129
### Other deployments {#upgrade-other}
121130

content/zh-cn/docs/tasks/administer-cluster/kubelet-credential-provider.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
title: 配置 kubelet 镜像凭据提供程序
3-
description: 配置 kubelet 的镜像凭据提供程序插件
43
content_type: task
54
min-kubernetes-server-version: v1.26
65
weight: 120
@@ -11,7 +10,6 @@ title: Configure a kubelet image credential provider
1110
reviewers:
1211
- liggitt
1312
- cheftako
14-
description: Configure the kubelet's image credential provider plugin
1513
content_type: task
1614
min-kubernetes-server-version: v1.26
1715
weight: 120

content/zh-cn/docs/tasks/administer-cluster/running-cloud-controller.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,14 @@ Successfully running cloud-controller-manager requires some changes to your clus
8383
你需要对集群配置做适当的修改以成功地运行云管理控制器:
8484

8585
<!--
86-
* `kube-apiserver` and `kube-controller-manager` MUST NOT specify the `--cloud-provider`
87-
flag. This ensures that it does not run any cloud specific loops that would be run by
88-
cloud controller manager. In the future, this flag will be deprecated and removed.
89-
* `kubelet` must run with `--cloud-provider=external`. This is to ensure that the
90-
kubelet is aware that it must be initialized by the cloud controller manager
91-
before it is scheduled any work.
86+
* `kubelet`, `kube-apiserver`, and `kube-controller-manager` must be set according to the
87+
user's usage of external CCM. If the user has an external CCM (not the internal cloud
88+
controller loops in the Kubernetes Controller Manager), then `--cloud-provider=external`
89+
must be specified. Otherwise, it should not be specified.
9290
-->
93-
* 一定不要为 `kube-apiserver``kube-controller-manager` 指定 `--cloud-provider` 标志。
94-
这将保证它们不会运行任何云服务专用循环逻辑,这将会由云管理控制器运行。未来这个标记将被废弃并去除。
95-
* `kubelet` 必须使用 `--cloud-provider=external` 运行。
96-
这是为了保证让 kubelet 知道在执行任何任务前,它必须被云管理控制器初始化。
91+
* `kubelet``kube-apiserver``kube-controller-manager` 必须根据用户对外部 CCM 的使用进行设置。
92+
如果用户有一个外部的 CCM(不是 Kubernetes 控制器管理器中的内部云控制器回路),
93+
那么必须添加 `--cloud-provider=external` 参数。否则,不应添加此参数。
9794

9895
<!--
9996
Keep in mind that setting up your cluster to use cloud controller manager will
@@ -102,7 +99,7 @@ change your cluster behaviour in a few ways:
10299
请记住,设置集群使用云管理控制器将用多种方式更改集群行为:
103100

104101
<!--
105-
* kubelets specifying `--cloud-provider=external` will add a taint
102+
* Components that specify `--cloud-provider=external` will add a taint
106103
`node.cloudprovider.kubernetes.io/uninitialized` with an effect `NoSchedule`
107104
during initialization. This marks the node as needing a second initialization
108105
from an external controller before it can be scheduled work. Note that in the
@@ -111,7 +108,7 @@ change your cluster behaviour in a few ways:
111108
require cloud specific information about nodes such as their region or type
112109
(high cpu, gpu, high memory, spot instance, etc).
113110
-->
114-
* 指定了 `--cloud-provider=external` 的 kubelet 将被添加一个 `node.cloudprovider.kubernetes.io/uninitialized`
111+
* 指定了 `--cloud-provider=external` 的组件将被添加一个 `node.cloudprovider.kubernetes.io/uninitialized`
115112
的污点,导致其在初始化过程中不可调度(`NoSchedule`)。
116113
这将标记该节点在能够正常调度前,需要外部的控制器进行二次初始化。
117114
请注意,如果云管理控制器不可用,集群中的新节点会一直处于不可调度的状态。

0 commit comments

Comments
 (0)