Merge branch 'master' into 4167-no-more-calico

neolit123 · Aug 7, 2017 · b1ae771 · b1ae771
2 parents 42a0fd2 + 68a3a7e
commit b1ae771
Show file tree

Hide file tree

Showing 644 changed files with 11,389 additions and 9,489 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,8 @@
-> NOTE: Please check the “Allow edits from maintainers” box (see image below) to  
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> For 1.8 Features: set Milestone to `1.8` and Base Branch to `release-1.8`
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>
+> NOTE: Please check the “Allow edits from maintainers” box (see image below) to
 > [allow reviewers to fix problems](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) on your patch and speed up the review process.
 >
 > Please delete this note before submitting the pull request.

diff --git a/OWNERS b/OWNERS
@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - smarterclayton
 - janetkuo
 - pwittrock

diff --git a/_config.yml b/_config.yml
@@ -39,7 +39,7 @@ gems:
 # disabled gems
 #  - jekyll-redirect-from
 
-include: [_redirects]
+include: [_redirects,_headers]
 
 # SEO
 logo: /images/favicon.png

diff --git a/_includes/glossary/README.md b/_includes/glossary/README.md
@@ -0,0 +1,3 @@
+# Instructions for Glossary snippets
+
+Markdown snippets of glossary terms to be reused throughout the documentation should be placed in this directory.
diff --git a/_redirects b/_redirects
@@ -220,6 +220,11 @@
 
 /docs/whatisk8s													/docs/concepts/overview/what-is-kubernetes		301
 
+#
+# pattern matching redirects
+#
+/docs/user-guide/kubectl/kubectl_*								/docs/user-guide/kubectl/v1.7/#:splat		200
+
 #
 # redirects from /js/redirects.js
 #

diff --git a/cn/docs/concepts/overview/what-is-kubernetes.md b/cn/docs/concepts/overview/what-is-kubernetes.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - k8s-merge-robot
 
 title: 认识 Kubernetes?

diff --git a/cn/docs/getting-started-guides/centos/centos_manual_config.md b/cn/docs/getting-started-guides/centos/centos_manual_config.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - thockin
 title: CentOS
 ---

diff --git a/cn/docs/getting-started-guides/coreos/bare_metal_offline.md b/cn/docs/getting-started-guides/coreos/bare_metal_offline.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - thockin
 title: Offline
