sync kubeadm-upgrade topology-manager security-context

asa3311 · asa3311 · commit cdc1bddcdf63 · 2025-10-13T14:40:36.000+08:00
diff --git a/content/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md b/content/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md
@@ -202,18 +202,35 @@ sudo apt-cache madison kubeadm
 {{% tab name="CentOS、RHEL 或 Fedora" %}}
 
 <!--
+For systems with DNF:
 ```shell
 # Find the latest {{< skew currentVersion >}} version in the list.
 # It should look like {{< skew currentVersion >}}.x-*, where x is the latest patch.
 sudo yum list --showduplicates kubeadm --disableexcludes=kubernetes
 ```
 -->
+对于使用 DNF 的系统：
 ```shell
 # 在列表中查找最新的 {{< skew currentVersion >}} 版本
 # 它看起来应该是 {{< skew currentVersion >}}.x-*，其中 x 是最新的补丁版本
 sudo yum list --showduplicates kubeadm --disableexcludes=kubernetes
 ```
 
+<!--
+For systems with DNF5:
+```shell
+# Find the latest {{< skew currentVersion >}} version in the list.
+# It should look like {{< skew currentVersion >}}.x-*, where x is the latest patch.
+sudo yum list --showduplicates kubeadm --setopt=disable_excludes=kubernetes
+```
+-->
+对于使用 DNF5 的系统：
+```shell
+# 在列表中查找最新的 {{< skew currentVersion >}} 版本
+# 它看起来应该是 {{< skew currentVersion >}}.x-*，其中 x 是最新的补丁版本
+sudo yum list --showduplicates kubeadm --setopt=disable_excludes=kubernetes
+```
+
 {{% /tab %}}
 {{< /tabs >}}
 
@@ -273,15 +290,30 @@ Pick a control plane node that you wish to upgrade first. It must have the `/etc
    {{% tab name="CentOS、RHEL 或 Fedora" %}}
 
    <!--
+   For systems with DNF:
    ```shell
    # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
    sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
    ```
    -->
+   对于使用 DNF 的系统：
    ```shell
    # 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x
    sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
    ```
+   
+   <!--
+   For systems with DNF5:
+   ```shell
+   # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
+   sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --setopt=disable_excludes=kubernetes
+   ```
+   -->
+   对于使用 DNF5 的系统：
+   ```shell
+   # 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x
+   sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --setopt=disable_excludes=kubernetes
+   ```
 
    {{% /tab %}}
    {{< /tabs >}}
@@ -468,15 +500,30 @@ kubectl drain <node-to-drain> --ignore-daemonsets
    {{% tab name="CentOS、RHEL 或 Fedora" %}}
 
    <!--
+   For systems with DNF:
    ```shell
    # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
    sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
    ```
    -->
+   对于使用 DNF 的系统：
    ```shell
    # 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x
    sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
    ```
+   
+   <!--
+   For systems with DNF5:   
+   ```shell
+   # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
+   sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --setopt=disable_excludes=kubernetes
+   ```
+   -->
+   对于使用 DNF5 的系统：
+   ```shell
+   # 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x
+   sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --setopt=disable_excludes=kubernetes
+   ```
 
    {{% /tab %}}
    {{< /tabs >}}
diff --git a/content/zh-cn/docs/tasks/administer-cluster/topology-manager.md b/content/zh-cn/docs/tasks/administer-cluster/topology-manager.md
@@ -100,6 +100,15 @@ resource allocation decisions.
 取决于所配置的策略，所选建议可用来决定节点接受或拒绝 Pod。
 之后，建议会被存储在拓扑管理器中，供**建议提供者**在作资源分配决策时使用。
 
+<!--
+The flow can be seen in the following diagram.
+
+![topology_manager_flow](/images/docs/topology-manager-flow.png)
+-->
+该流程可见于下图。
+
+![topology_manager_flow](/images/docs/topology-manager-flow.png)
+
 <!--
 ## Windows Support
 -->
diff --git a/content/zh-cn/docs/tasks/configure-pod-container/security-context.md b/content/zh-cn/docs/tasks/configure-pod-container/security-context.md
@@ -313,7 +313,7 @@ Check the process identity:
 检查进程身份：
 
 ```shell
-$ id
+id
 ```
 
 <!--
@@ -338,7 +338,7 @@ Check the `/etc/group` in the container image:
 检查容器镜像中的 `/etc/group`：
 
 ```shell
-$ cat /etc/group
+cat /etc/group
 ```
 
 <!--
