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

…hub.io into migration-concepts-container-lifecycle-hooks

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (63 commits)
  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)
  Move Guide topic: Jobs (#2853)
  Move Guide topic: Configuration Best Practices
  Move Guide topic: Rolling Update Demo (#2850)
  Move What is Kubernetes topic. (#2851)
  Move Kubernetes API page. (#2849)
  Move Guide topic: Rolling Updates
  Concepts toc (#2840)
  Move Guide topic: Resizing a replication controller
  Move Guide topic: Replication Controller Operations
  fix link
  add back missing /
  add nginx-app.yaml file
  ...

# Conflicts:
#	_data/concepts.yml
#	docs/user-guide/images.md

_data/concepts.yml

@@ -3,54 +3,70 @@ 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
   section:
-  - docs/concepts/abstractions/overview.md
   - title: Pods
     section:
-    - docs/concepts/abstractions/pod.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
-
-- title: Storage
+- title: Containers
   section:
-  - docs/concepts/storage/volumes.md
-
+  - docs/concepts/containers/container-environment-variables.md
+  - docs/concepts/containers/container-lifecycle-hooks.md
 - title: Workloads
   section:
   - title: Pods
     section:
+    - docs/concepts/workloads/pods/pod-overview.md
     - docs/concepts/workloads/pods/pod-lifecycle.md
-  - title: Containers
+    - docs/concepts/workloads/pods/init-containers.md
+  - title: Controllers
+    section:
+    - docs/concepts/workloads/controllers/statefulset.md
+  - title: Jobs
     section:
-    - docs/concepts/workloads/containers/container-environment.md
-    - docs/concepts/workloads/containers/container-lifecycle-hooks.md
-    - docs/concepts/abstractions/init-containers.md
-    - docs/concepts/workloads/containers/images.md
+    - docs/concepts/jobs/run-to-completion-finite-workloads.md
+
+- title: Cluster Administration
+  section:
+  - 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/out-of-resource.md
+  - docs/concepts/cluster-administration/multiple-clusters.md
+  - docs/concepts/cluster-administration/federation.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
 
-- title: Clusters
+- title: Services, Load Balancing, and Networking
   section:
-  - docs/concepts/clusters/logging.md
+  - docs/concepts/services-networking/dns-pod-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

@@ -169,6 +169,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/audit.md

_data/tasks.yml

@@ -13,6 +13,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,6 +25,17 @@ 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:
@@ -34,6 +47,7 @@ toc:
   - 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
@@ -46,6 +60,18 @@ toc:
   - 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
+
+- 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>