Skip to content

Commit d327e43

Browse files
committed
sync intro deployment-v1
s
1 parent c178e0d commit d327e43

File tree

2 files changed

+32
-24
lines changed

2 files changed

+32
-24
lines changed

content/zh-cn/docs/concepts/windows/intro.md

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ work between Windows and Linux:
429429
The following list documents differences between how Pod specifications work between Windows and Linux:
430430
431431
* `hostIPC` and `hostpid` - host namespace sharing is not possible on Windows
432-
* `hostNetwork` - [see below](#compatibility-v1-pod-spec-containers-hostnetwork)
432+
* `hostNetwork` - host networking is not possible on Windows
433433
* `dnsPolicy` - setting the Pod `dnsPolicy` to `ClusterFirstWithHostNet` is
434434
not supported on Windows because host networking is not provided. Pods always
435435
run with a container network.
@@ -443,7 +443,7 @@ The following list documents differences between how Pod specifications work bet
443443
以下列表记录了 Pod 规约在 Windows 和 Linux 之间的工作方式差异:
444444

445445
* `hostIPC``hostpid` - 不能在 Windows 上共享主机命名空间。
446-
* `hostNetwork` - [参见下文](#compatibility-v1-pod-spec-containers-hostnetwork)
446+
* `hostNetwork` - 在 Windows 上不支持主机网络模式。
447447
* `dnsPolicy` - Windows 不支持将 Pod `dnsPolicy` 设为 `ClusterFirstWithHostNet`
448448
因为未提供主机网络。Pod 始终用容器网络运行。
449449
* `podSecurityContext` [参见下文](#compatibility-v1-pod-spec-containers-securitycontext)
@@ -479,26 +479,20 @@ The following list documents differences between how Pod specifications work bet
479479
* 你无法为卷挂载启用 `mountPropagation`,因为这在 Windows 上不支持。
480480

481481
<!--
482-
#### Field compatibility for hostNetwork {#compatibility-v1-pod-spec-containers-hostnetwork}
482+
#### Host network access {#compatibility-v1-pod-spec-containers-hostnetwork}
483483
484-
{{< feature-state for_k8s_version="v1.26" state="alpha" >}}
485-
486-
The kubelet can now request that pods running on Windows nodes use the host's network namespace instead
487-
of creating a new pod network namespace. To enable this functionality pass `--feature-gates=WindowsHostNetwork=true` to the kubelet.
484+
Kubernetes v1.26 to v1.32 included alpha support for running Windows Pods in the host's network namespace.
488485
-->
489-
#### hostNetwork 的字段兼容性 {#compatibility-v1-pod-spec-containers-hostnetwork}
490-
491-
{{< feature-state for_k8s_version="v1.26" state="alpha" >}}
486+
#### 主机网络访问 {#compatibility-v1-pod-spec-containers-hostnetwork}
492487

493-
现在,kubelet 可以请求在 Windows 节点上运行的 Pod 使用主机的网络命名空间,而不是创建新的 Pod 网络命名空间。
494-
要启用此功能,请将 `--feature-gates=WindowsHostNetwork=true` 传递给 kubelet。
488+
Kubernetes 从 v1.26 到 v1.32 提供了在主机网络命名空间中运行 Windows Pod 的 Alpha 版本支持。
495489

496-
{{< note >}}
497-
<!--
498-
This functionality requires a container runtime that supports this functionality.
490+
<!--
491+
Kubernetes v{{< skew currentVersion >}} does **not** include the `WindowsHostNetwork` feature gate
492+
or support for running Windows Pods in the host's network namespace.
499493
-->
500-
此功能需要支持该功能的容器运行时。
501-
{{< /note >}}
494+
Kubernetes v{{< skew currentVersion >}} ****包含 `WindowsHostNetwork` 特性门控,
495+
也不支持在主机网络命名空间中运行 Windows Pod。
502496

503497
<!--
504498
#### Field compatibility for Pod security context {#compatibility-v1-pod-spec-containers-securitycontext}

content/zh-cn/docs/reference/kubernetes-api/workload-resources/deployment-v1.md

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,27 +237,27 @@ DeploymentStatus 是最近观测到的 Deployment 状态。
237237
<!--
238238
- **replicas** (int32)
239239
240-
Total number of non-terminated pods targeted by this deployment (their labels match the selector).
240+
Total number of non-terminating pods targeted by this deployment (their labels match the selector).
241241
242242
- **availableReplicas** (int32)
243243
244-
Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.
244+
Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.
245245
246246
- **readyReplicas** (int32)
247247
248-
readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.
248+
Total number of non-terminating pods targeted by this Deployment with a Ready Condition.
249249
-->
250250
- **replicas** (int32)
251251

252252
此 Deployment 所针对的(其标签与选择算符匹配)未终止 Pod 的总数。
253253

254254
- **availableReplicas** (int32)
255255

256-
此 Deployment 针对的可用(至少 minReadySeconds 才能就绪) Pod 总数。
256+
此 Deployment 针对的可用(至少 minReadySeconds 才能就绪)非终止的 Pod 总数。
257257

258258
- **readyReplicas** (int32)
259-
260-
readyReplicas 是此 Deployment 在就绪状况下处理的目标 Pod 数量
259+
260+
Deployment 所管理的、具有 Ready 状况的非终止 Pod 的总数
261261

262262
<!--
263263
- **unavailableReplicas** (int32)
@@ -272,7 +272,13 @@ DeploymentStatus 是最近观测到的 Deployment 状态。
272272
<!--
273273
- **updatedReplicas** (int32)
274274
275-
Total number of non-terminated pods targeted by this deployment that have the desired template spec.
275+
Total number of non-terminating pods targeted by this deployment that have the desired template spec.
276+
277+
- **terminatingReplicas** (int32)
278+
279+
Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.
280+
281+
This is an alpha field. Enable DeploymentReplicaSetTerminatingReplicas to be able to use this field.
276282
277283
- **collisionCount** (int32)
278284
@@ -282,6 +288,14 @@ DeploymentStatus 是最近观测到的 Deployment 状态。
282288

283289
此 Deployment 所针对的未终止 Pod 的总数,这些 Pod 采用了预期的模板规约。
284290

291+
- **terminatingReplicas** (int32)
292+
293+
此 Deployment 所管理的处于终止状态的 Pod 总数。
294+
终止中的 Pod 指的是其 .metadata.deletionTimestamp 不为空,
295+
且其 .status.phase 尚未变为 Failed 或 Succeeded 的 Pod。
296+
297+
这是一个 Alpha 字段。要使用该字段,需要启用 DeploymentReplicaSetTerminatingReplicas 特性门控。
298+
285299
- **collisionCount** (int32)
286300

287301
供 Deployment 所用的哈希冲突计数。

0 commit comments

Comments
 (0)