Skip to content

Commit 7b0dd7d

Browse files
authored
Merge pull request #26395 from ydFu/update-dual-stack
[zh] Resync concepts pages for services-networking\dual-stack.md
2 parents a9fd8ee + 1cb1ac4 commit 7b0dd7d

File tree

2 files changed

+28
-11
lines changed

2 files changed

+28
-11
lines changed

content/zh/docs/concepts/services-networking/dual-stack.md

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@ weight: 70
99
---
1010

1111
<!--
12+
reviewers:
13+
- lachie83
14+
- khenidak
15+
- aramase
16+
- bridgetkromhout
1217
title: IPv4/IPv6 dual-stack
1318
feature:
1419
title: IPv4/IPv6 dual-stack
1520
description: >
1621
Allocation of IPv4 and IPv6 addresses to Pods and Services
22+
1723
content_type: concept
1824
weight: 70
1925
-->
@@ -85,6 +91,20 @@ The following prerequisites are needed in order to utilize IPv4/IPv6 dual-stack
8591

8692
<!--
8793
To enable IPv4/IPv6 dual-stack, enable the `IPv6DualStack` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) for the relevant components of your cluster, and set dual-stack cluster network assignments:
94+
95+
* kube-apiserver:
96+
* `--feature-gates="IPv6DualStack=true"`
97+
* `--service-cluster-ip-range=<IPv4 CIDR>,<IPv6 CIDR>`
98+
* kube-controller-manager:
99+
* `--feature-gates="IPv6DualStack=true"`
100+
* `--cluster-cidr=<IPv4 CIDR>,<IPv6 CIDR>`
101+
* `--service-cluster-ip-range=<IPv4 CIDR>,<IPv6 CIDR>`
102+
* `--node-cidr-mask-size-ipv4|--node-cidr-mask-size-ipv6` defaults to /24 for IPv4 and /64 for IPv6
103+
* kubelet:
104+
* `--feature-gates="IPv6DualStack=true"`
105+
* kube-proxy:
106+
* `--cluster-cidr=<IPv4 CIDR>,<IPv6 CIDR>`
107+
* `--feature-gates="IPv6DualStack=true"`
88108
-->
89109
要启用 IPv4/IPv6 双协议栈,为集群的相关组件启用 `IPv6DualStack`
90110
[特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)
@@ -95,8 +115,8 @@ To enable IPv4/IPv6 dual-stack, enable the `IPv6DualStack` [feature gate](/docs/
95115
* `--service-cluster-ip-range=<IPv4 CIDR>,<IPv6 CIDR>`
96116
* kube-controller-manager:
97117
* `--feature-gates="IPv6DualStack=true"`
98-
* `--cluster-cidr=<IPv4 CIDR>,<IPv6 CIDR>` 例如 `--cluster-cidr=10.244.0.0/16,fc00::/48`
99-
* `--service-cluster-ip-range=<IPv4 CIDR>,<IPv6 CIDR>` 例如 `--service-cluster-ip-range=10.0.0.0/16,fd00::/108`
118+
* `--cluster-cidr=<IPv4 CIDR>,<IPv6 CIDR>`
119+
* `--service-cluster-ip-range=<IPv4 CIDR>,<IPv6 CIDR>`
100120
* `--node-cidr-mask-size-ipv4|--node-cidr-mask-size-ipv6` 对于 IPv4 默认为 /24,对于 IPv6 默认为 /64
101121
* kubelet:
102122
* `--feature-gates="IPv6DualStack=true"`
@@ -132,7 +152,7 @@ set the `.spec.ipFamilyPolicy` field to one of the following values:
132152
-->
133153
如果你的集群启用了 IPv4/IPv6 双协议栈网络,则可以使用 IPv4 或 IPv6 地址来创建
134154
{{< glossary_tooltip text="Service" term_id="service" >}}。
135-
服务的地址族默认为第一个服务集群 IP 范围的地址族(通过 kube-apiserver 的 `--service-cluster-ip-range` 参数配置)
155+
服务的地址族默认为第一个服务集群 IP 范围的地址族(通过 kube-apiserver 的 `--service-cluster-ip-range` 参数配置)
136156
当你定义服务时,可以选择将其配置为双栈。若要指定所需的行为,你可以设置 `.spec.ipFamilyPolicy` 字段为以下值之一:
137157

138158
<!--
@@ -396,9 +416,9 @@ For [Headless Services without selectors](/docs/concepts/services-networking/ser
396416
若没有显式设置 `.spec.ipFamilyPolicy`,则 `.spec.ipFamilyPolicy` 字段默认设置为 `RequireDualStack`。
397417

398418
<!--
399-
### Type LoadBalancer
419+
### Service type LoadBalancer
400420
-->
401-
### LoadBalancer 类型
421+
### LoadBalancer 类型服务
402422

403423
<!--
404424
To provision a dual-stack load balancer for your Service:
@@ -418,7 +438,7 @@ To use a dual-stack `LoadBalancer` type Service, your cloud provider must suppor
418438
{{< /note >}}
419439

420440
<!--
421-
## Egress Traffic
441+
## Egress traffic
422442
-->
423443
## 出站流量
424444

@@ -440,6 +460,4 @@ Ensure your {{< glossary_tooltip text="CNI" term_id="cni" >}} provider supports
440460
<!--
441461
* [Validate IPv4/IPv6 dual-stack](/docs/tasks/network/validate-dual-stack) networking
442462
-->
443-
* [验证 IPv4/IPv6 双协议栈](/zh/docs/tasks/network/validate-dual-stack)网络
444-
445-
463+
* [验证 IPv4/IPv6 双协议栈](/zh/docs/tasks/network/validate-dual-stack)网络

content/zh/docs/tasks/administer-cluster/safely-drain-node.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Once it returns (without giving an error), you can power down the node
125125
If you leave the node in the cluster during the maintenance operation, you need to run
126126
-->
127127
一旦它返回(没有报错),
128-
你就可以下电此节点(或者等价地,如果在云平台上,删除支持该节点的虚拟机)。
128+
你就可以下线此节点(或者等价地,如果在云平台上,删除支持该节点的虚拟机)。
129129
如果要在维护操作期间将节点留在集群中,则需要运行:
130130

131131
```shell
@@ -295,4 +295,3 @@ Kubernetes 并没有具体说明在这种情况下应该采取什么行为,
295295
-->
296296
* 执行[配置 PDB](/zh/docs/tasks/run-application/configure-pdb/)中的各个步骤,
297297
保护你的应用
298-

0 commit comments

Comments
 (0)