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: (374 commits)
  Move Guide topic: ConfigMap. (#3333)
  Move Guide topic: H Pod Autoscaling Walkthrough. (#3332)
  Deprecation phase 2: kubefed. (#3331)
  Deprecation phase 2: admin/index ... (#3330)
  Deprecation phase 2: config-best-practices ... (#3328)
  Deprecation phase 2: container-environment ... (#3326)
  Deprecation phase 2: jobs (#3323)
  Deprecation phase 2: managing-deployments ... (#3309)
  Deprecation phase 2: kubectl binary_release ... (#3308)
  Improvements to kubernetes-basics/expose-intro.html (#3103)
  test/examples_test.go: validate docs/user-guide/pod-security-policy/psp.yaml (#3100)
  Move cron jobs to keep glossary in alphabetical order.
  Fix API server args
  Remove /redirects.rb (#3305)
  Move Guide topic: kubelet Garbage Collection. (#3301)
  Move Guide topic: Salt. (#3306)
  Fix tilte. (#3304)
  WIP: Cleanup /docs/contribute/ migration (#3278)
  Move Guide topic: HA Master. (#3303)
  Move Guide topic: Addons. (#3302)
  ...

# Conflicts:
#	docs/api-reference/apps/v1beta1/definitions.html
#	docs/api-reference/batch/v1/definitions.html
#	docs/concepts/containers/container-lifecycle-hooks.md

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,3 @@
+> NOTE: Please check the “Allow edits from maintainers” box below to allow 
+> reviewers fix problems on your patch and speed up the review process.
+> Please delete this note before submitting the pull request.

.gitignore

@@ -24,4 +24,3 @@ Session.vim
 tags
 
 kubernetes.github.io.iml
-_redirects

CONTRIBUTING.md

@@ -17,7 +17,7 @@ The [Kubernetes SIG Docs Discussion Group](https://groups.google.com/forum/#!for
 
 ### Style Guides and Templates
 
-Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/contribute/style-guide/) and follow the [instructions for using page templates](http://kubernetes.io/docs/contribute/page-templates/). 
+Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/home/contribute/style-guide/) and follow the [instructions for using page templates](http://kubernetes.io/docs/home/contribute/page-templates/). 
 
 
 ## Contributing to Documentation
@@ -33,4 +33,4 @@ Note that code issues should be filed against the main kubernetes repository, wh
 
 ### Submitting Documentation Pull Requests
 
-If you're fixing an issue in the existing documentation, you should submit a PR against the master branch.  Follow [these instructions to create a documentation pull request against the kubernetes.io repository](http://kubernetes.io/docs/contribute/create-pull-request/).
+If you're fixing an issue in the existing documentation, you should submit a PR against the master branch.  Follow [these instructions to create a documentation pull request against the kubernetes.io repository](http://kubernetes.io/docs/home/contribute/create-pull-request/).

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all build build-preview generate-redirects help serve
+.PHONY: all build build-preview help serve
 
 help: ## Show this help.
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
@@ -11,8 +11,5 @@ build: ## Build site with production settings and put deliverables in _site.
 build-preview: ## Build site with drafts and future posts enabled.
 	jekyll build --drafts --future
 
-generate-redirects: ## Generate a redirects file and copy it into the _site directory.
-	mkdir -p _site && REDIRECTS_PATH=_site/_redirects ruby redirects.rb
-
 serve: ## Boot the development server.
 	jekyll serve

README.md

@@ -7,11 +7,11 @@ You can click the **Fork** button in the upper-right area of the screen to creat
 For more information about contributing to the Kubernetes documentation, see:
 
 * [Contributing to the Kubernetes Documentation](http://kubernetes.io/editdocs/)
-* [Creating a Documentation Pull Request](http://kubernetes.io/docs/contribute/create-pull-request/)
-* [Writing a New Topic](http://kubernetes.io/docs/contribute/write-new-topic/)
-* [Staging Your Documentation Changes](http://kubernetes.io/docs/contribute/stage-documentation-changes/)
-* [Using Page Templates](http://kubernetes.io/docs/contribute/page-templates/)
-* [Documentation Style Guide](http://kubernetes.io/docs/contribute/style-guide/)
+* [Creating a Documentation Pull Request](http://kubernetes.io/docs/home/contribute/create-pull-request/)
+* [Writing a New Topic](http://kubernetes.io/docs/home/contribute/write-new-topic/)
+* [Staging Your Documentation Changes](http://kubernetes.io/docs/home/contribute/stage-documentation-changes/)
+* [Using Page Templates](http://kubernetes.io/docs/home/contribute/page-templates/)
+* [Documentation Style Guide](http://kubernetes.io/docs/home/contribute/style-guide/)
 
 ## Thank you!
 

_config.yml

@@ -17,7 +17,8 @@ defaults:
     scope:
       path: ""
     values:
-      version: "v1.5.1"
+      fullversion: "v1.6.0"
+      version: "v1.6"
       githubbranch: "master"
       docsbranch: "master"
   -
@@ -45,10 +46,11 @@ twitter:
 tocs:
   - docs-home
   - guides
+  - setup
   - tutorials
   - tasks
   - concepts
   - reference
-  - tools
   - samples
   - support
+  - search

_data/concepts.yml

@@ -10,6 +10,8 @@ toc:
   - title: Working with Kubernetes Objects
     section:
     - docs/concepts/overview/working-with-objects/kubernetes-objects.md
+    - docs/concepts/overview/working-with-objects/names.md
+    - docs/concepts/overview/working-with-objects/namespaces.md
     - docs/concepts/overview/working-with-objects/labels.md
     - docs/concepts/overview/working-with-objects/annotations.md
   - docs/concepts/overview/kubernetes-api.md
@@ -25,17 +27,26 @@ toc:
   - title: Pods
     section:
     - docs/concepts/workloads/pods/pod-overview.md
+    - docs/concepts/workloads/pods/pod.md
     - docs/concepts/workloads/pods/pod-lifecycle.md
     - docs/concepts/workloads/pods/init-containers.md
   - title: Controllers
     section:
+    - docs/concepts/workloads/controllers/replicaset.md
+    - docs/concepts/workloads/controllers/replicationcontroller.md
+    - docs/concepts/workloads/controllers/deployment.md
     - docs/concepts/workloads/controllers/statefulset.md
     - docs/concepts/workloads/controllers/petset.md
+    - docs/concepts/workloads/controllers/daemonset.md
     - docs/concepts/workloads/controllers/garbage-collection.md
   - title: Jobs
     section:
     - docs/concepts/jobs/run-to-completion-finite-workloads.md
 
+- title: Nodes
+  section:
+  - docs/concepts/nodes/node.md
+
 - title: Cluster Administration
   section:
   - docs/concepts/cluster-administration/manage-deployment.md
@@ -45,6 +56,8 @@ toc:
   - 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/kubelet-garbage-collection.md
+  - docs/concepts/cluster-administration/cluster-management.md
   - docs/concepts/cluster-administration/multiple-clusters.md
   - docs/concepts/cluster-administration/federation.md
   - docs/concepts/cluster-administration/federation-service-discovery.md
@@ -53,23 +66,37 @@ toc:
   - docs/concepts/cluster-administration/sysctl-cluster.md
   - docs/concepts/cluster-administration/access-cluster.md
   - docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig.md
+  - docs/concepts/cluster-administration/master-node-communication.md
+  - docs/concepts/cluster-administration/addons.md
 
 - title: Storage
   section:
   - docs/concepts/storage/volumes.md
+  - docs/concepts/storage/persistent-volumes.md
 
 - title: Services, Load Balancing, and Networking
   section:
+  - docs/concepts/services-networking/service.md
   - docs/concepts/services-networking/dns-pod-service.md
   - docs/concepts/services-networking/connect-applications-service.md
+  - docs/concepts/services-networking/ingress.md
+  - docs/concepts/services-networking/networkpolicies.md
 
 - title: Configuration
   section:
   - docs/concepts/configuration/overview.md
   - docs/concepts/configuration/container-command-args.md
   - docs/concepts/configuration/manage-compute-resources-container.md
+  - docs/concepts/configuration/assign-pod-node.md
+  - docs/concepts/configuration/secret.md
 
 - title: Policies
   section:
   - docs/concepts/policy/container-capabilities.md
   - docs/concepts/policy/resource-quotas.md
+  - docs/concepts/policy/security-context.md
+  - docs/concepts/policy/pod-security-policy.md
+
+- title: Ecosystem
+  section:
+  - docs/concepts/ecosystem/thirdpartyresource.md

_data/docs-home.yml

@@ -1,4 +1,23 @@
-bigheader: "Kubernetes Documentation"
+bigheader: "Documentation Home"
 abstract: "Documentation for using and learning about Kubernetes."
 toc:
-- docs/index.md
+- docs/home/index.md
+
+- docs/home/index.md
+
+- title: Release Notes
+  path: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md
+- title: Release Roadmap
+  path: https://github.com/kubernetes/kubernetes/milestones/
+
+- title: Contributing to the Kubernetes Docs
+  section:
+  - editdocs.md
+  - docs/home/contribute/create-pull-request.md
+  - docs/home/contribute/write-new-topic.md
+  - docs/home/contribute/stage-documentation-changes.md
+  - docs/home/contribute/page-templates.md
+  - docs/home/contribute/review-issues.md
+  - docs/home/contribute/style-guide.md
+
+

_data/globals.yml

@@ -1,10 +1,10 @@
 tocs:
 - docs-home
 - guides
-- tutorials
+- setup
 - tasks
+- tutorials
 - concepts
 - reference
-- tools
 - samples
 - support