Skip to content

Commit 0dabbdc

Browse files
authored
Merge pull request #40046 from howieyuen/concept-4
[zh-cn] sync concepts files of workloads
2 parents 5bc70ee + f13f8e3 commit 0dabbdc

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

content/zh-cn/docs/concepts/workloads/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: "工作负载"
3-
weight: 50
3+
weight: 55
44
description: 理解 Pods,Kubernetes 中可部署的最小计算对象,以及辅助它运行它们的高层抽象对象。
55
---
66

77
<!--
88
title: "Workloads"
9-
weight: 50
9+
weight: 55
1010
description: >
1111
Understand Pods, the smallest deployable compute object in Kubernetes, and the higher-level abstractions that help you to run them.
1212
no_list: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ That is, the CronJob does _not_ update existing Jobs, even if those remain runni
398398
A CronJob creates a Job object approximately once per execution time of its schedule.
399399
The scheduling is approximate because there
400400
are certain circumstances where two Jobs might be created, or no Job might be created.
401-
Kubernetes tries to avoid those situations, but do not completely prevent them. Therefore,
401+
Kubernetes tries to avoid those situations, but does not completely prevent them. Therefore,
402402
the Jobs that you define should be _idempotent_.
403403
-->
404404
### Job 创建 {#job-creation}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,7 @@ These are some requirements and semantics of the API:
13531353
are evaluated in order. Once a rule matches a Pod failure, the remaining rules
13541354
are ignored. When no rule matches the Pod failure, the default
13551355
handling applies.
1356-
- you may want to restrict a rule to a specific container by specifing its name
1356+
- you may want to restrict a rule to a specific container by specifying its name
13571357
in`spec.podFailurePolicy.rules[*].containerName`. When not specified the rule
13581358
applies to all containers. When specified, it should match one the container
13591359
or `initContainer` names in the Pod template.

content/zh-cn/docs/concepts/workloads/pods/_index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,24 +555,24 @@ Pod 中的所有容器都可以在特权模式下运行,以使用原本无法
555555
此模式同时适用于 Windows 和 Linux。
556556

557557
<!--
558-
### Linux priviledged containers
558+
### Linux privileged containers
559559
560560
In Linux, any container in a Pod can enable privileged mode using the `privileged` (Linux) flag
561561
on the [security context](/docs/tasks/configure-pod-container/security-context/) of the
562562
container spec. This is useful for containers that want to use operating system administrative
563563
capabilities such as manipulating the network stack or accessing hardware devices.
564564
-->
565-
### Linux 特权容器 {#linux-priviledged-containers}
565+
### Linux 特权容器 {#linux-privileged-containers}
566566

567567
在 Linux 中,Pod 中的所有容器都可以使用容器规约中的
568568
[安全性上下文](/zh-cn/docs/tasks/configure-pod-container/security-context/)中的
569569
`privileged`(Linux)参数启用特权模式。
570570
这对于想要使用操作系统管理权能(Capabilities,如操纵网络堆栈和访问硬件设备)的容器很有用。
571571

572572
<!--
573-
### Windows priviledged containers
573+
### Windows privileged containers
574574
-->
575-
### Windows 特权容器 {#windows-priviledged-containers}
575+
### Windows 特权容器 {#windows-privileged-containers}
576576

577577
{{< feature-state for_k8s_version="v1.26" state="stable" >}}
578578

content/zh-cn/docs/concepts/workloads/pods/user-namespaces.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ min-kubernetes-server-version: v1.25
1616
{{< feature-state for_k8s_version="v1.25" state="alpha" >}}
1717
<!--
1818
This page explains how user namespaces are used in Kubernetes pods. A user
19-
namespace allows to isolate the user running inside the container from the one
19+
namespace isolates the user running inside the container from the one
2020
in the host.
2121
2222
A process running as root in a container can run as a different (non-root) user
2323
in the host; in other words, the process has full privileges for operations
2424
inside the user namespace, but is unprivileged for operations outside the
2525
namespace.
2626
-->
27-
本页解释了在 Kubernetes pods 中如何使用用户命名空间。
28-
用户命名空间允许将容器内运行的用户与主机内的用户隔离开来
27+
本页解释了在 Kubernetes Pod 中如何使用用户命名空间。
28+
用户命名空间将容器内运行的用户与主机中的用户隔离开来
2929

3030
在容器中以 root 身份运行的进程可以在主机中以不同的(非 root)用户身份运行;
3131
换句话说,该进程在用户命名空间内的操作具有完全的权限,

0 commit comments

Comments
 (0)