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

docs/admin/authorization.md

@@ -161,6 +161,14 @@ users:
     user:
       client-certificate: /path/to/cert.pem # cert for the webhook plugin to use
       client-key: /path/to/key.pem          # key matching the cert
+
+# kubeconfig files require a context. Provide one for the API Server.
+current-context: webhook
+contexts:
+- context:
+    cluster: name-of-remote-authz-service
+    user: name-of-api-sever
+  name: webhook
 ```
 
 ### Request Payloads

docs/admin/cluster-components.md

@@ -44,15 +44,11 @@ process.
 
 These controllers include:
 
-* Node Controller
- * Responsible for noticing & responding when nodes go down.
-* Replication Controller
- * Responsible for maintaining the correct number of pods for every replication
-   controller object in the system.
-* Endpoints Controller
- * Populates the Endpoints object (i.e., join Services & Pods).
-* Service Account & Token Controllers
- * Create default accounts and API access tokens for new namespaces.
+* Node Controller: Responsible for noticing & responding when nodes go down.
+* Replication Controller: Responsible for maintaining the correct number of pods for every replication
+  controller object in the system.
+* Endpoints Controller: Populates the Endpoints object (i.e., join Services & Pods).
+* Service Account & Token Controllers: Create default accounts and API access tokens for new namespaces.
 * ... and others.
 
 ### kube-scheduler
@@ -110,14 +106,15 @@ the Kubernetes runtime environment.
 ### kubelet
 
 [kubelet](/docs/admin/kubelet) is the primary node agent. It:
+
 * Watches for pods that have been assigned to its node (either by apiserver
   or via local configuration file) and:
- * Mounts the pod's required volumes
- * Downloads the pod's secrets
- * Run the pod's containers via docker (or, experimentally, rkt).
- * Periodically executes any requested container liveness probes.
- * Reports the status of the pod back to the rest of the system, by creating a
-   "mirror pod" if necessary.
+* Mounts the pod's required volumes
+* Downloads the pod's secrets
+* Run the pod's containers via docker (or, experimentally, rkt).
+* Periodically executes any requested container liveness probes.
+* Reports the status of the pod back to the rest of the system, by creating a
+  "mirror pod" if necessary.
 * Reports the status of the node back to the rest of the system.
 
 ### kube-proxy

docs/admin/node.md

@@ -61,8 +61,8 @@ the following conditions mean the node is in sane state:
 "conditions": [
   {
     "kind": "Ready",
-    "status": "True",
-    },
+    "status": "True"
+  }
 ]
 ```