Merge pull request #41479 from asa3311/sync-kube-scheduler-config.v1beta2-apparmor-components

[zh-cn] sync kube-scheduler-config.v1beta2 apparmor components

Author: k8s-ci-robot

content/zh-cn/docs/concepts/overview/components.md

@@ -233,6 +233,18 @@ saving container logs to a central log store with search/browsing interface.
 [集群层面日志](/zh-cn/docs/concepts/cluster-administration/logging/)机制负责将容器的日志数据保存到一个集中的日志存储中，
 这种集中日志存储提供搜索和浏览接口。
 
+<!--
+### Network Plugins
+
+[Network plugins](/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins) are software
+components that implement the container network interface (CNI) specification. They are responsible for
+allocating IP addresses to pods and enabling them to communicate with each other within the cluster.
+-->
+### 网络插件   {#network-plugins}
+
+[网络插件](/zh-cn/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins)
+是实现容器网络接口（CNI）规范的软件组件。它们负责为 Pod 分配 IP 地址，并使这些 Pod 能在集群内部相互通信。
+
 ## {{% heading "whatsnext" %}}
 
 <!--

content/zh-cn/docs/reference/config-api/kube-scheduler-config.v1beta2.md

@@ -107,6 +107,19 @@ matching hard affinity to the incoming pod.
    要对现存的、带有与新 Pod 匹配的硬性亲和性设置的 Pod 计算亲和性得分。</p>
 </td>
 </tr>
+<tr><td>
+<code>ignorePreferredTermsOfExistingPods</code> <B>[Required]</B><br/>
+<code>bool</code>
+</td>
+<td>
+   <!--
+   IgnorePreferredTermsOfExistingPods configures the scheduler to ignore existing pods' preferred affinity
+   rules when scoring candidate nodes, unless the incoming pod has inter-pod affinities.
+   -->
+   <p>IgnorePreferredTermsOfExistingPods 配置调度器在为候选节点评分时，
+   忽略现有 Pod 的优选亲和性规则，除非传入的 Pod 有 Pod 间的亲和性。</p>
+</td>
+</tr>
 </tbody>
 </table>
 
@@ -292,7 +305,7 @@ NodeAffinityArgs holds arguments to configure the NodeAffinity plugin.
 <tr><td><code>kind</code><br/>string</td><td><code>NodeAffinityArgs</code></td></tr>
 
 <tr><td><code>addedAffinity</code><br/>
-<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#nodeaffinity-v1-core"><code>core/v1.NodeAffinity</code></a>
+<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#nodeaffinity-v1-core"><code>core/v1.NodeAffinity</code></a>
 </td>
 <td>
    <!--
@@ -412,7 +425,7 @@ PodTopologySpreadArgs holds arguments used to configure the PodTopologySpread pl
 <tr><td><code>kind</code><br/>string</td><td><code>PodTopologySpreadArgs</code></td></tr>
 
 <tr><td><code>defaultConstraints</code><br/>
-<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#topologyspreadconstraint-v1-core"><code>[]core/v1.TopologySpreadConstraint</code></a>
+<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#topologyspreadconstraint-v1-core"><code>[]core/v1.TopologySpreadConstraint</code></a>
 </td>
 <td>
    <!--
@@ -1559,10 +1572,10 @@ client.</p>
 </td>
 <td>
    <!--
-   <p>enableContentionProfiling enables lock contention profiling, if
+   <p>enableContentionProfiling enables block profiling, if
 enableProfiling is true.</p>
    -->
-   <p>此字段在 <code>enableProfiling</code> 为 true 时允许执行锁竞争分析。</p>
+   <p>此字段在 <code>enableProfiling</code> 为 true 时启用阻塞分析。</p>
 </td>
 </tr>
 </tbody>

content/zh-cn/docs/tutorials/security/apparmor.md

@@ -193,12 +193,10 @@ gke-test-default-pool-239f5d02-xwux: kubelet is posting ready status. AppArmor e
 {{< note >}}
 <!--
 AppArmor is currently in beta, so options are specified as annotations. Once support graduates to
-general availability, the annotations will be replaced with first-class fields (more details in
-[Upgrade path to GA](#upgrade-path-to-general-availability)).
+general availability, the annotations will be replaced with first-class fields.
 -->
 AppArmor 目前处于 Beta 阶段，因此选项以注解形式设定。
-一旦 AppArmor 支持进入正式发布阶段，注解将被替换为一阶的资源字段
-（更多详情参见[升级到 GA 的途径](#upgrade-path-to-general-availability)）。
+一旦 AppArmor 支持进入正式发布阶段，注解将被替换为一阶的资源字段。
 {{< /note >}}
 
 <!--