Skip to content

Commit a65b31e

Browse files
authored
Merge pull request #44881 from asa3311/sync-zh-97
[zh] sync device-plugins cron-jobs
2 parents 014f08e + 5266d7c commit a65b31e

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,13 +280,13 @@ The general workflow of a device plugin includes the following steps:
280280
<!--
281281
The processing of the fully-qualified CDI device names by the Device Manager requires
282282
that the `DevicePluginCDIDevices` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
283-
is enabled for the kubelet and the kube-apiserver. This was added as an alpha feature in Kubernetes
284-
v1.28.
283+
is enabled for both the kubelet and the kube-apiserver. This was added as an alpha feature in Kubernetes
284+
v1.28 and graduated to beta in v1.29.
285285
-->
286286
设备管理器处理完全限定的 CDI 设备名称时,
287287
需要为 kubelet 和 kube-apiserver 启用 `DevicePluginCDIDevices`
288288
[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)
289-
这在 Kubernetes v1.28 版本中作为 Alpha 特性被加入。
289+
Kubernetes v1.28 版本中作为 Alpha 特性被加入,并在 v1.29 版本中升级为 Beta 特性
290290
{{< /note >}}
291291

292292
<!--

content/zh-cn/docs/concepts/workloads/controllers/cron-jobs.md

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -367,26 +367,22 @@ Go 标准库中的时区数据库包含在二进制文件中,并用作备用
367367
### 不支持的时区规范 {#unsupported-timezone-spec}
368368

369369
<!--
370-
The implementation of the CronJob API in Kubernetes {{< skew currentVersion >}} lets you set
371-
the `.spec.schedule` field to include a timezone; for example: `CRON_TZ=UTC * * * * *`
372-
or `TZ=UTC * * * * *`.
370+
Specifying a timezone using `CRON_TZ` or `TZ` variables inside `.spec.schedule`
371+
is **not officially supported** (and never has been).
373372
-->
374-
Kubernetes {{< skew currentVersion >}} 中的 CronJob API 实现允许你设置
375-
`.spec.schedule` 字段,在其中包括时区信息;
376-
例如 `CRON_TZ=UTC * * * * *``TZ=UTC * * * * *`
373+
`.spec.schedule` 中通过 `CRON_TZ``TZ` 变量来指定时区**并未得到官方支持**(而且从未支持过)。
377374

378375
<!--
379-
Specifying a timezone that way is **not officially supported** (and never has been).
380-
381-
If you try to set a schedule that includes `TZ` or `CRON_TZ` timezone specification,
382-
Kubernetes reports a [warning](/blog/2020/09/03/warnings/) to the client.
383-
Future versions of Kubernetes will prevent setting the unofficial timezone mechanism entirely.
376+
Starting with Kubernetes 1.29 if you try to set a schedule that includes `TZ` or `CRON_TZ`
377+
timezone specification, Kubernetes will fail to create the resource with a validation
378+
error.
379+
Updates to CronJobs already using `TZ` or `CRON_TZ` will continue to report a
380+
[warning](/blog/2020/09/03/warnings/) to the client.
384381
-->
385-
以这种方式指定时区是 **未正式支持的**(而且也从未正式支持过)。
386-
387-
如果你尝试设置包含 `TZ``CRON_TZ` 时区规范的排期表,
388-
Kubernetes 会向客户端报告一条[警告](/blog/2020/09/03/warnings/)
389-
后续的 Kubernetes 版本将完全阻止设置非正式的时区机制。
382+
从 Kubernetes 1.29 版本开始,如果你尝试设定包含 `TZ``CRON_TZ` 时区规范的排期表,
383+
Kubernetes 将无法创建该资源,并会报告验证错误。
384+
对已经设置 `TZ``CRON_TZ` 的 CronJob 进行更新时,
385+
系统会继续向客户端发送[警告](/zh-cn/blog/2020/09/03/warnings/)
390386

391387
<!--
392388
### Modifying a CronJob

0 commit comments

Comments
 (0)