Merge pull request #26250 from chenxuc/misc_batch2

[zh] Sync web page for tasks
This commit is contained in:
Kubernetes Prow Robot
2021-01-26 15:35:39 -08:00
committed by GitHub
3 changed files with 13 additions and 2 deletions
@@ -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` 是证书文件路径名的占位符。
@@ -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
@@ -657,6 +657,17 @@ and
[`kubectl apply`](/docs/reference/generated/kubectl/kubectl-commands/#apply)。
<!--
{{< note >}}
Strategic merge patch is not supported for custom resources.
{{< /note >}}
-->
{{< note >}}
定制资源不支持策略性合并 patch。
{{< /note >}}
## {{% heading "whatsnext" %}}
<!--