Skip to content

Commit ed23f39

Browse files
authored
Merge pull request #34564 from Sea-n/zh-fix-conecpts-links
[zh] Fix some 404 links in concepts
2 parents a9b7331 + 34564ab commit ed23f39

File tree

6 files changed

+67
-66
lines changed

6 files changed

+67
-66
lines changed

content/zh-cn/docs/concepts/overview/working-with-objects/finalizers.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Kubernetes 清除 `pv-protection` Finalizer,控制器就会删除该卷。
8787
## Owner references, labels, and finalizers {#owners-labels-finalizers}
8888
8989
Like {{<glossary_tooltip text="labels" term_id="label">}},
90-
[owner references](/concepts/overview/working-with-objects/owners-dependents/)
90+
[owner references](/docs/concepts/overview/working-with-objects/owners-dependents/)
9191
describe the relationships between objects in Kubernetes, but are used for a
9292
different purpose. When a
9393
{{<glossary_tooltip text="controller" term_id="controller">}} manages objects
@@ -99,7 +99,7 @@ any Pods in the cluster with the same label.
9999
## 属主引用、标签和 Finalizers {#owners-labels-finalizers}
100100

101101
与{{<glossary_tooltip text="标签" term_id="label">}}类似,
102-
[属主引用](/zh-cn/concepts/overview/working-with-objects/owners-dependents/)
102+
[属主引用](/zh-cn/docs/concepts/overview/working-with-objects/owners-dependents/)
103103
描述了 Kubernetes 中对象之间的关系,但它们作用不同。
104104
当一个{{<glossary_tooltip text="控制器" term_id="controller">}}
105105
管理类似于 Pod 的对象时,它使用标签来跟踪相关对象组的变化。
@@ -154,4 +154,3 @@ Finalizers 通常因为特殊原因被添加到资源上,所以强行删除它
154154
on the Kubernetes blog.
155155
-->
156156
* 在 Kubernetes 博客上阅读[使用 Finalizers 控制删除](/blog/2021/05/14/using-finalizers-to-control-deletion/)
157-

content/zh-cn/docs/concepts/security/pod-security-policy.md

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Pod 安全策略允许管理员控制如下方面:
5858

