From d5ad593bdd06e0b8ccc2ecf3f45e586a43ad4e80 Mon Sep 17 00:00:00 2001
From: chentanjun <2799194073@qq.com>
Date: Fri, 27 Dec 2019 09:33:38 +0800
Subject: [PATCH] sync en update
 /docs/concepts/configuration/taint-and-toleration.md and
 /docs/concepts/services-networking/dual-stack.md (#18315)

---
 .../zh/docs/concepts/configuration/taint-and-toleration.md | 7 +++----
 content/zh/docs/concepts/services-networking/dual-stack.md | 7 ++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/content/zh/docs/concepts/configuration/taint-and-toleration.md b/content/zh/docs/concepts/configuration/taint-and-toleration.md
index 9314737cee..120d032f24 100755
--- a/content/zh/docs/concepts/configuration/taint-and-toleration.md
+++ b/content/zh/docs/concepts/configuration/taint-and-toleration.md
@@ -421,8 +421,7 @@ which matches the behavior when this feature is disabled.
 ## 基于节点状态添加 taint
 
 <!--
-In version 1.12, `TaintNodesByCondition` feature is promoted to beta, so node lifecycle controller automatically creates taints corresponding to
-Node conditions.
+The node lifecycle controller automatically creates taints corresponding to Node conditions.
 Similarly the scheduler does not check Node conditions; instead the scheduler checks taints. This assures that Node conditions don't affect what's scheduled onto the Node. The user can choose to ignore some of the Node's problems (represented as Node conditions) by adding appropriate Pod tolerations.
 Note that `TaintNodesByCondition` only taints nodes with `NoSchedule` effect. `NoExecute` effect is controlled by `TaintBasedEviction` which is a beta feature and enabled by default since version 1.13.
 
@@ -436,8 +435,8 @@ breaking.
   * `node.kubernetes.io/unschedulable` (1.10 or later)
   * `node.kubernetes.io/network-unavailable` (*host network only*)
 -->
-在版本1.12中，`TaintNodesByCondition` 功能已升级为Beta，因此节点生命周期控制器会自动创建与Node条件相对应的污点。
-同样，调度程序不检查节点条件。 而是调度程序检查污点。 这确保了节点条件不会影响调度到节点上的内容。 用户可以通过添加适当的 Pod 容忍来选择忽略某些Node的问题(表示为 Node 的调度条件)。
+Node 生命周期控制器会自动创建与 Node 条件相对应的污点。
+同样，调度程序不检查节点条件。 而是调度程序检查污点。 这确保了节点条件不会影响调度到节点上的内容。 用户可以通过添加适当的 Pod 容忍来选择忽略某些 Node 的问题(表示为 Node 的调度条件)。
 注意，`TaintNodesByCondition` 只会污染具有 `NoSchedule` 设定的节点。 `NoExecute` 效应由 `TaintBasedEviction` 控制，
 `TaintBasedEviction` 是 Beta 版功能，自1.13版起默认启用。
 
diff --git a/content/zh/docs/concepts/services-networking/dual-stack.md b/content/zh/docs/concepts/services-networking/dual-stack.md
index f8f359784c..1bb170c06c 100644
--- a/content/zh/docs/concepts/services-networking/dual-stack.md
+++ b/content/zh/docs/concepts/services-networking/dual-stack.md
@@ -101,8 +101,9 @@ To enable IPv4/IPv6 dual-stack, enable the `IPv6DualStack` [feature gate](/docs/
 
    * kube-controller-manager:
       * `--feature-gates="IPv6DualStack=true"`
-      * `--cluster-cidr=<IPv4 CIDR>,<IPv6 CIDR>` eg. `--cluster-cidr=10.244.0.0/16,fc00::/24`
+      * `--cluster-cidr=<IPv4 CIDR>,<IPv6 CIDR>` 例如 `--cluster-cidr=10.244.0.0/16,fc00::/24`
       * `--service-cluster-ip-range=<IPv4 CIDR>,<IPv6 CIDR>`
+      * `--node-cidr-mask-size-ipv4|--node-cidr-mask-size-ipv6` 对于 IPv4 默认为 /24，对于 IPv6 默认为 /64
    * kubelet:
       * `--feature-gates="IPv6DualStack=true"`
    * kube-proxy:
@@ -194,13 +195,9 @@ The use of publicly routable and non-publicly routable IPv6 address blocks is ac
 ## 已知问题
 
 <!--
-   * IPv6 network block assignment uses the default IPv4 CIDR block size (/24)
    * Kubenet forces IPv4,IPv6 positional reporting of IPs (--cluster-cidr)
-   * Dual-stack networking does not function if the `EndpointSlice` feature gate is enabled.
 -->
-   * IPv6 网络块分配使用默认的 IPv4 CIDR 块大小（/24）
    * Kubenet 强制 IPv4，IPv6 的 IPs 位置报告 (--cluster-cidr)
-   * 如果 `EndpointSlice` 特性门控启用，则双栈网络不起作用。
 
 {{% /capture %}}