Merge branch 'master' of git://github.com/kubernetes/website into release-1.12
* 'master' of git://github.com/kubernetes/website: (222 commits) Add temporary owners for 1.13 release (#11453) fix Minikube 404 error. (#11461) Resolve conflicts against dev-1.13 for /ko contents (#11439) replace `run` with `create deployment` (#11392) Updated list all pods with -o wide comment (#11394) fix broken link for KubeletConfiguration (#11423) Update on pod-priority-preemption.md (#11418) Add guidelines for working with localized content (#11415) Update what-is-kubernetes.md (#11399) Remove redundant close tags and little bit formatting (#11389) Add SysEleven MetaKube as hosted solution (#11393) Add rui to sig-docs-zh team (#11391) fix Improper translation (#11384) Add pigletfly(WangBing) as a sig-docs-zh-reviewer (#11370) update link to CloudProvider Interface (#11228) Fix the "my-scheduler-as-kube-scheduler" ClusterRoleBinding. (#11112) fix non-existing "CloudProvider Interface" link (#10953) Updated ingress.md (#11213) Further updates to TLS Bootstrapping (#11258) Updated 'exec' description (#11365) ...
This commit is contained in:
Rui Chen
@@ -54,7 +54,7 @@ Before proceeding:
|
||||
{{< caution >}}
|
||||
<!--
|
||||
|
||||
**Caution:** All the containers will get restarted after the upgrade, due to container spec hash value gets changed.
|
||||
All the containers will get restarted after the upgrade, due to container spec hash value gets changed.
|
||||
|
||||
--->
|
||||
**注意:** 由于容器的具体哈希值改变了，所有的容器在升级之后会重新启动。
|
||||
@@ -98,7 +98,7 @@ chmod a+rx /usr/bin/kubeadm
|
||||
{{< caution >}}
|
||||
<!--
|
||||
|
||||
**Caution:** Upgrading the `kubeadm` package on your system prior to upgrading the control plane causes a failed upgrade.
|
||||
Upgrading the `kubeadm` package on your system prior to upgrading the control plane causes a failed upgrade.
|
||||
Even though `kubeadm` ships in the Kubernetes repositories, it's important to install `kubeadm` manually. The kubeadm
|
||||
team is working on fixing this limitation.
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
title: 管理内存、CPU 和 API 资源
|
||||
title: 管理内存，CPU 和 API 资源
|
||||
weight: 20
|
||||
---
|
||||
|
||||
@@ -9,4 +9,3 @@ title: Manage Memory, CPU, and API Resources
|
||||
weight: 20
|
||||
---
|
||||
-->
|
||||
|
||||
|
||||
@@ -454,8 +454,3 @@ kubectl delete namespace constraints-cpu-example
|
||||
* [为Pod配置Service数量](/docs/tasks/configure-pod-container/quality-service-pod/)
|
||||
|
||||
{{% /capture %}}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -313,4 +313,3 @@ it can be allowed to run in a namespace that is restricted by a quota.
|
||||
* [为Pod配置Service数量](/docs/tasks/configure-pod-container/quality-service-pod/)
|
||||
|
||||
{{% /capture %}}
|
||||
|
||||
|
||||
-5
@@ -440,8 +440,3 @@ kubectl delete namespace constraints-mem-example
|
||||
* [为 Pod 配置 Service 数量](/docs/tasks/configure-pod-container/quality-service-pod/)
|
||||
|
||||
{{% /capture %}}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-3
@@ -265,7 +265,7 @@ Here are two of the restrictions that a resource quota imposes on a namespace:
|
||||
-->
|
||||
|
||||
* 运行在命名空间中的每个容器必须有自己的内存限制。
|
||||
* 命名空间中所有容器的内存使用量之和不能超过声明的限制值。
|
||||
* 命名空间中所有容器的内存使用量之和不能超过声明的限制值。
|
||||
|
||||
<!--
|
||||
If a Container does not specify its own memory limit, it is given the default limit, and then
|
||||
@@ -331,5 +331,3 @@ it can be allowed to run in a namespace that is restricted by a quota.
|
||||
* [为 Pod 配置服务数量](/docs/tasks/configure-pod-container/quality-service-pod/)
|
||||
|
||||
{{% /capture %}}
|
||||
|
||||
|
||||
|
||||
-5
@@ -298,8 +298,3 @@ kubectl delete namespace quota-mem-cpu-example
|
||||
* [为 Pod 配置 Service 数量](/docs/tasks/configure-pod-container/quality-service-pod/)
|
||||
|
||||
{{% /capture %}}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
<!--
|
||||
---
|
||||
title: Install a Network Policy Provider
|
||||
weight: 30
|
||||
---
|
||||
-->
|
||||
|
||||
---
|
||||
title: 安装网络规则驱动
|
||||
weight: 30
|
||||
---
|
||||
@@ -103,7 +103,7 @@ The following sysctls are supported in the _safe_ set:
|
||||
|
||||
{{< note >}}
|
||||
<!--
|
||||
**Note**: The example `net.ipv4.tcp_syncookies` is not namespaced on Linux kernel version 4.4 or lower.
|
||||
The example `net.ipv4.tcp_syncookies` is not namespaced on Linux kernel version 4.4 or lower.
|
||||
--->
|
||||
**注意**: 示例中的 `net.ipv4.tcp_syncookies` 在Linux 内核 4.4 或更低的版本中是无命名空间的。
|
||||
{{< /note >}}
|
||||
@@ -226,7 +226,7 @@ spec:
|
||||
|
||||
{{< warning >}}
|
||||
<!--
|
||||
**Warning**: Due to their nature of being _unsafe_, the use of _unsafe_ sysctls
|
||||
Due to their nature of being _unsafe_, the use of _unsafe_ sysctls
|
||||
is at-your-own-risk and can lead to severe problems like wrong behavior of
|
||||
containers, resource shortage or complete breakage of a node.
|
||||
--->
|
||||
@@ -299,7 +299,7 @@ given sysctl is both allowed and forbidden.
|
||||
|
||||
{{< warning >}}
|
||||
<!--
|
||||
**Warning**: If you whitelist unsafe sysctls via the `allowedUnsafeSysctls` field
|
||||
If you whitelist unsafe sysctls via the `allowedUnsafeSysctls` field
|
||||
in a PodSecurityPolicy, any pod using such a sysctl will fail to start
|
||||
if the sysctl is not whitelisted via the `--allowed-unsafe-sysctls` kubelet
|
||||
flag as well on that node.
|
||||
|
||||
Reference in New Issue
Block a user