5959
<!--
6060
| Control Aspect | Field Names |
61-
| ----------------------------------------------------| ----------------------------------------- |
61+
| ----------------------------------------------------| ------------------------------------------- |
6262
| Running of privileged containers | [`privileged`](#privileged) |
6363
| Usage of host namespaces | [`hostPID`, `hostIPC`](#host-namespaces) |
6464
| Usage of host networking and ports | [`hostNetwork`, `hostPorts`](#host-namespaces) |
@@ -458,11 +458,11 @@ alias kubectl-user='kubectl --as=system:serviceaccount:psp-example:fake-user -n
458458
### Create a policy and a pod
459459

460460
Define the example PodSecurityPolicy object in a file. This is a policy that
461-
simply prevents the creation of privileged pods.
461+
prevents the creation of privileged pods.
462462
The name of a PodSecurityPolicy object must be a valid
463463
[DNS subdomain name](/docs/concepts/overview/working-with-objects/names#dns-subdomain-names).
464464
-->
465-
### 创建一个策略和一个 Pod
465+
### 创建一个策略和一个 Pod {#create-a-policy-and-a-pod}
466466

467467
在一个文件中定义一个示例的 PodSecurityPolicy 对象。
468468
这里的策略只是用来禁止创建有特权要求的 Pods。
@@ -588,7 +588,7 @@ spec:
588588
EOF
589589
```
590590
<!--
591-
The output is similar to this:
591+
The output is similar to this
592592
-->
593593
输出类似于:
594594

@@ -791,7 +791,8 @@ several security mechanisms.
791791
{{< codenew file="policy/restricted-psp.yaml" >}}
792792

793793
<!--
794-
See [Pod Security Standards](/docs/concepts/security/pod-security-standards/#policy-instantiation) for more examples.
794+
See [Pod Security Standards](/docs/concepts/security/pod-security-standards/#policy-instantiation)
795+
for more examples.
795796
-->
796797
更多的示例可参考
797798
[Pod 安全标准](/zh-cn/docs/concepts/security/pod-security-standards/#policy-instantiation)
@@ -897,10 +898,10 @@ PodSecurityPolicy 并不限制可以被 `PersistentVolumeClaim` 所引用的
897898
**FSGroup** - Controls the supplemental group applied to some volumes.
898899
899900
- *MustRunAs* - Requires at least one `range` to be specified. Uses the
900-
minimum value of the first range as the default. Validates against all ranges.
901+
minimum value of the first range as the default. Validates against all ranges.
901902
- *MayRunAs* - Requires at least one `range` to be specified. Allows
902-
`FSGroups` to be left unset without providing a default. Validates against
903-
all ranges if `FSGroups` is set.
903+
`FSGroups` to be left unset without providing a default. Validates against
904+
all ranges if `FSGroups` is set.
904905
- *RunAsAny* - No default provided. Allows any `fsGroup` ID to be specified.
905906
-->
906907
**FSGroup** - 控制应用到某些卷上的附加用户组。
@@ -1054,7 +1055,7 @@ spec:
10541055
<!--
10551056
**RunAsGroup** - Controls which primary group ID the containers are run with.
10561057

1057-
- *MustRunAs* - Requires at least one `range` to be specified. Uses the
1058+
- *MustRunAs* - Requires at least one `range` to be specified. Uses the
10581059
minimum value of the first range as the default. Validates against all ranges.
10591060
- *MayRunAs* - Does not require that RunAsGroup be specified. However, when RunAsGroup
10601061
is specified, they have to fall in the defined range.
@@ -1101,7 +1102,7 @@ required to effectively enforce `MustRunAsNonRoot`.
11011102
-->
11021103
### 特权提升 {#privilege-escalation}
11031104

1104-
这一组选项控制容器的`allowPrivilegeEscalation` 属性。该属性直接决定是否为容器进程设置
1105+
这一组选项控制容器的 `allowPrivilegeEscalation` 属性。该属性直接决定是否为容器进程设置
11051106
[`no_new_privs`](https://www.kernel.org/doc/Documentation/prctl/no_new_privs.txt)
11061107
参数。此参数会禁止 `setuid` 属性的可执行文件更改有效用户 ID(EUID),
11071108
并且禁止启用额外权能的文件。例如,`no_new_privs` 会禁止使用 `ping` 工具。
@@ -1140,7 +1141,7 @@ the PodSecurityPolicy. For more details on Linux capabilities, see
11401141
[capabilities(7)](http://man7.org/linux/man-pages/man7/capabilities.7.html).
11411142

11421143
The following fields take a list of capabilities, specified as the capability
1143-
name in ALL_CAPS without the `CAP\_` prefix.
1144+
name in ALL_CAPS without the `CAP_` prefix.
11441145
-->
11451146
### 权能字 {#capabilities}
11461147

@@ -1176,7 +1177,7 @@ added. Capabilities listed in `RequiredDropCapabilities` must not be included in
11761177
<!--
11771178
**DefaultAddCapabilities** - The capabilities which are added to containers by
11781179
default, in addition to the runtime defaults. See the
1179-
documentation for your container runtime for information on working with Linux capabilities.
1180+
documentation for your container runtime for information on working with Linux capabilities.
11801181
-->
11811182
**DefaultAddCapabilities** - 默认添加到容器的权能字集合。
11821183
这一集合是作为容器运行时所设值的补充。
@@ -1228,14 +1229,14 @@ denoted as the string `Unmasked`.
12281229
<!--
12291230
### AppArmor
12301231

1231-
Controlled via annotations on the PodSecurityPolicy. Refer to the [AppArmor
1232-
documentation](/docs/tutorials/policy/apparmor/#podsecuritypolicy-annotations).
1232+
Controlled via annotations on the PodSecurityPolicy. Refer to the
1233+
[AppArmor documentation](/docs/tutorials/security/apparmor/#podsecuritypolicy-annotations).
12331234
-->
12341235
### AppArmor
12351236

12361237
通过 PodSecurityPolicy 上的注解来控制。
12371238
详情请参阅
1238-
[AppArmor 文档](/zh-cn/docs/tutorials/policy/apparmor/#podsecuritypolicy-annotations)。
1239+
[AppArmor 文档](/zh-cn/docs/tutorials/security/apparmor/#podsecuritypolicy-annotations)。
12391240

12401241

12411242
<!--
@@ -1270,7 +1271,7 @@ are:
12701271
of Kubernetes 1.11. Use `runtime/default` instead.
12711272
- `localhost/<path>` - Specify a profile as a file on the node located at
12721273
`<seccomp_root>/<path>`, where `<seccomp_root>` is defined via the
1273-
`-seccomp-profile-root` flag on the Kubelet. If the `--seccomp-profile-root`
1274+
`--seccomp-profile-root` flag on the Kubelet. If the `--seccomp-profile-root`
12741275
flag is not defined, the default path will be used, which is
12751276
`<root-dir>/seccomp` where `<root-dir>` is specified by the `--root-dir` flag.
12761277

@@ -1341,20 +1342,21 @@ Refer to the [Sysctl documentation](/docs/tasks/administer-cluster/sysctl-cluste
13411342
## {{% heading "whatsnext" %}}
13421343

13431344
<!--
1344-
- See [PodSecurityPolicy Deprecation: Past, Present, and
1345-
Future](/blog/2021/04/06/podsecuritypolicy-deprecation-past-present-and-future/) to learn about
1346-
the future of pod security policy.
1345+
- See [PodSecurityPolicy Deprecation: Past, Present, and Future](/blog/2021/04/06/podsecuritypolicy-deprecation-past-present-and-future/)
1346+
to learn about the future of pod security policy.
13471347

1348-
- See [Pod Security Standards](/docs/concepts/security/pod-security-standards/) for policy recommendations.
1348+
- See [Pod Security Standards](/docs/concepts/security/pod-security-standards/)
1349+
for policy recommendations.
13491350

1350-
- Refer to [Pod Security Policy Reference](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podsecuritypolicy-v1beta1-policy) for the api details.
1351+
- Refer to [PodSecurityPolicy reference](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podsecuritypolicy-v1beta1-policy)
1352+
for the API details.
13511353
-->
13521354
- 参阅 [PodSecurityPolicy Deprecation: Past, Present, and
13531355
Future](/blog/2021/04/06/podsecuritypolicy-deprecation-past-present-and-future/),
13541356
了解 Pod 安全策略的未来。
13551357

1356-
- 参阅[Pod 安全标准](/zh-cn/docs/concepts/security/pod-security-standards/),
1358+
- 参阅 [Pod 安全标准](/zh-cn/docs/concepts/security/pod-security-standards/),
13571359
了解策略建议。
1358-
- 阅读 [Pod 安全策略参考](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podsecuritypolicy-v1beta1-policy),
1360+
- 阅读 [PodSecurityPolicy 参考](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podsecuritypolicy-v1beta1-policy),
13591361
了解 API 细节。
13601362

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ The following list documents differences between how Pod specifications work bet
468468
supported on Windows.
469469
-->
470470
* `terminationGracePeriodSeconds` - 这在 Windows 上的 Docker 中没有完全实现,
471-
请参考[GitHub issue](https://github.com/moby/moby/issues/25982)
471+
请参考 [GitHub issue](https://github.com/moby/moby/issues/25982)
472472
目前的行为是通过 CTRL_SHUTDOWN_EVENT 发送 ENTRYPOINT 进程,然后 Windows 默认等待 5 秒,
473473
最后使用正常的 Windows 关机行为终止所有进程。
474474
5 秒默认值实际上位于[容器内](https://github.com/moby/moby/issues/25982#issuecomment-426441183)的 Windows 注册表中,
@@ -637,7 +637,7 @@ Windows Server SAC release
637637
<!--
638638
The Kubernetes [version-skew policy](/docs/setup/release/version-skew-policy/) also applies.
639639
-->
640-
也适用 Kubernetes [版本偏差策略](/zh-cn/docs/setup/release/version-skew-policy/)
640+
也适用 Kubernetes [版本偏差策略](/zh-cn/releases/version-skew-policy/)
641641

642642
<!--
643643
## Getting help and troubleshooting {#troubleshooting}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ feature:
77
重新启动失败的容器,在节点死亡时替换并重新调度容器,杀死不响应用户定义的健康检查的容器,并且在它们准备好服务之前不会将它们公布给客户端。
88
content_type: concept
99
weight: 90
10-
---
10+
---
1111

1212
<!--
1313
reviewers:
@@ -242,8 +242,8 @@ different, and the `.metadata.labels` do not affect the behavior of the Replicat
242242
### ReplicationController 上的标签
243243

244244
ReplicationController 本身可以有标签 (`.metadata.labels`)。
245-
通常,你可以将这些设置为 `.spec.template.metadata.labels`;
246-
如果没有指定 `.metadata.labels` 那么它默认为 `.spec.template.metadata.labels`。
245+
通常,你可以将这些设置为 `.spec.template.metadata.labels`
246+
如果没有指定 `.metadata.labels` 那么它默认为 `.spec.template.metadata.labels`
247247
但是,Kubernetes 允许它们是不同的,`.metadata.labels` 不会影响 ReplicationController 的行为。
248248

249249
<!--
@@ -256,7 +256,7 @@ deleted. This allows the ReplicationController to be replaced without affecting
256256
-->
257257
### Pod 选择算符 {#pod-selector}
258258

259-
`.spec.selector` 字段是一个[标签选择算符](/zh-cn/docs/concepts/overview/working-with-objects/labels/#label-selectors)。
259+
`.spec.selector` 字段是一个[标签选择算符](/zh-cn/docs/concepts/overview/working-with-objects/labels/#label-selectors)
260260
ReplicationController 管理标签与选择算符匹配的所有 Pod。
261261
它不区分它创建或删除的 Pod 和其他人或进程创建或删除的 Pod。
262262
这允许在不影响正在运行的 Pod 的情况下替换 ReplicationController。
@@ -299,7 +299,7 @@ If you do not specify `.spec.replicas`, then it defaults to 1.
299299
你可以通过设置 `.spec.replicas` 来指定应该同时运行多少个 Pod。
300300
在任何时候,处于运行状态的 Pod 个数都可能高于或者低于设定值。例如,副本个数刚刚被增加或减少时,或者一个 Pod 处于优雅终止过程中而其替代副本已经提前开始创建时。
301301

302-
如果你没有指定 `.spec.replicas` ,那么它默认是 1。
302+
如果你没有指定 `.spec.replicas`,那么它默认是 1。
303303

304304
<!--
305305
## Working with ReplicationControllers
@@ -341,7 +341,7 @@ When using the REST API or [client library](/docs/reference/using-api/client-lib
341341

342342
使用 kubectl,为 [`kubectl delete`](/docs/reference/generated/kubectl/kubectl-commands#delete) 指定 `--cascade=orphan` 选项。
343343

344-
当使用 REST API 或客户端库(/zh-cn/docs/reference/using-api/client-libraries)时,只需删除 ReplicationController 对象。
344+
当使用 REST API [客户端库](/zh-cn/docs/reference/using-api/client-libraries)时,只需删除 ReplicationController 对象。
345345

346346
<!--
347347
Once the original is deleted, you can create a new ReplicationController to replace it. As long
@@ -561,9 +561,9 @@ Unlike in the case where a user directly created pods, a ReplicationController r
561561
### 裸 Pod
562562

563563
与用户直接创建 Pod 的情况不同,ReplicationController 能够替换因某些原因
564-
被删除或被终止的 Pod ,例如在节点故障或中断节点维护的情况下,例如内核升级。
564+
被删除或被终止的 Pod,例如在节点故障或中断节点维护的情况下,例如内核升级。
565565
因此,我们建议你使用 ReplicationController,即使你的应用程序只需要一个 Pod。
566-
可以将其看作类似于进程管理器,它只管理跨多个节点的多个 Pod ,而不是单个节点上的单个进程。
566+
可以将其看作类似于进程管理器,它只管理跨多个节点的多个 Pod,而不是单个节点上的单个进程。
567567
ReplicationController 将本地容器重启委托给节点上的某个代理(例如,Kubelet 或 Docker)。
568568

569569
<!--

0 commit comments

Comments
 (0)