diff --git a/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1.md b/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1.md index cfe2fd37abd..6dd9cc19b8e 100644 --- a/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1.md +++ b/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1.md @@ -142,13 +142,13 @@ PersistentVolumeClaimSpec 描述存储设备的常用参数,并支持通过 so volumeMode 定义申领需要哪种类别的卷。当申领规约中未包含此字段时,意味着取值为 Filesystem。 -### Alpha 级别 +### Beta 级别 - **dataSource** (}}">TypedLocalObjectReference) dataSource 字段可用于二选一: diff --git a/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-v1.md b/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-v1.md index a84781ca338..62f936f2644 100644 --- a/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-v1.md +++ b/content/zh-cn/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-v1.md @@ -686,7 +686,7 @@ PersistentVolumeSpec 是持久卷的规约。 - **csi.nodeExpandSecretRef** (SecretReference) - nodeExpandSecretRef is a reference to the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodeExpandVolume call. This is an alpha field and requires enabling CSINodeExpandSecret feature gate. This field is optional, may be omitted if no secret is required. If the secret object contains more than one secret, all secrets are passed. + nodeExpandSecretRef is a reference to the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodeExpandVolume call. This is an beta field and requires enabling CSINodeExpandSecret feature gate. This field is optional, may be omitted if no secret is required. If the secret object contains more than one secret, all secrets are passed. *SecretReference represents a Secret Reference. It has enough information to retrieve secret in any namespace* @@ -708,7 +708,7 @@ PersistentVolumeSpec 是持久卷的规约。 nodeExpandSecretRef 是对包含敏感信息的 Secret 对象的引用, 从而传递到 CSI 驱动以完成 CSI NodeExpandVolume 和 NodeUnpublishVolume 调用。 - 这是一个 Alpha 字段,需要启用 CSINodeExpandSecret 特性门控。 + 这是一个 Beta 字段,需要启用 CSINodeExpandSecret 特性门控。 此字段是可选的,且如果不需要 Secret,则此字段可以为空。 如果 Secret 对象包含多个 Secret,则所有 Secret 被传递。 diff --git a/content/zh-cn/docs/reference/labels-annotations-taints/_index.md b/content/zh-cn/docs/reference/labels-annotations-taints/_index.md index ae12d3e3107..96bf8c8a026 100644 --- a/content/zh-cn/docs/reference/labels-annotations-taints/_index.md +++ b/content/zh-cn/docs/reference/labels-annotations-taints/_index.md @@ -921,7 +921,7 @@ Used on: Node The kubelet can set this annotation on a Node to denote its configured IPv4 address. -When kubelet is started with the "external" cloud provider, it sets this annotation on the Node to denote an IP address set from the command line flag (`--node-ip`). This IP is verified with the cloud provider as valid by the cloud-controller-manager. +When kubelet is started with the `--cloud-provider` flag set to any value (includes both external and legacy in-tree cloud providers), it sets this annotation on the Node to denote an IP address set from the command line flag (`--node-ip`). This IP is verified with the cloud provider as valid by the cloud-controller-manager. --> ### alpha.kubernetes.io/provided-node-ip {#alpha-kubernetes-io-provided-node-ip} @@ -931,7 +931,8 @@ When kubelet is started with the "external" cloud provider, it sets this annotat kubelet 可以在 Node 上设置此注解来表示其配置的 IPv4 地址。 -当使用“外部”云驱动启动时,kubelet 会在 Node 上设置此注解以表示从命令行标志 ( `--node-ip` ) 设置的 IP 地址。 +如果 kubelet 被启动时 `--cloud-provider` 标志设置为任一云驱动(包括外部云驱动和传统树内云驱动) +kubelet 会在 Node 上设置此注解以表示从命令行标志(`--node-ip`)设置的 IP 地址。 云控制器管理器通过云驱动验证此 IP 是否有效。 @@ -1348,7 +1349,10 @@ for more information. Example: `kubernetes.io/psp: restricted` -This annotation is only relevant if you are using [PodSecurityPolicies](/docs/concepts/security/pod-security-policy/). +Used on: Pod + +This annotation was only relevant if you were using [PodSecurityPolicies](/docs/concepts/security/pod-security-policy/). +Kubernetes v{{< skew currentVersion >}} does not support the PodSecurityPolicy API. When the PodSecurityPolicy admission controller admits a Pod, the admission controller modifies the Pod to have this annotation. @@ -1359,7 +1363,10 @@ The value of the annotation is the name of the PodSecurityPolicy that was used f 例如:`kubernetes.io/psp: restricted` +用于:Pod + 这个注解只在你使用 [PodSecurityPolicies](/zh-cn/docs/concepts/security/pod-security-policy/) 时才有意义。 +Kubernetes v{{< skew currentVersion >}} 不支持 PodSecurityPolicy API。 当 PodSecurityPolicy 准入控制器接受一个 Pod 时,会修改该 Pod, 并给这个 Pod 添加此注解。 @@ -1368,7 +1375,8 @@ The value of the annotation is the name of the PodSecurityPolicy that was used f ### seccomp.security.alpha.kubernetes.io/pod (已弃用) {#seccomp-security-alpha-kubernetes-io-pod} -此注解自 Kubernetes v1.19 起已被弃用,将在 v1.25 中失效。 +此注解自 Kubernetes v1.19 起已被弃用,将在未来的版本中失效。 +请使用对应 Pod 或容器的 `securityContext.seccompProfile` 字段替代。 要为 Pod 指定安全设置,请在 Pod 规范中包含 `securityContext` 字段。 Pod 的 `.spec` 中的 [`securityContext`](/zh-cn/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context) 字段定义了 Pod 级别的安全属性。 @@ -1386,7 +1395,8 @@ Pod 的 `.spec` 中的 [`securityContext`](/zh-cn/docs/reference/kubernetes-api/ ### container.seccomp.security.alpha.kubernetes.io/[NAME] {#container-seccomp-security-alpha-kubernetes-io} -此注解自 Kubernetes v1.19 起已被弃用,将在 v1.25 中失效。 +此注解自 Kubernetes v1.19 起已被弃用,将在未来的版本中失效。 +请使用对应 Pod 或容器的 `securityContext.seccompProfile` 字段替代。 教程[使用 seccomp 限制容器的系统调用](/zh-cn/docs/tutorials/security/seccomp/)将引导你完成将 seccomp 配置文件应用于 Pod 或其容器的步骤。 该教程介绍了在 Kubernetes 中配置 seccomp 的支持机制,基于在 Pod 的 `.spec` 中设置 `securityContext`。 @@ -1541,25 +1552,3 @@ Example: `node-role.kubernetes.io/control-plane:NoSchedule` Taint that kubeadm applies on control plane nodes to allow only critical workloads to schedule on them. --> kubeadm 应用在控制平面节点上的污点,仅允许在其上调度关键工作负载。 - -### node-role.kubernetes.io/master - - -例子:`node-role.kubernetes.io/master:NoSchedule` - -用于:Node - - -kubeadm 应用在控制平面节点上的污点,仅允许在其上调度关键工作负载。 - -{{< note >}} -从 v1.20 开始,此污点已弃用,并将在 v1.25 中将其删除,取而代之的是 `node-role.kubernetes.io/control-plane`。 -{{< /note >}}