Skip to content

Commit

Permalink
Merge pull request #26250 from chenxuc/misc_batch2
Browse files Browse the repository at this point in the history
[zh] Sync web page for tasks
  • Loading branch information
k8s-ci-robot authored Jan 26, 2021
2 parents e064d78 + b60b592 commit 24b887c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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` 是证书文件路径名的占位符。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}}
<!--
Expand Down

0 comments on commit 24b887c

Please sign in to comment.