Skip to content

Commit 4416cf7

Browse files
authored
Merge pull request #51301 from asa3311/sync-zh-186
[zh] sync ntro deployment replicaset
2 parents eea96cd + 0983c0d commit 4416cf7

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -614,17 +614,17 @@ kernel patch.
614614
<!--
615615
### Mirantis Container Runtime {#mcr}
616616
617-
[Mirantis Container Runtime](https://docs.mirantis.com/mcr/20.10/overview.html) (MCR)
617+
[Mirantis Container Runtime](https://docs.mirantis.com/mcr/25.0/overview.html) (MCR)
618618
is available as a container runtime for all Windows Server 2019 and later versions.
619619
620-
See [Install MCR on Windows Servers](https://docs.mirantis.com/mcr/20.10/install/mcr-windows.html) for more information.
620+
See [Install MCR on Windows Servers](https://docs.mirantis.com/mcr/25.0/install/mcr-windows.html) for more information.
621621
-->
622622
### Mirantis 容器运行时 {#mcr}
623623

624-
[Mirantis 容器运行时](https://docs.mirantis.com/mcr/20.10/overview.html)(MCR)
624+
[Mirantis 容器运行时](https://docs.mirantis.com/mcr/25.0/overview.html)(MCR)
625625
可作为所有 Windows Server 2019 和更高版本的容器运行时。
626626

627-
有关更多信息,请参考[在 Windows Server 上安装 MCR](https://docs.mirantis.com/mcr/20.10/install/mcr-windows.html)
627+
有关更多信息,请参考[在 Windows Server 上安装 MCR](https://docs.mirantis.com/mcr/25.0/install/mcr-windows.html)
628628

629629
<!--
630630
## Windows OS version compatibility {#windows-os-version-support}

content/zh-cn/docs/concepts/workloads/controllers/deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2161,7 +2161,7 @@ at all times during the update is at least 70% of the desired Pods.
21612161
21622162
`.spec.strategy.rollingUpdate.maxSurge` is an optional field that specifies the maximum number of Pods
21632163
that can be created over the desired number of Pods. The value can be an absolute number (for example, 5) or a
2164-
percentage of desired Pods (for example, 10%). The value cannot be 0 if `MaxUnavailable` is 0. The absolute number
2164+
percentage of desired Pods (for example, 10%). The value cannot be 0 if `maxUnavailable` is 0. The absolute number
21652165
is calculated from the percentage by rounding up. The default value is 25%.
21662166
-->
21672167
##### 最大峰值 {#max-surge}
@@ -2326,7 +2326,7 @@ a Pod is considered ready, see [Container Probes](/docs/concepts/workloads/pods/
23262326

23272327
{{< feature-state feature_gate_name="DeploymentReplicaSetTerminatingReplicas" >}}
23282328

2329-
You can enable this feature it by setting the `DeploymentReplicaSetTerminatingReplicas`
2329+
You can enable this feature by setting the `DeploymentReplicaSetTerminatingReplicas`
23302330
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
23312331
on the [API server](/docs/reference/command-line-tools-reference/kube-apiserver/)
23322332
and on the [kube-controller-manager](/docs/reference/command-line-tools-reference/kube-controller-manager/)

content/zh-cn/docs/concepts/workloads/controllers/replicaset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ ReplicaSets do not support a rolling update directly.
535535

536536
{{< feature-state feature_gate_name="DeploymentReplicaSetTerminatingReplicas" >}}
537537

538-
You can enable this feature it by setting the `DeploymentReplicaSetTerminatingReplicas`
538+
You can enable this feature by setting the `DeploymentReplicaSetTerminatingReplicas`
539539
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/)
540540
on the [API server](/docs/reference/command-line-tools-reference/kube-apiserver/)
541541
and on the [kube-controller-manager](/docs/reference/command-line-tools-reference/kube-controller-manager/)

0 commit comments

Comments
 (0)