Skip to content

Commit c37054e

Browse files
authored
Merge pull request #48583 from asa3311/sync-zh-158
[zh] sync device-plugins cluster-ip-allocation patch-releases
2 parents 2bb267d + cefd6b3 commit c37054e

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

content/zh-cn/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,8 @@ Here are some examples of device plugin implementations:
904904
Intel GPU, FPGA, QAT, VPU, SGX, DSA, DLB and IAA devices
905905
* The [KubeVirt device plugins](https://github.com/kubevirt/kubernetes-device-plugins) for
906906
hardware-assisted virtualization
907+
* The [NVIDIA GPU device plugin](https://github.com/NVIDIA/k8s-device-plugin), NVIDIA's
908+
official device plugin to expose NVIDIA GPUs and monitor GPU health
907909
* The [NVIDIA GPU device plugin for Container-Optimized OS](https://github.com/GoogleCloudPlatform/container-engine-accelerators/tree/master/cmd/nvidia_gpu)
908910
* The [RDMA device plugin](https://github.com/hustcat/k8s-rdma-device-plugin)
909911
* The [SocketCAN device plugin](https://github.com/collabora/k8s-socketcan)
@@ -919,6 +921,7 @@ Here are some examples of device plugin implementations:
919921
* [Intel 设备插件](https://github.com/intel/intel-device-plugins-for-kubernetes)支持
920922
Intel GPU、FPGA、QAT、VPU、SGX、DSA、DLB 和 IAA 设备
921923
* [KubeVirt 设备插件](https://github.com/kubevirt/kubernetes-device-plugins)用于硬件辅助的虚拟化
924+
* [NVIDIA GPU 设备插件](https://github.com/NVIDIA/k8s-device-plugin)NVIDIA 的官方设备插件,用于公布 NVIDIA GPU 和监控 GPU 健康状态。
922925
* [为 Container-Optimized OS 所提供的 NVIDIA GPU 设备插件](https://github.com/GoogleCloudPlatform/container-engine-accelerators/tree/master/cmd/nvidia_gpu)
923926
* [RDMA 设备插件](https://github.com/hustcat/k8s-rdma-device-plugin)
924927
* [SocketCAN 设备插件](https://github.com/collabora/k8s-socketcan)

content/zh-cn/docs/concepts/services-networking/cluster-ip-allocation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ spec:
9797
type: ClusterIP
9898
```
9999
<!--
100-
but as it was explained before, the IP address 10.96.0.10 has not been reserved; if other Services are created
101-
before or in parallel with dynamic allocation, there is a chance they can allocate this IP, hence,
102-
you will not be able to create the DNS Service because it will fail with a conflict error.
100+
But, as it was explained before, the IP address 10.96.0.10 has not been reserved.
101+
If other Services are created before or in parallel with dynamic allocation, there is a chance they can allocate this IP.
102+
Hence, you will not be able to create the DNS Service because it will fail with a conflict error.
103103
-->
104104
但如前所述,IP 地址 10.96.0.10 尚未被保留。如果在 DNS 启动之前或同时采用动态分配机制创建其他 Service,
105105
则它们有可能被分配此 IP,因此,你将无法创建 DNS Service,因为它会因冲突错误而失败。

content/zh-cn/releases/patch-releases.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ During the two-month maintenance mode period, Release Managers may cut
114114
additional maintenance releases to resolve:
115115
116116
- CVEs (under the advisement of the Security Response Committee)
117+
- [Vulnerabilities](/docs/reference/issues-security/official-cve-feed/) that have an assigned
118+
CVE ID (under the advisement of the Security Response Committee)
117119
- dependency issues (including base image updates)
118120
- critical core component issues
119121
@@ -127,6 +129,7 @@ dates for simplicity (every month has it).
127129
在两个月的维护模式期间,发布管理员可能会删减额外的维护版本以解决:
128130

129131
- CVE(在安全响应委员会的建议下)
132+
- 已分配 CVE ID 的[漏洞](/zh-cn/docs/reference/issues-security/official-cve-feed/)(在安全响应委员会的建议下)
130133
- 依赖问题(包括基础镜像更新)
131134
- 关键核心组件问题
132135

0 commit comments

Comments
 (0)