diff --git a/content/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md b/content/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md index 56fde5ff3959e..66c4200ea8926 100644 --- a/content/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md +++ b/content/zh/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md @@ -211,7 +211,7 @@ for the pathnames of the certificate files. You need to change these to the actu of certificate files in your environment. Sometimes you may want to use Base64-encoded data embedded here instead of separate -certificate files; in that case you need add the suffix `-data` to the keys, for example, +certificate files; in that case you need to add the suffix `-data` to the keys, for example, `certificate-authority-data`, `client-certificate-data`, `client-key-data`. --> 其中的 `fake-ca-file`、`fake-cert-file` 和 `fake-key-file` 是证书文件路径名的占位符。 diff --git a/content/zh/docs/tasks/debug-application-cluster/debug-pod-replication-controller.md b/content/zh/docs/tasks/debug-application-cluster/debug-pod-replication-controller.md index 195dabb43a59a..8792bf89fb125 100644 --- a/content/zh/docs/tasks/debug-application-cluster/debug-pod-replication-controller.md +++ b/content/zh/docs/tasks/debug-application-cluster/debug-pod-replication-controller.md @@ -79,7 +79,7 @@ case you can try several things: * Add more nodes to the cluster. -* [Terminate unneeded pods](/docs/concepts/workloads/pods/#pod-termination) +* [Terminate unneeded pods](/docs/concepts/workloads/pods/pod-lifecycle/#pod-termination) to make room for pending pods. * Check that the pod is not larger than your nodes. For example, if all diff --git a/content/zh/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md b/content/zh/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md index 1958924fdb87a..44cb2029301b1 100644 --- a/content/zh/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md +++ b/content/zh/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch.md @@ -657,6 +657,17 @@ and 和 [`kubectl apply`](/docs/reference/generated/kubectl/kubectl-commands/#apply)。 + + +{{< note >}} +定制资源不支持策略性合并 patch。 +{{< /note >}} + + ## {{% heading "whatsnext" %}}