@@ -92,11 +92,11 @@ LABEL local
         LOCALBOOT 0
 ```
 
-至此，您应当已经配置好一个可用的PXELINUX环境用来运行CoreOS节点了，您可以通过在本地运行VirtualBox或者物理裸机来验证这一点。
+至此，您应当已经配置好一个可用的PXELINUX环境用来运行CoreOS节点了。您可以使用VirtualBox或者在物理裸机上对PXELINUX环境所提供的服务进行验证。
 
 ## 添加CoreOS至PXE
 
-本节将介绍如何在一个现有的PXELINUX环境上设置CoreOS镜像。
+本节描述在已有PXELINUX环境的前提下，如何配置CoreOS镜像与之并存。
 
 1. 查找或者创建TFTP根目录，后续所有步骤都将基于此目录。
     * 本文中我们假设`/tftpboot`是根目录。
@@ -199,13 +199,13 @@ subnet 10.20.30.0 netmask 255.255.255.0 {
 1. 第一种方式是将云配置文件模版化，然后通过编程的方式为不同的集群提供不同的配置。
 2. 第二种方式是运行一个服务发现协议从而可以在云环境中做服务的自动发现。
 
-在本demo中，我们仅简单地创建一个静态的单一`etcd`服务器来运行Kubernetes并提供`etcd`的主要服务。
+在本示例中，我们将通过静态方式创建一个etcd服务器，用于运行Kubernetes主控组件，并用作etcd主节点。
 
-由于我们的集群处于一个离线的环境中，所以大部分的CoreOS和Kubernetes帮助进程是受限的。为了完成部署，我们需要下载Kubernetes的各种可执行文件到本地然后再启动运行。
+由于我们的集群处于一个离线的环境中，所以大部分的CoreOS和Kubernetes帮助进程是受限的。为了完成部署，我们需要下载Kubernetes的各个可执行文件到本地然后再启动运行。
 
-一种简单的方案是在DHCP/TFTP主机上搭建一个简易的web服务器，从而环境中的CoreOS PXE机器可以从其上下载各种可执行文件。
+一种简单的方案是在DHCP/TFTP主机上搭建一个简易的web服务器，从而环境中的CoreOS PXE机器可以从其上下载各个可执行文件。
 
-为了达到这一目标，我们将启动一个`apache`服务器并提供运行Kuberetes所需要的各种可执行文件。
+为了达到这一目标，我们将启动一个`apache`服务器并提供运行Kubernetes所需要的各个可执行文件。
 
 以下脚本运行在上文中准备好的PXE服务器上：
 
@@ -705,4 +705,4 @@ IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
 Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/bare_metal_offline)              |          | Community ([@jeffbean](https://github.com/jeffbean))
 
-有关所有解决方案的支持级别信息，请参阅[解决方案列表](/docs/getting-started-guides/#table-of-solutions)。
+有关所有解决方案的支持级别信息，请参阅[解决方案列表](/docs/getting-started-guides/#table-of-solutions)。
diff --git a/cn/docs/whatisk8s.md b/cn/docs/whatisk8s.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - k8s-merge-robot
 
 title: 认识 Kubernetes?

diff --git a/css/callouts.css b/css/callouts.css
@@ -1,3 +1,4 @@
+/* Callouts */
 .caution, .note, .warning {
     padding: 20px;
     margin: 20px 0;
@@ -17,3 +18,34 @@
 .warning {
     border-left-color: #d9534f;
 }
+
+/* Feature States */
+
+.beta, .stable, .alpha, .deprecated {
+    margin-top: 20px;
+    padding: 15px;
+    background-color: #fafafa;
+    border: 1px solid transparent;
+    border-radius:4px;
+}
+
+.beta {    
+    color: #31708f;
+    border-color: #bce8f1;
+}
+
+
+.stable {    
+    color: #3c763d;
+    border-color: #d6e9c6;
+}
+
+.alpha {    
+    color: #8a6d3b;
+    border-color: #faebcc;
+}
+
+.deprecated {    
+    color: #a94442;
+    border-color: #ebccd1;
+}
diff --git a/docs/admin/OWNERS b/docs/admin/OWNERS
@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - derekwaynecarr
 - mikedanese
 
diff --git a/docs/admin/accessing-the-api.md b/docs/admin/accessing-the-api.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - bgrant0607
 - erictune
 - lavalamp

diff --git a/docs/admin/admission-controllers.md b/docs/admin/admission-controllers.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - bprashanth
 - davidopp
 - derekwaynecarr

diff --git a/docs/admin/authentication.md b/docs/admin/authentication.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - lavalamp
 - ericchiang

diff --git a/docs/admin/authorization/abac.md b/docs/admin/authorization/abac.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - lavalamp
 - deads2k
@@ -45,7 +45,7 @@ properties:
         - Wildcard: 
           - `*` matches all non-resource requests.
           - `/foo/*` matches all subpaths of `/foo/`.
-    - `readonly`, type boolean, when true, means that the policy only applies to get, list, and watch operations.
+    - `readonly`, type boolean, when true, means that the Resource-matching policy only applies to get, list, and watch operations, Non-resource-matching policy only applies to get operation.
 
 **NOTES:** An unset property is the same as a property set to the zero value for its type
 (e.g. empty string, 0, false). However, unset should be preferred for
@@ -152,4 +152,4 @@ file:
 The apiserver will need to be restarted to pickup the new policy lines.
 
 {% endcapture %}
-{% include templates/concept.md %}
+{% include templates/concept.md %}
diff --git a/docs/admin/authorization/index.md b/docs/admin/authorization/index.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - lavalamp
 - deads2k

diff --git a/docs/admin/authorization/node.md b/docs/admin/authorization/node.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - timstclair
 - deads2k
 - liggitt

diff --git a/docs/admin/authorization/rbac.md b/docs/admin/authorization/rbac.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - deads2k
 - liggitt
@@ -754,7 +754,7 @@ Here are two approaches for managing this transition:
 Run both the RBAC and ABAC authorizers, and include the legacy ABAC policy:
 
 ```
---authorization-mode=RBAC,ABAC --authorization-policy-file=mypolicy.jsonl
+--authorization-mode=RBAC,ABAC --authorization-policy-file=mypolicy.json
 ```
 
 The RBAC authorizer will attempt to authorize requests first. If it denies an API request,

diff --git a/docs/admin/authorization/webhook.md b/docs/admin/authorization/webhook.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - lavalamp
 - deads2k

diff --git a/docs/admin/bootstrap-tokens.md b/docs/admin/bootstrap-tokens.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - jbeda
 title: Authenticating with Bootstrap Tokens
 ---
@@ -127,7 +127,7 @@ commands.
 
 In addition to authentication, the tokens can be used to sign a ConfigMap.  This
 is used early in a cluster bootstrap process before the client trusts the API
-server.  The signed ConfigMap can be authenicated by the shared token.
+server.  The signed ConfigMap can be authenticated by the shared token.
 
 The ConfigMap that is signed is `cluster-info` in the `kube-public` namespace.
 The typical flow is that a client reads this ConfigMap while unauthenticated and

diff --git a/docs/admin/cluster-large.md b/docs/admin/cluster-large.md
@@ -1,17 +1,17 @@
 ---
-assignees:
+approvers:
 - davidopp
 - lavalamp
 title: Building Large Clusters
 ---
 
 ## Support
 
-At {{page.version}}, Kubernetes supports clusters with up to 1000 nodes. More specifically, we support configurations that meet *all* of the following criteria:
+At {{page.version}}, Kubernetes supports clusters with up to 5000 nodes. More specifically, we support configurations that meet *all* of the following criteria:
 
-* No more than 2000 nodes
-* No more than 60000 total pods
-* No more than 120000 total containers
+* No more than 5000 nodes
+* No more than 150000 total pods
+* No more than 300000 total containers
 * No more than 100 pods per node
 
 <br>

diff --git a/docs/admin/extensible-admission-controllers.md b/docs/admin/extensible-admission-controllers.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - smarterclayton
 - lavalamp
 - whitlockjc

diff --git a/docs/admin/federation/OWNERS b/docs/admin/federation/OWNERS
@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - madhusudancs
 - mml
 - nikhiljindal

diff --git a/docs/admin/federation/index.md b/docs/admin/federation/index.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - madhusudancs
 - mml
 - nikhiljindal

diff --git a/docs/admin/high-availability/OWNERS b/docs/admin/high-availability/OWNERS
@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - davidopp
 - lavalamp
 
diff --git a/docs/admin/kube-apiserver.md b/docs/admin/kube-apiserver.md
@@ -129,7 +129,7 @@ TaintBasedEvictions=true|false (ALPHA - default=false)
       --storage-media-type string                               The media type to use to store objects in storage. Some resources or storage backends may only support a specific media type and will ignore this setting. (default "application/vnd.kubernetes.protobuf")
       --storage-versions string                                 The per-group version to store resources in. Specified in the format "group1/version1,group2/version2,...". In the case where objects are moved from one group to the other, you may specify the format "group1=group2/v1beta1,group3/v1beta1,...". You only need to pass the groups you wish to change from the defaults. It defaults to a list of preferred versions of all registered groups, which is derived from the KUBE_API_VERSIONS environment variable. (default "admission.k8s.io/v1alpha1,admissionregistration.k8s.io/v1alpha1,apps/v1beta1,authentication.k8s.io/v1,authorization.k8s.io/v1,autoscaling/v1,batch/v1,certificates.k8s.io/v1beta1,componentconfig/v1alpha1,extensions/v1beta1,federation/v1beta1,imagepolicy.k8s.io/v1alpha1,networking.k8s.io/v1,policy/v1beta1,rbac.authorization.k8s.io/v1beta1,settings.k8s.io/v1alpha1,storage.k8s.io/v1,v1")
       --target-ram-mb int                                       Memory limit for apiserver in MB (used to configure sizes of caches, etc.)
-      --tls-ca-file string                                      If set, this certificate authority will used for secure access from Admission Controllers. This must be a valid PEM-encoded CA bundle. Altneratively, the certificate authority can be appended to the certificate provided by --tls-cert-file.
+      --tls-ca-file string                                      If set, this certificate authority will used for secure access from Admission Controllers. This must be a valid PEM-encoded CA bundle. Alternatively, the certificate authority can be appended to the certificate provided by --tls-cert-file.
       --tls-cert-file string                                    File containing the default x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If HTTPS serving is enabled, and --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to /var/run/kubernetes.
       --tls-private-key-file string                             File containing the default x509 private key matching --tls-cert-file.
       --tls-sni-cert-key namedCertKey                           A pair of x509 certificate and private key file paths, optionally suffixed with a list of domain patterns which are fully qualified domain names, possibly with prefixed wildcard segments. If no domain patterns are provided, the names of the certificate are extracted. Non-wildcard matches trump over wildcard matches, explicit domain patterns trump over extracted names. For multiple key/certificate pairs, use the --tls-sni-cert-key multiple times. Examples: "example.crt,example.key" or "foo.crt,foo.key:*.foo.com,foo.com". (default [])

diff --git a/docs/admin/kube-controller-manager.md b/docs/admin/kube-controller-manager.md
@@ -45,7 +45,7 @@ kube-controller-manager
       --concurrent-service-syncs int32                                    The number of services that are allowed to sync concurrently. Larger number = more responsive service management, but more CPU (and network) load (default 1)
       --concurrent-serviceaccount-token-syncs int32                       The number of service account token objects that are allowed to sync concurrently. Larger number = more responsive token generation, but more CPU (and network) load (default 5)
       --concurrent_rc_syncs int32                                         The number of replication controllers that are allowed to sync concurrently. Larger number = more responsive replica management, but more CPU (and network) load (default 5)
-      --configure-cloud-routes                                            Should CIDRs allocated by allocate-node-cidrs be configured on the cloud provider. (default true)
+      --configure-cloud-routes                                            Should CIDRs allocated by allocate-node-cidrs be configured on the cloud provider. If using a network overlay which will handle routing independent of the cloud provider, set this to false. (default true)
       --contention-profiling                                              Enable lock contention profiling, if profiling is enabled
       --controller-start-interval duration                                Interval between starting controller managers.
       --controllers stringSlice                                           A list of controllers to enable.  '*' enables all on-by-default controllers, 'foo' enables the controller named 'foo', '-foo' disables the controller named 'foo'.

diff --git a/docs/admin/kubeadm.md b/docs/admin/kubeadm.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - mikedanese
 - luxas
 - errordeveloper

diff --git a/docs/admin/kubelet-authentication-authorization.md b/docs/admin/kubelet-authentication-authorization.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - liggitt
 title: Kubelet authentication/authorization
 ---

diff --git a/docs/admin/kubelet-tls-bootstrapping.md b/docs/admin/kubelet-tls-bootstrapping.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - ericchiang
 - mikedanese
 - jcbsmpsn

diff --git a/docs/admin/limitrange/OWNERS b/docs/admin/limitrange/OWNERS
@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - derekwaynecarr
 - janetkuo
 
diff --git a/docs/admin/multiple-schedulers/OWNERS b/docs/admin/multiple-schedulers/OWNERS
@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - davidopp
 - madhusudancs
 
diff --git a/docs/admin/multiple-zones.md b/docs/admin/multiple-zones.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - jlowdermilk
 - justinsb
 - quinton-hoole
@@ -74,7 +74,7 @@ located in a single zone.  Users that want a highly available control
 plane should follow the [high availability](/docs/admin/high-availability) instructions.
 
 
-## Walkthough
+## Walkthrough
 
 We're now going to walk through setting up and using a multi-zone
 cluster on both GCE & AWS.  To do so, you bring up a full cluster

diff --git a/docs/admin/namespaces/OWNERS b/docs/admin/namespaces/OWNERS
@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - derekwaynecarr
 - janetkuo
 
diff --git a/docs/admin/node-conformance.md b/docs/admin/node-conformance.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - Random-Liu
 title: Validate Node Setup
 ---

diff --git a/docs/admin/ovs-networking.md b/docs/admin/ovs-networking.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - thockin
 title: Kubernetes OpenVSwitch GRE/VxLAN networking
 ---

diff --git a/docs/admin/resourcequota/OWNERS b/docs/admin/resourcequota/OWNERS
@@ -1,3 +1,3 @@
-assignees:
+approvers:
 - derekwaynecarr
 
diff --git a/docs/admin/salt.md b/docs/admin/salt.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - davidopp
 title: Configuring Kubernetes with Salt
 ---
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Instructions for Glossary snippets

		Markdown snippets of glossary terms to be reused throughout the documentation should be placed in this directory.