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

…hub.io into release-1.6

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (62 commits)
  Move Guide topic: Admin Guide
  Move Guide topic: Resource Monitoring. (#2895)
  Move Guide topic: Service. (#2891)
  Move Guide topic: Connecting Apps with Services. (#2885)
  Move Guide topic: Federation Service Discovery. (#2884)
  Move Guide topic: Config Provider Firewalls. (#2883)
  Move Guide topic: Kubeconfig File
  Move Accessing Clusters topic to Concepts. (#2875)
  Move Guide topic: Sharing Clusters
  Move Guide topic: Prereqs
  Move Garbage Collection topic. (#2874)
  Move PetSets topic. (#2873)
  Move Guide topic: Pod Templates (#2872)
  Move StatefulSets topic. (#2869)
  Rename /docs/tasks/job/work-queue-1/
  Move Guide topic: Fine Parallel Processing using a Work Queue (#2870)
  Move Guide topic: Coarse Parallel Processing Using a Work Queue
  Move Init Containers topic. (#2866)
  Move Guide topic: Parallel Processing using Expansions (#2867)
  Move Pod overview. (#2865)
  ...

# Conflicts:
#	docs/api.md
#	docs/user-guide/jobs.md

_data/concepts.yml

@@ -3,45 +3,63 @@ abstract: "Detailed explanations of Kubernetes system concepts and abstractions.
 toc:
 - docs/concepts/index.md
 
-- title: Kubectl Command Line
+- title: Overview
   section:
-  - docs/concepts/tools/kubectl/object-management-overview.md
-  - docs/concepts/tools/kubectl/object-management-using-imperative-commands.md
-  - docs/concepts/tools/kubectl/object-management-using-imperative-config.md
-  - docs/concepts/tools/kubectl/object-management-using-declarative-config.md
+  - docs/concepts/overview/what-is-kubernetes.md
+  - docs/concepts/overview/components.md
+  - title: Working with Kubernetes Objects
+    section:
+    - docs/concepts/overview/working-with-objects/kubernetes-objects.md
+    - docs/concepts/overview/working-with-objects/labels.md
+    - docs/concepts/overview/working-with-objects/annotations.md
+  - docs/concepts/overview/kubernetes-api.md
 
-- title: Kubernetes Objects
+- title: Workloads
   section:
-  - docs/concepts/abstractions/overview.md
   - title: Pods
     section:
-    - docs/concepts/abstractions/pod.md
-    - docs/concepts/abstractions/init-containers.md
+    - docs/concepts/workloads/pods/pod-overview.md
+    - docs/concepts/workloads/pods/pod-lifecycle.md
+    - docs/concepts/workloads/pods/init-containers.md
   - title: Controllers
     section:
-    - docs/concepts/abstractions/controllers/statefulsets.md
-    - docs/concepts/abstractions/controllers/petsets.md
-    - docs/concepts/abstractions/controllers/garbage-collection.md
-
-- title: Object Metadata
-  section:
-  - docs/concepts/object-metadata/annotations.md
+    - docs/concepts/workloads/controllers/statefulset.md
+    - docs/concepts/workloads/controllers/petset.md
+    - docs/concepts/workloads/controllers/garbage-collection.md
+  - title: Jobs
+    section:
+    - docs/concepts/jobs/run-to-completion-finite-workloads.md
 
-- title: Workloads
+- title: Cluster Administration
   section:
-  - title: Pods
-    section:
-    - docs/concepts/workloads/pods/pod-lifecycle.md
+  - docs/concepts/cluster-administration/manage-deployment.md
+  - docs/concepts/cluster-administration/networking.md
+  - docs/concepts/cluster-administration/network-plugins.md
+  - docs/concepts/cluster-administration/logging.md
+  - docs/concepts/cluster-administration/audit.md
+  - docs/concepts/cluster-administration/resource-usage-monitoring.md
+  - docs/concepts/cluster-administration/out-of-resource.md
+  - docs/concepts/cluster-administration/multiple-clusters.md
+  - docs/concepts/cluster-administration/federation.md
+  - docs/concepts/cluster-administration/federation-service-discovery.md
+  - docs/concepts/cluster-administration/guaranteed-scheduling-critical-addon-pods.md
+  - docs/concepts/cluster-administration/static-pod.md
+  - docs/concepts/cluster-administration/sysctl-cluster.md
+  - docs/concepts/cluster-administration/access-cluster.md
+  - docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig.md
 
-- title: Clusters
+- title: Services, Load Balancing, and Networking
   section:
-  - docs/concepts/clusters/logging.md
+  - docs/concepts/services-networking/dns-pod-service.md
+  - docs/concepts/services-networking/connect-applications-service.md
 
 - title: Configuration
   section:
+  - docs/concepts/configuration/overview.md
   - docs/concepts/configuration/container-command-args.md
   - docs/concepts/configuration/manage-compute-resources-container.md
 
 - title: Policies
   section:
   - docs/concepts/policy/container-capabilities.md
+  - docs/concepts/policy/resource-quotas.md

_data/guides.yml

@@ -170,6 +170,7 @@ toc:
   section:
   - docs/admin/index.md
   - docs/admin/cluster-management.md
+  - docs/admin/upgrade-1-6.md
   - docs/admin/kubeadm.md
   - docs/admin/addons.md
   - docs/admin/node-allocatable.md

_data/tasks.yml

@@ -5,6 +5,7 @@ toc:
 
 - title: Using the kubectl Command-Line
   section:
+  - docs/tasks/kubectl/install.md
   - docs/tasks/kubectl/list-all-running-container-images.md
   - docs/tasks/kubectl/get-shell-running-container.md
 
@@ -13,6 +14,8 @@ toc:
   - docs/tasks/configure-pod-container/define-environment-variable-container.md
   - docs/tasks/configure-pod-container/define-command-argument-container.md
   - docs/tasks/configure-pod-container/assign-cpu-ram-container.md
+  - docs/tasks/configure-pod-container/limit-range.md
+  - docs/tasks/configure-pod-container/apply-resource-quota-limit.md
   - docs/tasks/configure-pod-container/configure-volume-storage.md
   - docs/tasks/configure-pod-container/configure-persistent-volume-storage.md
   - docs/tasks/configure-pod-container/environment-variable-expose-pod-information.md
@@ -23,17 +26,31 @@ toc:
   - docs/tasks/configure-pod-container/communicate-containers-same-pod.md
   - docs/tasks/configure-pod-container/configure-pod-initialization.md
   - docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md
+  - docs/tasks/configure-pod-container/configure-pod-disruption-budget.md
+
+- title: Running Applications
+  section:
+  - docs/tasks/run-application/rolling-update-replication-controller.md
+
+- title: Running Jobs
+  section:
+  - docs/tasks/job/parallel-processing-expansion.md
+  - docs/tasks/job/coarse-parallel-processing-work-queue/index.md
+  - docs/tasks/job/fine-parallel-processing-work-queue/index.md
 
 - title: Accessing Applications in a Cluster
   section:
   - docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
   - docs/tasks/access-application-cluster/load-balance-access-application-cluster.md
+  - docs/tasks/access-application-cluster/create-external-load-balancer.md
+  - docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md
 
 - title: Monitoring, Logging, and Debugging
   section:
   - docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
   - docs/tasks/debug-application-cluster/debug-init-containers.md
   - docs/tasks/debug-application-cluster/logging-stackdriver.md
+  - docs/tasks/debug-application-cluster/monitor-node-health.md
   - docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md
 
 - title: Accessing the Kubernetes API
@@ -42,10 +59,24 @@ toc:
 
 - title: Administering a Cluster
   section:
+  - docs/tasks/administer-cluster/overview.md
   - docs/tasks/administer-cluster/assign-pods-nodes.md
   - docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
   - docs/tasks/administer-cluster/safely-drain-node.md
   - docs/tasks/administer-cluster/change-pv-reclaim-policy.md
+  - docs/tasks/administer-cluster/limit-storage-consumption.md
+  - docs/tasks/administer-cluster/share-configuration.md
+
+- title: Administering Federation
+  section:
+  - docs/tasks/administer-federation/configmap.md
+  - docs/tasks/administer-federation/daemonset.md
+  - docs/tasks/administer-federation/deployment.md
+  - docs/tasks/administer-federation/events.md
+  - docs/tasks/administer-federation/ingress.md
+  - docs/tasks/administer-federation/namespaces.md
+  - docs/tasks/administer-federation/replicaset.md
+  - docs/tasks/administer-federation/secret.md
 
 - title: Managing Stateful Applications
   section:

_data/tutorials.yml

@@ -32,11 +32,18 @@ toc:
 - title: Online Training Course
   path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615
 - docs/tutorials/stateless-application/hello-minikube.md
+- title: Object Management Using kubectl
+  section:
+  - docs/tutorials/object-management-kubectl/object-management.md
+  - docs/tutorials/object-management-kubectl/imperative-object-management-command.md
+  - docs/tutorials/object-management-kubectl/imperative-object-management-configuration.md
+  - docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md
 - title: Stateless Applications
   section:
   - docs/tutorials/stateless-application/run-stateless-application-deployment.md
   - docs/tutorials/stateless-application/expose-external-ip-address-service.md
   - docs/tutorials/stateless-application/expose-external-ip-address.md
+  - docs/tutorials/stateless-application/run-stateless-ap-replication-controller.md
 - title: Stateful Applications
   section:
   - docs/tutorials/stateful-application/basic-stateful-set.md
@@ -46,6 +53,12 @@ toc:
 - title: Connecting Applications
   section:
   - docs/tutorials/connecting-apps/connecting-frontend-backend.md
+- title: Clusters
+  section:
+  - docs/tutorials/clusters/apparmor.md
 - title: Services
   section:
   - docs/tutorials/services/source-ip.md
+- title: Federated Cluster Administration
+  section:
+  - docs/tutorials/federation/set-up-cluster-federation-kubefed.md

_includes/user-guide-migration-notice.md

@@ -0,0 +1,12 @@
+
+
+<table style="background-color:#eeeeee">
+<tr>
+  <td>
+  <p><b>NOTICE</b></p>
+  <p>As of March 14, 2017, the <a href="https://github.com/orgs/kubernetes/teams/sig-docs-maintainers">@kubernetes/sig-docs-maintainers</a> have begun migration of the User Guide content as announced previously to the <a href="https://github.com/kubernetes/community/tree/master/sig-docs">SIG Docs community</a> through the <a href="https://groups.google.com/forum/#!forum/kubernetes-sig-docs">kubernetes-sig-docs</a> group and <a href="https://kubernetes.slack.com/messages/sig-docs/">kubernetes.slack.com #sig-docs</a> channel.</p>
+  <p>The user guides within this section are being refactored into topics within Tutorials, Tasks, and Concepts. Anything that has been moved will have a notice placed in its previous location as well as a link to its new location. The reorganization implements the table of contents (ToC) outlined in the <a href="https://docs.google.com/a/google.com/document/d/18hRCIorVarExB2eBVHTUR6eEJ2VVk5xq1iBmkQv8O6I/edit?usp=sharing">kubernetes-docs-toc</a> document and should improve the documentation's findability and readability for a wider range of audiences.</p>
+  <p>For any questions, please contact: <a href="mailto:kubernetes-sig-docs@googlegroups.com">kubernetes-sig-docs@googlegroups.com</a></p>
+  </td>
+</tr>
+</table>

_sass/_base.sass

@@ -1280,14 +1280,22 @@ $feature-box-div-margin-bottom: 40px
 				background-color: $white
 				box-shadow: 0 5px 5px rgba(0,0,0,.24),0 0 5px rgba(0,0,0,.12)
 
-		#calendarWrapper
+		#calendarMeetings
 			position: relative
 			width: 80vw
 			height: 60vw
 			max-width: 1200px
 			max-height: 900px
 			margin: 20px auto
 
+		#calendarEvents
+			position: relative
+			width: 80vw
+			height: 30vw
+			max-width: 1200px
+			max-height: 450px
+			margin: 20px auto			
+
 		iframe
 			position: absolute
 			border: 0

community/index.html

@@ -30,14 +30,14 @@ <h3>Special Interest Groups (SIGs)</h3>
 
 			<p>As a member of the Kubernetes community, you are welcome to join any of the SIG meetings
 				you are interested in. No registration required.</p>
-			<div id="calendarWrapper">
+			<div id="calendarMeetings">
 				<iframe src="https://calendar.google.com/calendar/embed?src=cgnt364vd8s86hr2phapfjc6uk%40group.calendar.google.com&ctz=America/Los_Angeles"
 				        frameborder="0" scrolling="no"></iframe>
 			</div>
 		</div>
 		<div class="content">
 			<h3>Events</h3>
-			<div id="calendarWrapper">
+			<div id="calendarEvents">
 				<iframe src="https://calendar.google.com/calendar/embed?src=nt2tcnbtbied3l6gi2h29slvc0%40group.calendar.google.com&ctz=America/Los_Angeles"
 				        frameborder="0" scrolling="no"></iframe>
 			</div>

docs/admin/admission-controllers.md

@@ -101,7 +101,7 @@ ImagePolicyWebhook uses the admission config file `--admission-controller-config
 }
 ```
 
-The config file must reference a [kubeconfig](/docs/user-guide/kubeconfig-file/) formatted file which sets up the connection to the backend. It is required that the backend communicate over TLS.
+The config file must reference a [kubeconfig](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/) formatted file which sets up the connection to the backend. It is required that the backend communicate over TLS.
 
 The kubeconfig file's cluster field must point to the remote service, and the user field must contain the returned authorizer.
 
@@ -120,7 +120,7 @@ users:
     client-certificate: /path/to/cert.pem # cert for the webhook plugin to use
     client-key: /path/to/key.pem          # key matching the cert
 ```
-For additional HTTP configuration, refer to the [kubeconfig](/docs/user-guide/kubeconfig-file/) documentation.
+For additional HTTP configuration, refer to the [kubeconfig](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/) documentation.
 
 #### Request Payloads