Merge branch 'master' into patch-3

2017-01-24 10:08:39 +08:00
parent fe1640a71e 64c9a962ae
commit 51f3089cf3
1645 changed files with 6423 additions and 117737 deletions
@@ -89,7 +89,7 @@ Mitigations:
  - Mitigates: Apiserver VM shutdown or apiserver crashing
  - Mitigates: Supporting services VM shutdown or crashes

- Action use IaaS providers reliable storage (e.g. GCE PD or AWS EBS volume) for VMs with apiserver+etcd
+- Action: Use IaaS providers reliable storage (e.g. GCE PD or AWS EBS volume) for VMs with apiserver+etcd
  - Mitigates: Apiserver backing storage lost

 - Action: Use (experimental) [high-availability](/docs/admin/high-availability) configuration
@@ -112,4 +112,4 @@ Mitigations:
  - Mitigates: Kubelet software fault

 - Action: [Multiple independent clusters](/docs/admin/multi-cluster) (and avoid making risky changes to all clusters at once)
-  - Mitigates: Everything listed above.
+  - Mitigates: Everything listed above.
@@ -47,8 +47,8 @@ selection from the set.

 ### SRV records

-SRV Records are created for named ports that are part of normal or Headless
-Services.
+SRV Records are created for named ports that are part of normal or [Headless
+Services](http://releases.k8s.io/docs/user-guide/services/#headless-services).
 For each named port, the SRV record would have the form
 `_my-port-name._my-port-protocol.my-svc.my-namespace.svc.cluster.local`.
 For a regular service, this resolves to the port number and the CNAME:
@@ -7,7 +7,7 @@ title: Configuring kubelet Garbage Collection
 * TOC
 {:toc}

-Garbage collection is a helpful function of kubelet that will clean up unused images and unused containers. kubelet will perform garbage collection for containers every minute and garbage collection for images every five minutes.
+Garbage collection is a helpful function of kubelet that will clean up unused images and unused containers. Kubelet will perform garbage collection for containers every minute and garbage collection for images every five minutes.

 External garbage collection tools are not recommended as these tools can potentially break the behavior of kubelet by removing containers expected to exist.

@@ -61,7 +61,7 @@ project](/docs/admin/salt).
 * **DNS Integration with SkyDNS** ([dns.md](/docs/admin/dns)):
  Resolving a DNS name directly to a Kubernetes service.

-* [**Cluster-level logging**](/docs/user-guide/logging/overview)
+* [**Cluster-level logging**](/docs/user-guide/logging/overview):
  Saving container logs to a central log store with search/browsing interface.

 ## Multi-tenant support
@@ -26,7 +26,7 @@ and build the source.
 ```shell
 git clone https://github.com/kubernetes/kubernetes.git
 cd kubernetes
-hack/build-go.sh
+make
 ```

 Create a container image containing the kube-scheduler binary. Here is the `Dockerfile`
@@ -13,7 +13,6 @@ __Disclaimer__: Network plugins are in alpha. Its contents will change rapidly.

 Network plugins in Kubernetes come in a few flavors:

-* Plain vanilla exec plugins - deprecated in favor of CNI plugins.
 * CNI plugins: adhere to the appc/CNI specification, designed for interoperability.
 * Kubenet plugin: implements basic `cbr0` using the `bridge` and `host-local` CNI plugins

@@ -30,10 +29,6 @@ Besides providing the [`NetworkPlugin` interface](https://github.com/kubernetes/

 By default if no kubelet network plugin is specified, the `noop` plugin is used, which sets `net/bridge/bridge-nf-call-iptables=1` to ensure simple configurations (like docker with a bridge) work correctly with the iptables proxy.

-### Exec
-
-Place plugins in `network-plugin-dir/plugin-name/plugin-name`, i.e. if you have a bridge plugin and `network-plugin-dir` is `/usr/lib/kubernetes`, you'd place the bridge plugin executable at `/usr/lib/kubernetes/bridge/bridge`. See [this comment](https://github.com/kubernetes/kubernetes/tree/{{page.version}}/pkg/kubelet/network/exec/exec.go) for more details.
-
 ### CNI

 The CNI plugin is selected by passing Kubelet the `--network-plugin=cni` command-line option.  Kubelet reads a file from `--cni-conf-dir` (default `/etc/cni/net.d`) and uses the CNI configuration from that file to set up each pod's network.  The CNI configuration file must match the [CNI specification](https://github.com/containernetworking/cni/blob/master/SPEC.md#network-configuration), and any required CNI plugins referenced by the configuration must be present in `--cni-bin-dir` (default `/opt/cni/bin`).
@@ -73,7 +68,6 @@ This option is provided to the network-plugin; currently **only kubenet supports

 ## Usage Summary

-* `--network-plugin=exec` specifies that we use the `exec` plugin, with executables located in `--network-plugin-dir`.
 * `--network-plugin=cni` specifies that we use the `cni` network plugin with actual CNI plugin binaries located in `--cni-bin-dir` (default `/opt/cni/bin`) and CNI plugin configuration located in `--cni-conf-dir` (default `/etc/cni/net.d`).
 * `--network-plugin=kubenet` specifies that we use the `kubenet` network plugin with CNI `bridge` and `host-local` plugins placed in `/opt/cni/bin` or `network-plugin-dir`.
 * `--network-plugin-mtu=9001` specifies the MTU to use, currently only used by the `kubenet` network plugin.
@@ -129,7 +129,7 @@ We start Docker with:
 DOCKER_OPTS="--bridge=cbr0 --iptables=false --ip-masq=false"
 ```

-This bridge is created by Kubelet (controlled by the `--configure-cbr0=true`
+This bridge is created by Kubelet (controlled by the `--network-plugin=kubenet`
 flag) according to the `Node`'s `spec.podCIDR`.

 Docker will now allocate IPs from the `cbr-cidr` block.  Containers can reach