Skip to content

Commit af86a28

Browse files
authored
Merge pull request #51527 from asa3311/sync-zh-188
[zh] sync cri kubeadm-upgrade kustomization
2 parents 0bbfe1c + 748c37b commit af86a28

File tree

2 files changed

+21
-25
lines changed

2 files changed

+21
-25
lines changed

content/zh-cn/docs/concepts/architecture/cri.md

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,46 +41,42 @@ CRI 是一个插件接口,它使 kubelet 能够使用各种容器运行时,
4141
The kubelet acts as a client when connecting to the container runtime via gRPC.
4242
The runtime and image service endpoints have to be available in the container
4343
runtime, which can be configured separately within the kubelet by using the
44-
`--image-service-endpoint` [command line flags](/docs/reference/command-line-tools-reference/kubelet).
44+
`--container-runtime-endpoint`
45+
[command line flag](/docs/reference/command-line-tools-reference/kubelet/).
4546
-->
4647
当通过 gRPC 连接到容器运行时,kubelet 将充当客户端。运行时和镜像服务端点必须在容器运行时中可用,
47-
可以使用 `--image-service-endpoint`
48+
可以使用 `--container-runtime-endpoint`
4849
[命令行标志](/zh-cn/docs/reference/command-line-tools-reference/kubelet)在 kubelet 中单独配置。
4950

5051
<!--
51-
For Kubernetes v{{< skew currentVersion >}}, the kubelet prefers to use CRI `v1`.
52-
If a container runtime does not support `v1` of the CRI, then the kubelet tries to
53-
negotiate any older supported version.
54-
The v{{< skew currentVersion >}} kubelet can also negotiate CRI `v1alpha2`, but
55-
this version is considered as deprecated.
56-
If the kubelet cannot negotiate a supported CRI version, the kubelet gives up
57-
and doesn't register as a node.
52+
For Kubernetes v1.26 and later, the kubelet requires that the container runtime
53+
supports the `v1` CRI API. If a container runtime does not support the `v1` API,
54+
the kubelet will not register the node.
5855
-->
59-
对 Kubernetes v{{< skew currentVersion >}},kubelet 偏向于使用 CRI `v1` 版本。
60-
如果容器运行时不支持 CRI 的 `v1` 版本,那么 kubelet 会尝试协商较老的、仍被支持的所有版本。
61-
v{{< skew currentVersion >}} 版本的 kubelet 也可协商 CRI `v1alpha2` 版本,但该版本被视为已弃用。
62-
如果 kubelet 无法协商出可支持的 CRI 版本,则 kubelet 放弃并且不会注册为节点。
56+
对于 Kubernetes v1.26 及更高版本,
57+
kubelet 要求容器运行时必须支持 `v1` 版本的 CRI API。
58+
如果容器运行时不支持 `v1` API,kubelet 将不会注册该节点。
6359

6460
<!--
6561
## Upgrading
6662
67-
When upgrading Kubernetes, the kubelet tries to automatically select the
68-
latest CRI version on restart of the component. If that fails, then the fallback
69-
will take place as mentioned above. If a gRPC re-dial was required because the
70-
container runtime has been upgraded, then the container runtime must also
71-
support the initially selected version or the redial is expected to fail. This
72-
requires a restart of the kubelet.
63+
When upgrading the Kubernetes version on a node, the kubelet restarts. If the
64+
container runtime does not support the `v1` CRI API, the kubelet will fail to
65+
register and report an error. If a gRPC re-dial is required because the container
66+
runtime has been upgraded, the runtime must support the `v1` CRI API for the
67+
connection to succeed. This might require a restart of the kubelet after the
68+
container runtime is correctly configured.
7369
-->
7470
## 升级 {#upgrading}
7571

76-
升级 Kubernetes ,kubelet 会尝试在组件重启时自动选择最新的 CRI 版本
77-
如果失败,则将如上所述进行回退。如果由于容器运行时已升级而需要 gRPC 重拨,
78-
则容器运行时还必须支持最初选择的版本,否则重拨预计会失败
79-
这需要重新启动 kubelet。
72+
在节点上升级 Kubernetes 版本时,kubelet 会重新启动
73+
如果容器运行时不支持 `v1` 版本的 CRI API,kubelet 将无法注册节点并报告错误。
74+
如果由于容器运行时已升级而需要重新建立 gRPC 连接,则该容器运行时必须支持 v1 版本的 CRI API,连接才能成功
75+
在容器运行时正确配置后,可能需要重新启动 kubelet 才能建立连接
8076

8177
## {{% heading "whatsnext" %}}
8278

8379
<!--
8480
- Learn more about the CRI [protocol definition](https://github.com/kubernetes/cri-api/blob/c75ef5b/pkg/apis/runtime/v1/api.proto)
8581
-->
86-
- 了解更多有关 CRI [协议定义](https://github.com/kubernetes/cri-api/blob/c75ef5b/pkg/apis/runtime/v1/api.proto)
82+
- 了解更多有关 CRI [协议定义](https://github.com/kubernetes/cri-api/blob/v0.33.1/pkg/apis/runtime/v1/api.proto)

content/zh-cn/docs/tasks/manage-kubernetes-objects/kustomization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ resources:
11161116
images:
11171117
- name: nginx
11181118
newName: my.image.registry/nginx
1119-
newTag: 1.4.0
1119+
newTag: "1.4.0"
11201120
EOF
11211121
```
11221122

0 commit comments

Comments
 (0)