Skip to content

Commit 448e1fa

Browse files
authored
Merge pull request #39533 from Zhuzhenghao/2-19
[zh] Resync some tiny changes in page under tasks
2 parents e380dd9 + 876ce6c commit 448e1fa

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

content/en/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ kubectl get deployment patch-demo --output yaml
261261
The `containers` list that you specified in the patch has only one Container.
262262
The output shows that your list of one Container replaced the existing `containers` list.
263263

264-
```shell
264+
```yaml
265265
spec:
266266
containers:
267267
- image: gcr.io/google-samples/node-hello:1.0

content/zh-cn/docs/tasks/configure-pod-container/configure-volume-storage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ restarts. Here is the configuration file for the Pod:
4949
{{< codenew file="pods/storage/redis.yaml" >}}
5050

5151
<!--
52-
1.Create the Pod:
52+
1. Create the Pod:
5353
-->
5454
1. 创建 Pod:
5555

@@ -88,7 +88,7 @@ restarts. Here is the configuration file for the Pod:
8888
```
8989

9090
<!--
91-
1.In your shell, go to `/data/redis`, and then create a file:
91+
1. In your shell, go to `/data/redis`, and then create a file:
9292
-->
9393
4. 在你的 Shell 中,切换到 `/data/redis` 目录下,然后创建一个文件:
9494

content/zh-cn/docs/tasks/configure-pod-container/migrate-from-psp.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ For each updated PodSecurityPolicy:
356356
you can compare the pod with the PodTemplate in the controller resource. If any changes are
357357
identified, the original Pod or PodTemplate should be updated with the desired configuration.
358358
The fields to review are:
359+
- `.metadata.annotations['container.apparmor.security.beta.kubernetes.io/*']` (replace * with each container name)
359360
-->
360361
2. 比较运行中的 Pod 与原来的 Pod 规约,确定 PodSecurityPolicy 是否更改过这些 Pod。
361362
对于通过[工作负载资源](/zh-cn/docs/concepts/workloads/controllers/)所创建的 Pod,

content/zh-cn/docs/tasks/configure-pod-container/pull-image-private-registry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ as an example registry.
4444
<!-- steps -->
4545

4646
<!--
47-
## Log in to Docker
47+
## Log in to Docker Hub
4848
4949
On your laptop, you must authenticate with a registry in order to pull a private image.
5050
-->
51-
## 登录 Docker 镜像仓库 {#log-in-to-docker}
51+
## 登录 Docker 镜像仓库 {#log-in-to-docker-hub}
5252

5353
在个人电脑上,要想拉取私有镜像必须在镜像仓库上进行身份验证。
5454

content/zh-cn/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ kubectl patch deployment patch-demo --patch '{"spec": {"template": {"spec": {"co
639639
The flag `--subresource=[subresource-name]` is used with kubectl commands like get, patch,
640640
edit and replace to fetch and update `status` and `scale` subresources of the resources
641641
(applicable for kubectl version v1.24 or more). This flag is used with all the API resources
642-
(built-in and CRs) which has `status` or `scale` subresource. Deployment is one of the
642+
(built-in and CRs) that have `status` or `scale` subresource. Deployment is one of the
643643
examples which supports these subresources.
644644
645645
Here's a manifest for a Deployment that has two replicas:

content/zh-cn/docs/tasks/network/validate-dual-stack.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ content_type: task
77
reviewers:
88
- lachie83
99
- khenidak
10+
- bridgetkromhout
11+
min-kubernetes-server-version: v1.23
1012
title: Validate IPv4/IPv6 dual-stack
1113
content_type: task
1214
-->
@@ -316,7 +318,7 @@ Events: <none>
316318
<!--
317319
### Create a dual-stack load balanced Service
318320
319-
If the cloud provider supports the provisioning of IPv6 enabled external load balancers, create the following Service with `PreferDualStack` in `.spec.ipFamilyPolicy`. `IPv6` as the first element of the `.spec.ipFamilies` array and the `type` field set to `LoadBalancer`.
321+
If the cloud provider supports the provisioning of IPv6 enabled external load balancers, create the following Service with `PreferDualStack` in `.spec.ipFamilyPolicy`, `IPv6` as the first element of the `.spec.ipFamilies` array and the `type` field set to `LoadBalancer`.
320322
-->
321323
### 创建双协议栈负载均衡服务
322324
@@ -336,7 +338,7 @@ kubectl get svc -l app.kubernetes.io/name=MyApp
336338
```
337339

338340
<!--
339-
Validate that the Service receives a `CLUSTER-IP` address from the IPv6 address block along with an `EXTERNAL-IP`. You may then validate access to the service via the IP and port.
341+
Validate that the Service receives a `CLUSTER-IP` address from the IPv6 address block along with an `EXTERNAL-IP`. You may then validate access to the service via the IP and port.
340342
-->
341343
验证服务是否从 IPv6 地址块中接收到 `CLUSTER-IP` 地址以及 `EXTERNAL-IP`
342344
然后,你可以通过 IP 和端口验证对服务的访问。

content/zh-cn/docs/tasks/run-application/scale-stateful-set.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: 扩缩 StatefulSet
33
content_type: task
4+
weight: 50
45
---
56

67
<!-- overview -->

0 commit comments

Comments
 (0)