Merge branch 'master' of https://github.com/kubernetes/kubernetes.git…

…hub.io into release-1.8 * 'master' of https://github.com/kubernetes/kubernetes.github.io: Add noindex to vnext-staging Add note for 1.8 release. (#4632) fix create-cluster-kubeadm docs Update aws.md add newline above kube-apiserver Update scheduling-gpus.md Fix spacing with shell commands Documenting another (potential) callout issue (#4604) Update reference docs with most recent version of brodocs (#4600) Update kubernetes-api.md fix spelling mistake fix typos in fedration docs fix kubelet garbage collected typo fix typo in network-policies.md fix typo Add /_includes/glossary directory for snippets (#4628) Fixed typo in getting started guide using minikube Update to include Python library (#4624) Rename OWNERS assignees: to approvers:
kubernetes · Aug 4, 2017 · 6eac0e8 · 6eac0e8
2 parents d601263 + 3a4246c
commit 6eac0e8
Show file tree

Hide file tree

Showing 617 changed files with 11,064 additions and 9,321 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/_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/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
@@ -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/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
@@ -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

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
 ---

diff --git a/docs/admin/cluster-large.md b/docs/admin/cluster-large.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - davidopp
 - lavalamp
 title: Building Large Clusters

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/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
 ---

diff --git a/docs/admin/service-accounts-admin.md b/docs/admin/service-accounts-admin.md
@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - bprashanth
 - davidopp
 - lavalamp

diff --git a/docs/api-reference/v1.7/brodoc.js b/docs/api-reference/v1.7/brodoc.js
@@ -153,7 +153,7 @@ function generateNestedNav(parent, nest) {
 
 function generateNavJson(data) {
     var navJson = JSON.stringify(data);
-    navScript = `(function(){navData = ${navJson}})();`;
+    navScript = `(function(){navData = ${navJson};})();`;
     fs.writeFile('./navData.js', navScript, function(err) {
         if (err) {
             return console.log(err);

diff --git a/docs/api-reference/v1.7/index.html b/docs/api-reference/v1.7/index.html
diff --git a/docs/api-reference/v1.7/navData.js b/docs/api-reference/v1.7/navData.js
diff --git a/docs/api-reference/v1.7/node_modules/ejs/Jakefile b/docs/api-reference/v1.7/node_modules/ejs/Jakefile
diff --git a/docs/api-reference/v1.7/node_modules/ejs/README.md b/docs/api-reference/v1.7/node_modules/ejs/README.md