Skip to content

Commit c24ef7c

Browse files
committed
sync upgrading-linux-nodes configure-pdb horizontal-pod-autoscale-walkthrough
Update upgrading-linux-nodes.md Update upgrading-linux-nodes.md
1 parent 8dbafa8 commit c24ef7c

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

content/zh-cn/docs/tasks/administer-cluster/kubeadm/upgrading-linux-nodes.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,30 @@ sudo apt-mark hold kubeadm
7878
{{% /tab %}}
7979
{{% tab name="CentOS、RHEL 或 Fedora" %}}
8080
<!--
81+
For systems with DNF:
8182
```shell
8283
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version
8384
sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
8485
```
8586
-->
87+
对于使用 DNF 的系统:
8688
```shell
8789
# 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本
8890
sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
8991
```
92+
93+
<!--
94+
For systems with DNF5:
95+
```shell
96+
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version
97+
sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --setopt=disable_excludes=kubernetes
98+
```
99+
-->
100+
对于使用 DNF5 的系统:
101+
```shell
102+
# 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本
103+
sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --setopt=disable_excludes=kubernetes
104+
```
90105
{{% /tab %}}
91106
{{< /tabs >}}
92107

@@ -153,15 +168,30 @@ kubectl drain <node-to-drain> --ignore-daemonsets
153168
{{% /tab %}}
154169
{{% tab name="CentOS、RHEL 或 Fedora" %}}
155170
<!--
171+
For systems with DNF:
156172
```shell
157173
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version
158174
sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
159175
```
160176
-->
177+
对于使用 DNF 的系统:
161178
```shell
162179
# 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本
163180
sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
164181
```
182+
183+
<!--
184+
For systems with DNF5:
185+
```shell
186+
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version
187+
sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --setopt=disable_excludes=kubernetes
188+
```
189+
-->
190+
对于使用 DNF5 的系统:
191+
```shell
192+
# 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本
193+
sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --setopt=disable_excludes=kubernetes
194+
```
165195
{{% /tab %}}
166196
{{< /tabs >}}
167197

content/zh-cn/docs/tasks/run-application/configure-pdb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@ for policy/v1 an empty selector matches every pod in the namespace.
228228
<!--
229229
You can specify only one of `maxUnavailable` and `minAvailable` in a single `PodDisruptionBudget`.
230230
`maxUnavailable` can only be used to control the eviction of pods
231-
that have an associated controller managing them. In the examples below, "desired replicas"
231+
that all have the same associated controller managing them. In the examples below, "desired replicas"
232232
is the `scale` of the controller managing the pods being selected by the
233233
`PodDisruptionBudget`.
234234
-->
235235
用户在同一个 `PodDisruptionBudget` 中只能够指定 `maxUnavailable``minAvailable` 中的一个。
236-
`maxUnavailable` 只能够用于控制存在相应控制器的 Pod 的驱逐(即不受控制器控制的 Pod 不在
236+
`maxUnavailable` 只能够用于控制存在同一个关联控制器的 Pod 的驱逐(即不受控制器控制的 Pod 不在
237237
`maxUnavailable` 控制范围内)。在下面的示例中,
238238
“所需副本”指的是相应控制器的 `scale`,控制器对 `PodDisruptionBudget` 所选择的 Pod 进行管理。
239239

content/zh-cn/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Create the HorizontalPodAutoscaler:
174174
创建 HorizontalPodAutoscaler:
175175

176176
```shell
177-
kubectl autoscale deployment php-apache --cpu-percent=50 --min=1 --max=10
177+
kubectl autoscale deployment php-apache --cpu=50% --min=1 --max=10
178178
```
179179

180180
```

0 commit comments

Comments
 (0)