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

…hub.io into chenopis-weaveworks-tabs

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (258 commits)
  Fixes broken links
  Removed deleted links regarding minikube CLI
  Add missing volumetype to pv doc (#3600)
  Fix broken link in HA doc with minikube (#3599)
  rolling-update: remove link to the doc itself
  Link to 'why containers' in kubernetes-basics
  Updating Ubuntu based instructions and upgrades
  Address Issue #3577
  Added more explanation for nodeAffinity.
  Update and fix travis tests (short-term)
  Address #3433 - update Tasks landing page
  Remove redundant, out of sync table of contents
  Update Init Container link
  Update service.md
  Link to appropriate docs for Automatic Mounting of Manually Created Secrets (#3571)
  update kubectl apply doc for required resource name
  jlx426
  Updating Canal URL (#3583)
  Grammar patch to #3572
  Remove swagger-ui from search index
  ...

.gitignore

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

.travis.yml

@@ -23,6 +23,7 @@ install:
 - rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go
 - rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/sample-apiserver
 - rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/kube-aggregator
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/metrics
 - cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/
 - rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/*
 - cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/

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,7 @@ defaults:
     scope:
       path: ""
     values:
-      fullversion: "v1.6.0"
+      fullversion: "v1.6.2"
       version: "v1.6"
       githubbranch: "master"
       docsbranch: "master"
@@ -45,11 +45,10 @@ twitter:
 # Tables of contents, stored in the _data folder, that control the sidebar nav
 tocs:
   - docs-home
-  - guides
-  - tutorials
+  - setup
   - tasks
+  - tutorials
   - concepts
   - reference
-  - tools
   - samples
-  - support
+  - search

_data/concepts.yml

@@ -19,6 +19,7 @@ toc:
 - title: Containers
   section:
   - docs/concepts/containers/images.md
+  - docs/concepts/containers/container-environment-variables.md
   - docs/concepts/containers/container-lifecycle-hooks.md
 
 - title: Workloads
@@ -38,23 +39,25 @@ toc:
     - 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
+    - docs/concepts/workloads/controllers/jobs-run-to-completion.md
+    - docs/concepts/workloads/controllers/cron-jobs.md
 
 - title: Nodes
   section:
   - docs/concepts/nodes/node.md
 
 - title: Cluster Administration
   section:
+  - docs/concepts/cluster-administration/configure-etcd.md
+  - docs/concepts/cluster-administration/etcd-upgrade.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/kubelet-garbage-collection.md
   - docs/concepts/cluster-administration/cluster-management.md
   - docs/concepts/cluster-administration/multiple-clusters.md
   - docs/concepts/cluster-administration/federation.md
@@ -65,6 +68,7 @@ toc:
   - 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:

_data/docs-home.yml

@@ -10,6 +10,8 @@ toc:
 - title: Release Roadmap
   path: https://github.com/kubernetes/kubernetes/milestones/
 
+- docs/tasks/debug-application-cluster/troubleshooting.md
+
 - title: Contributing to the Kubernetes Docs
   section:
   - editdocs.md
@@ -19,5 +21,3 @@ toc:
   - 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
+- setup
 - tasks
 - tutorials
 - concepts
 - reference
-- tools
 - samples
 - support