Skip to content

Commit 7623013

Browse files
authored
Merge pull request #29031 from able8/fix-some-typos
[zh] Fix some typos
2 parents 23aafdd + 8ff3213 commit 7623013

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

content/zh/docs/concepts/scheduling-eviction/node-pressure-eviction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ As a result, kubelet ranks and evicts pods in the following order:
430430

431431
1. 首先考虑资源使用量超过其请求的 `BestEffort``Burstable` Pod。
432432
这些 Pod 会根据它们的优先级以及它们的资源使用级别超过其请求的程度被逐出。
433-
1. 资源使用量少于请求量的 `Guaranted` Pod 和 `Burstable` Pod 根据其优先级被最后驱逐。
433+
1. 资源使用量少于请求量的 `Guaranteed` Pod 和 `Burstable` Pod 根据其优先级被最后驱逐。
434434

435435
{{<note>}}
436436
<!--
@@ -456,7 +456,7 @@ then the kubelet must choose to evict one of these pods to preserve node stabili
456456
and to limit the impact of resource starvation on other pods. In this case, it
457457
will choose to evict pods of lowest Priority first.
458458
-->
459-
仅当 `Guaranted` Pod 中所有容器都被指定了请求和限制并且二者相等时,才保证 Pod 不被驱逐。
459+
仅当 `Guaranteed` Pod 中所有容器都被指定了请求和限制并且二者相等时,才保证 Pod 不被驱逐。
460460
这些 Pod 永远不会因为另一个 Pod 的资源消耗而被驱逐。
461461
如果系统守护进程(例如 `kubelet``docker``journald`
462462
消耗的资源比通过 `system-reserved``kube-reserved` 分配保留的资源多,

content/zh/docs/setup/release/notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ filename | sha512 hash
11611161
### Bug or Regression
11621162

11631163
- Add missing --kube-api-content-type in kubemark hollow template ([#98911](https://github.com/kubernetes/kubernetes/pull/98911), [@Jeffwan](https://github.com/Jeffwan)) [SIG Scalability and Testing]
1164-
- Avoid duplicate error messages when runing kubectl edit quota ([#98201](https://github.com/kubernetes/kubernetes/pull/98201), [@pacoxu](https://github.com/pacoxu)) [SIG API Machinery and Apps]
1164+
- Avoid duplicate error messages when running kubectl edit quota ([#98201](https://github.com/kubernetes/kubernetes/pull/98201), [@pacoxu](https://github.com/pacoxu)) [SIG API Machinery and Apps]
11651165
- Cleanup subnet in frontend IP configs to prevent huge subnet request bodies in some scenarios. ([#98133](https://github.com/kubernetes/kubernetes/pull/98133), [@nilo19](https://github.com/nilo19)) [SIG Cloud Provider]
11661166
- Fix errors when accessing Windows container stats for Dockershim ([#98510](https://github.com/kubernetes/kubernetes/pull/98510), [@jsturtevant](https://github.com/jsturtevant)) [SIG Node and Windows]
11671167
- Fixes spurious errors about IPv6 in kube-proxy logs on nodes with IPv6 disabled. ([#99127](https://github.com/kubernetes/kubernetes/pull/99127), [@danwinship](https://github.com/danwinship)) [SIG Network and Node]

content/zh/docs/tasks/access-application-cluster/web-ui-dashboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ The deploy wizard expects that you provide the following information:
172172
-->
173173
- **容器镜像**(必填):公共镜像仓库上的 Docker
174174
[容器镜像](/zh/docs/concepts/containers/images/) 或者私有镜像仓库
175-
(通常是 Google Container Registery 或者 Docker Hub)的 URL。容器镜像参数说明必须以冒号结尾。
175+
(通常是 Google Container Registry 或者 Docker Hub)的 URL。容器镜像参数说明必须以冒号结尾。
176176

177177
<!--
178178
- **Number of pods** (mandatory): The target number of Pods you want your application to be deployed in. The value must be a positive integer.

0 commit comments

Comments
 (0)