Merge branch 'master' into release-1.9

Merge pull request #6588 from ivange94/replica-set
Add glossory entry for ReplicaSet
2017-12-15 13:11:00 -06:00 · 2017-12-14 13:23:34 -05:00 · 2017-12-14 09:39:56 -08:00 · 2017-12-14 11:21:31 -06:00 · 2017-12-14 00:57:38 -06:00 · 2017-12-13 17:59:27 -08:00
3954 changed files with 793689 additions and 147120 deletions
@@ -0,0 +1,11 @@
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> For 1.9 Features: set Milestone to `1.9` and Base Branch to `release-1.9`
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> NOTE: Please check the “Allow edits from maintainers” box (see image below) to
+> [allow reviewers to fix problems](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) on your patch and speed up the review process.
+>
+> Please delete this note before submitting the pull request.
+>
+> NOTE: After opening the PR, please *un-check and re-check* the "Allow edits from maintainers" box. This is a temporary workaround to address a known issue with GitHub.
+
+![Allow edits from maintainers checkbox](https://help.github.com/assets/images/help/pull_requests/allow-maintainers-to-make-edits-sidebar-checkbox.png)
@@ -5,3 +5,22 @@ _site/**
 .sass-cache/**
 CNAME
 .travis.yml
+.idea/
+
+# Vim ignore
+# source: https://github.com/github/gitignore/blob/master/Global/Vim.gitignore
+
+# swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+kubernetes.github.io.iml
@@ -1,16 +1,20 @@
 language: go
 go:
-  - 1.6.2
+  - 1.8.3

 # Don't want default ./... here:
 install:
 - export PATH=$GOPATH/bin:$PATH
 - mkdir -p $HOME/gopath/src/k8s.io
- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/kubernetes.github.io
- go get -t -v k8s.io/kubernetes.github.io/test
- git clone --depth=50 --branch=master https://github.com/kubernetes/md-check $HOME/gopath/src/k8s.io/md-check
- go get -t -v k8s.io/md-check
+- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/website
+
+# (1) Fetch dependencies for us to run the tests in test/examples_test.go
+- go get -t -v k8s.io/website/test
+
+# Simplified deduplication of dependencies.
+- cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/
+- rm -r $GOPATH/src/k8s.io/kubernetes/vendor/

 script:
- go test -v k8s.io/kubernetes.github.io/test
- $GOPATH/bin/md-check --root-dir=$HOME/gopath/src/k8s.io/kubernetes.github.io
+- go test -v k8s.io/website/test
+- ./verify-docs-format.sh
@@ -3,6 +3,7 @@ layout: docwithnav
 title: 404 Error!
 permalink: /404.html
 no_canonical: true
+sitemap: false
 ---

 <script src="/js/redirects.js"></script>
@@ -1,2 +0,0 @@
-kubernetes.io
-kubernet.es
@@ -9,7 +9,7 @@ These are just guidelines, not rules. Use your best judgment, and feel free to p

 ### Code of Conduct

-Kubernetes follows the [Cloud Native Computing Foundation (CNCF) Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to Sarah Novotny [sarahnovotny@google.com](mailto:sarahnovotny@google.com) and/or Dan Kohn [dan@linuxfoundation.org](mailto:dan@linuxfoundation.org). 
+Kubernetes follows the [Cloud Native Computing Foundation (CNCF) Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to Sarah Novotny [sarahnovotny@google.com](mailto:sarahnovotny@google.com) and/or Dan Kohn [dan@linuxfoundation.org](mailto:dan@linuxfoundation.org).

 ### Documentation and Site Decisions

@@ -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
@@ -26,11 +26,11 @@ Before submitting a pull request to create new content, please review the [Kuber

 Kubernetes.io uses github issues to track documentation issues and requests. If you see a documentation issue, submit an issue using the following steps:

-1. Check the [kubernetes.io issues list](https://github.com/kubernetes/kubernetes.github.io/issues) as you might find out the issue is a duplicate. 
-2. Use the [included template for every new issue](https://github.com/kubernetes/kubernetes.github.io/issues/new).  When you create a bug report, include as many details as possible and include suggested fixes to the issue. 
+1. Check the [kubernetes.io issues list](https://github.com/kubernetes/website/issues) as you might find out the issue is a duplicate.
+2. Use the [included template for every new issue](https://github.com/kubernetes/website/issues/new).  When you create a bug report, include as many details as possible and include suggested fixes to the issue.

-Note that code issues should be filed against the main kubernetes repository, while documentation issues should go in the kubernetes.io repository. 
+Note that code issues should be filed against the main kubernetes repository, while documentation issues should go in the kubernetes.io repository.

 ### 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/).
@@ -1,20 +1,53 @@
 source "https://rubygems.org"

-gem "jekyll", "3.2.1"
-gem "jekyll-sass-converter", "1.3.0"
-gem "minima", "1.1.0"
-gem "kramdown", "1.11.1"
-gem "liquid", "3.0.6"
-gem "rouge", "1.11.1"
-gem "jemoji", "0.7.0"
-gem "jekyll-mentions", "1.2.0"
-gem "jekyll-redirect-from", "0.11.0"
-gem "jekyll-sitemap", "0.10.0"
-gem "jekyll-feed", "0.5.1"
-gem "jekyll-gist", "1.4.0"
-gem "jekyll-paginate", "1.1.0"
-gem "jekyll-coffeescript", "1.0.1"
-gem "jekyll-seo-tag", "2.0.0"
-gem "jekyll-github-metadata", "2.0.2"
-gem "listen", "3.0.6"
-gem "activesupport", "4.2.7"
+# gem "github-pages", group: :jekyll_plugins
+
+gem "jekyll", "3.6.0"
+
+group :github_pages_compatible do
+    gem "json", "~> 1.7", ">= 1.7.7"
+    gem "coffee-script", "~> 2.4"
+    gem "coffee-script-source", "~> 1.12"
+    gem "ethon", "~> 0.10"
+    gem "execjs", "~> 2.7"
+    gem "minima", "~> 2.0"
+    gem "terminal-table", "~> 1.4"
+    gem "unicode-display_width", "~> 1.1"
+end
+
+group :jekyll_plugins do
+   gem "jekyll-feed", "~> 0.6"
+   gem "jekyll-sitemap"
+   gem "jekyll-gist"
+   gem "jekyll-paginate", "1.1.0"
+   gem "jekyll-seo-tag"
+   gem "jekyll-avatar", "~> 0.4"
+   gem "jekyll-coffeescript", "~> 1.0"
+   gem "jekyll-default-layout", "~> 0.1"
+   gem "jekyll-github-metadata", "~> 2.2"
+   gem "jekyll-optional-front-matter", "~> 0.1"
+   gem "jekyll-readme-index", "0.0.3"
+   gem "jekyll-redirect-from", "~> 0.11"
+   gem "jekyll-relative-links", "~> 0.2"
+   gem "jekyll-swiss", "~> 0.4"
+   gem "jekyll-theme-architect", "0.0.3"
+   gem "jekyll-theme-cayman", "0.0.3"
+   gem "jekyll-theme-dinky", "0.0.3"
+   gem "jekyll-theme-hacker", "0.0.3"
+   gem "jekyll-theme-leap-day", "0.0.3"
+   gem "jekyll-theme-merlot", "0.0.3"
+   gem "jekyll-theme-midnight", "0.0.3"
+   gem "jekyll-theme-minimal", "0.0.3"
+   gem "jekyll-theme-modernist", "0.0.3"
+   gem "jekyll-theme-primer", "~> 0.1"
+   gem "jekyll-theme-slate", "0.0.3"
+   gem "jekyll-theme-tactile", "0.0.3"
+   gem "jekyll-theme-time-machine", "0.0.3"
+   gem "jekyll-titles-from-headings", "~> 0.1"
+end
+
+gem "jekyll-include-cache", "~> 0.1"
+
+gem "kramdown", "~> 1.11"
+gem "rouge", "~> 2.0"
+gem "pry"
@@ -1,119 +1,176 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (4.2.7)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    coderay (1.1.2)
    coffee-script (2.4.1)
      coffee-script-source
      execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
    colorator (1.1.0)
+    ethon (0.11.0)
+      ffi (>= 1.3.0)
    execjs (2.7.0)
-    faraday (0.9.2)
+    faraday (0.13.1)
      multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.18)
    forwardable-extended (2.6.0)
-    gemoji (2.1.0)
-    html-pipeline (2.4.2)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
-    i18n (0.7.0)
-    jekyll (3.2.1)
+    jekyll (3.6.0)
+      addressable (~> 2.4)
      colorator (~> 1.0)
      jekyll-sass-converter (~> 1.0)
      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
-      liquid (~> 3.0)
+      kramdown (~> 1.14)
+      liquid (~> 4.0)
      mercenary (~> 0.3.3)
      pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (>= 1.7, < 3)
      safe_yaml (~> 1.0)
+    jekyll-avatar (0.5.0)
+      jekyll (~> 3.0)
    jekyll-coffeescript (1.0.1)
      coffee-script (~> 2.2)
-    jekyll-feed (0.5.1)
-    jekyll-gist (1.4.0)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.9.2)
+      jekyll (~> 3.3)
+    jekyll-gist (1.4.1)
      octokit (~> 4.2)
-    jekyll-github-metadata (2.0.2)
+    jekyll-github-metadata (2.9.3)
      jekyll (~> 3.1)
-      octokit (~> 4.0)
-    jekyll-mentions (1.2.0)
-      activesupport (~> 4.0)
-      html-pipeline (~> 2.3)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-include-cache (0.1.0)
+      jekyll (~> 3.3)
+    jekyll-optional-front-matter (0.3.0)
      jekyll (~> 3.0)
    jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.11.0)
-      jekyll (>= 2.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-seo-tag (2.0.0)
-      jekyll (~> 3.1)
-    jekyll-sitemap (0.10.0)
+    jekyll-readme-index (0.0.3)
+      jekyll (~> 3.0)
+    jekyll-redirect-from (0.12.1)
+      jekyll (~> 3.3)
+    jekyll-relative-links (0.5.1)
+      jekyll (~> 3.3)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
+    jekyll-seo-tag (2.3.0)
+      jekyll (~> 3.3)
+    jekyll-sitemap (1.1.1)
+      jekyll (~> 3.3)
+    jekyll-swiss (0.4.0)
+    jekyll-theme-architect (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-cayman (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-dinky (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-hacker (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-leap-day (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-merlot (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-midnight (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-minimal (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-modernist (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-primer (0.5.2)
+      jekyll (~> 3.5)
+      jekyll-github-metadata (~> 2.9)
+      jekyll-seo-tag (~> 2.2)
+    jekyll-theme-slate (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-tactile (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-time-machine (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.5.0)
+      jekyll (~> 3.3)
    jekyll-watch (1.5.0)
      listen (~> 3.0, < 3.1)
-    jemoji (0.7.0)
-      activesupport (~> 4.0)
-      gemoji (~> 2.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0)
-    json (1.8.3)
-    kramdown (1.11.1)
-    liquid (3.0.6)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    json (1.8.6)
+    kramdown (1.15.0)
+    liquid (4.0.0)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
    mercenary (0.3.6)
-    mini_portile2 (2.1.0)
-    minima (1.1.0)
-    minitest (5.9.0)
+    method_source (0.9.0)
+    minima (2.1.1)
+      jekyll (~> 3.3)
    multipart-post (2.0.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    octokit (4.3.0)
-      sawyer (~> 0.7.0, >= 0.5.3)
-    pathutil (0.14.0)
+    octokit (4.7.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pathutil (0.16.0)
      forwardable-extended (~> 2.6)
-    pkg-config (1.1.7)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rouge (1.11.1)
+    pry (0.11.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rouge (2.2.1)
    safe_yaml (1.0.4)
-    sass (3.4.22)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    sass (3.5.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.3.0)

 PLATFORMS
  ruby

 DEPENDENCIES
-  activesupport (= 4.2.7)
-  jekyll (= 3.2.1)
-  jekyll-coffeescript (= 1.0.1)
-  jekyll-feed (= 0.5.1)
-  jekyll-gist (= 1.4.0)
-  jekyll-github-metadata (= 2.0.2)
-  jekyll-mentions (= 1.2.0)
+  coffee-script (~> 2.4)
+  coffee-script-source (~> 1.12)
+  ethon (~> 0.10)
+  execjs (~> 2.7)
+  jekyll (= 3.6.0)
+  jekyll-avatar (~> 0.4)
+  jekyll-coffeescript (~> 1.0)
+  jekyll-default-layout (~> 0.1)
+  jekyll-feed (~> 0.6)
+  jekyll-gist
+  jekyll-github-metadata (~> 2.2)
+  jekyll-include-cache (~> 0.1)
+  jekyll-optional-front-matter (~> 0.1)
  jekyll-paginate (= 1.1.0)
-  jekyll-redirect-from (= 0.11.0)
-  jekyll-sass-converter (= 1.3.0)
-  jekyll-seo-tag (= 2.0.0)
-  jekyll-sitemap (= 0.10.0)
-  jemoji (= 0.7.0)
-  kramdown (= 1.11.1)
-  liquid (= 3.0.6)
-  listen (= 3.0.6)
-  minima (= 1.1.0)
-  rouge (= 1.11.1)
+  jekyll-readme-index (= 0.0.3)
+  jekyll-redirect-from (~> 0.11)
+  jekyll-relative-links (~> 0.2)
+  jekyll-seo-tag
+  jekyll-sitemap
+  jekyll-swiss (~> 0.4)
+  jekyll-theme-architect (= 0.0.3)
+  jekyll-theme-cayman (= 0.0.3)
+  jekyll-theme-dinky (= 0.0.3)
+  jekyll-theme-hacker (= 0.0.3)
+  jekyll-theme-leap-day (= 0.0.3)
+  jekyll-theme-merlot (= 0.0.3)
+  jekyll-theme-midnight (= 0.0.3)
+  jekyll-theme-minimal (= 0.0.3)
+  jekyll-theme-modernist (= 0.0.3)
+  jekyll-theme-primer (~> 0.1)
+  jekyll-theme-slate (= 0.0.3)
+  jekyll-theme-tactile (= 0.0.3)
+  jekyll-theme-time-machine (= 0.0.3)
+  jekyll-titles-from-headings (~> 0.1)
+  json (~> 1.7, >= 1.7.7)
+  kramdown (~> 1.11)
+  minima (~> 2.0)
+  pry
+  rouge (~> 2.0)
+  terminal-table (~> 1.4)
+  unicode-display_width (~> 1.1)

 BUNDLED WITH
-   1.11.2
+   1.15.4
@@ -378,7 +378,7 @@ Section 8 -- Interpretation.
 Creative Commons is not a party to its public
 licenses. Notwithstanding, Creative Commons may elect to apply one of
 its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
+will be considered the "Licensor." The text of the Creative Commons
 public licenses is dedicated to the public domain under the CC0 Public
 Domain Dedication. Except for the limited purpose of indicating that
 material is shared under a Creative Commons public license or as
@@ -1,4 +1,4 @@
-.PONY: all build build-preview 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)
@@ -6,10 +6,13 @@ help: ## Show this help.
 all: build ## Build site with production settings and put deliverables in _site.

 build: ## Build site with production settings and put deliverables in _site.
-	jekyll build
+	bundle exec jekyll build

 build-preview: ## Build site with drafts and future posts enabled.
-	jekyll build --drafts --future
+	bundle exec jekyll build --drafts --future

 serve: ## Boot the development server.
-	jekyll serve
+	bundle exec jekyll serve
+
+stage: ## Run the Jekyll staging container.
+	docker run -ti --rm -v "${PWD}":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.1
@@ -1,7 +1,6 @@
-assignees:
- lavalamp
- smarterclayton
- janetkuo
- pwittrock
- kelseyhightower
- jaredbhatti
+reviewers:
+- a-mccarthy
+- abiogenesis-now
+- bradamant3
+- steveperry-53
+- zacharysarah
@@ -1,182 +1,22 @@
-## Instructions for Contributing to the Docs/Website
+## Instructions for Contributing to the Kubernetes Documentation

-Welcome! We are very pleased you want to contribute to the documentation and/or website for Kubernetes.
+Welcome! We are very pleased you want to contribute to the Kubernetes documentation.

-You can click the "Fork" button in the upper-right area of the screen to create a copy of our site on your GitHub account called a "fork." Make any changes you want in your fork, and when you are ready to send those changes to us, go to the index page for your fork and click "New Pull Request" to let us know about it.
+You can click the **Fork** button in the upper-right area of the screen to create a copy of this repository in your GitHub account called a *fork*. Make any changes you want in your fork, and when you are ready to send those changes to us, go to your fork and create a new pull request to let us know about it.
+
+Once your pull request is created, a Kubernetes reviewer will take responsibility for providing clear, actionable feedback.  As the owner of the pull request, **it is your responsibility to modify your pull request to address the feedback that has been provided to you by the Kubernetes reviewer.**  Also note that you may end up having more than one Kubernetes reviewer provide you feedback or you may end up getting feedback from a Kubernetes reviewer that is different than the one originally assigned to provide you feedback. Furthermore, in some cases, one of your reviewers might ask for a technical review from a [Kubernetes tech reviewer](https://github.com/kubernetes/website/wiki/Tech-reviewers) when needed.  Reviewers will do their best to provide feedback in a timely fashion but response time can vary based on circumstances.

 For more information about contributing to the Kubernetes documentation, see:

-* [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/)
-
-## Automatic Staging for Pull Requests
-
-When you create a pull request (either against master or the upcoming release), your changes are staged in a custom subdomain on Netlify so that you can see your changes in rendered form before the PR is merged. You can use this to verify that everything is correct before the PR gets merged. To view your changes:
-
- Scroll down to the PR's list of Automated Checks
- Click "Show All Checks"
- Look for "deploy/netlify"; you'll see "Deploy Preview Ready!" if staging was successful
- Click "Details" to bring up the staged site and navigate to your changes
-
-## Branch structure and staging
-
-The current version of the website is served out of the `master` branch. To make changes to the live docs, such as bug fixes, broken links, typos, etc, **target your pull request to the master branch**
-
-The `release-1.x` branch stores changes for **upcoming releases of Kubernetes**. For example, the `release-1.5` branch has changes for the 1.5 release. These changes target branches (and *not* master) to avoid publishing documentation updates prior to the release for which they're relevant. If you have a change for an upcoming release of Kubernetes, **target your pull request to the appropriate release branch**.
-
-The staging site for the next upcoming Kubernetes release is here: [http://kubernetes-io-vnext-staging.netlify.com/](http://kubernetes-io-vnext-staging.netlify.com/). The staging site reflects the current state of what's been merged in the release branch, or in other words, what the docs will look like for the next upcoming release. It's automatically updated as new PRs get merged.
-
-## Staging the site locally (using Docker)
-
-Don't like installing stuff? Download and run a local staging server with a single `docker run` command.
-
-    git clone https://github.com/kubernetes/kubernetes.github.io.git
-    cd kubernetes.github.io
-    docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.0
-
-Then visit [http://localhost:4000](http://localhost:4000) to see our site. Any changes you make on your local machine will be automatically staged.
-
-If you're interested you can view [the Dockerfile for this image](https://github.com/kubernetes/kubernetes.github.io/blob/master/staging-container/Dockerfile).
-
-## Staging the site locally (from scratch setup)
-
-The below commands to setup your environment for running GitHub pages locally. Then, any edits you make will be viewable
-on a lightweight webserver that runs on your local machine.
-
-This will typically be the fastest way (by far) to iterate on docs changes and see them staged, once you get this set up, but it does involve several install steps that take awhile to complete, and makes system-wide modifications.
-
-Install Ruby 2.2 or higher. If you're on Linux, run these commands:
-
-    apt-get install software-properties-common
-    apt-add-repository ppa:brightbox/ruby-ng
-    apt-get install ruby2.2
-    apt-get install ruby2.2-dev
-
-* If you're on a Mac, follow [these instructions](https://gorails.com/setup/osx/).
-* If you're on a Windows machine you can use the [Ruby Installer](http://rubyinstaller.org/downloads/). During the installation make sure to check the option for *Add Ruby executables to your PATH*.
-
-The remainder of the steps should work the same across operating systems.
-
-To confirm you've installed Ruby correctly, at the command prompt run `gem --version` and you should get a response with your version number. Likewise you can confirm you have Git installed properly by running `git --version`, which will respond with your version of Git.
-
-Install the GitHub Pages package, which includes Jekyll:
-
-	gem install github-pages
-
-Clone our site:
-
-	git clone https://github.com/kubernetes/kubernetes.github.io.git
-
-Make any changes you want. Then, to see your changes locally:
-
-	cd kubernetes.github.io
-	jekyll serve
-
-Your copy of the site will then be viewable at: [http://localhost:4000](http://localhost:4000)
-(or wherever Jekyll tells you).
-
-## GitHub help
-
-If you're a bit rusty with git/GitHub, you might want to read
-[this](http://readwrite.com/2013/10/02/github-for-beginners-part-2) for a refresher.
-
-## Common Tasks
-
-### Edit Page Titles or Change the Left Navigation
-
-Edit the yaml files in `/_data/` for the Guides, Reference, Samples, or Support areas.
-
-You may have to exit and `jekyll clean` before restarting the `jekyll serve` to
-get changes to files in `/_data/` to show up.
-
-### Add Images
-
-Put the new image in `/images/docs/` if it's for the documentation, and just `/images/` if it's for the website.
-
-**For diagrams, we greatly prefer SVG files!**
-
-### Include code from another file
-
-To include a file that is hosted on this GitHub repo, insert this code:
-
-<pre>&#123;% include code.html language="&lt;LEXERVALUE&gt;" file="&lt;RELATIVEPATH&gt;" ghlink="&lt;PATHFROMROOT&gt;" %&#125;</pre>
-
-* `LEXERVALUE`: The language in which the file was written; must be [a value supported by Rouge](https://github.com/jneen/rouge/wiki/list-of-supported-languages-and-lexers).
-* `RELATIVEPATH`: The path to the file you're including, relative to the current file.
-* `PATHFROMROOT`: The path to the file relative to root, e.g. `/docs/admin/foo.yaml`
-
-To include a file that is hosted in the external, main Kubernetes repo, make sure it's added to [/update-imported-docs.sh](https://github.com/kubernetes/kubernetes.github.io/blob/master/update-imported-docs.sh), and run it so that the file gets downloaded, then enter:
-
-<pre>&#123;% include code.html language="&lt;LEXERVALUE&gt;" file="&lt;RELATIVEPATH&gt;" k8slink="&lt;PATHFROMK8SROOT&gt;" %&#125;</pre>
-
-* `PATHFROMK8SROOT`: The path to the file relative to the root of [the Kubernetes repo](https://github.com/kubernetes/kubernetes/tree/release-1.2), e.g. `/examples/rbd/foo.yaml`
-
-## Using tabs for multi-language examples
-
-By specifying some inline CSV in a varable called `tabspec`, you can include a file
-called `tabs.html` that generates tabs showing code examples in multiple langauges.
-
-<pre>&#123;% capture tabspec %&#125;servicesample
-JSON,json,service-sample.json,/docs/user-guide/services/service-sample.json
-YAML,yaml,service-sample.yaml,/docs/user-guide/services/service-sample.yaml&#123;% endcapture %&#125;
-&#123;% include tabs.html %&#125;</pre>
-
-In English, this would read: "Create a set of tabs with the alias `servicesample`,
-and have tabs visually labeled "JSON" and "YAML" that use `json` and `yaml` Rouge syntax highlighting, which display the contents of
-`service-sample.{extension}` on the page, and link to the file in GitHub at (full path)."
-
-Example file: [Pods: Multi-Container](http://kubernetes.io/docs/user-guide/pods/multi-container/).
-
-## Use a global variable
-
-The `/_config.yml` file defines some useful variables you can use when editing docs.
-
-* `page.githubbranch`: The name of the GitHub branch on the Kubernetes repo that is associated with this branch of the docs. e.g. `release-1.2`
-* `page.version` The version of Kubernetes associated with this branch of the docs. e.g. `v1.2`
-* `page.docsbranch` The name of the GitHub branch on the Docs/Website repo that you are currently using. e.g. `release-1.1` or `master`
-
-This keeps the docs you're editing aligned with the Kubernetes version you're talking about. For example, if you define a link like so, you'll never have to worry about it going stale in future doc branches:
-
-<pre>View the README [here](http://releases.k8s.io/&#123;&#123;page.githubbranch&#125;&#125;/cluster/addons/README.md).</pre>
-
-That, of course, will send users to:
-
-[http://releases.k8s.io/release-1.2/cluster/addons/README.md](http://releases.k8s.io/release-1.2/cluster/addons/README.md)
-
-(Or whatever Kubernetes release that docs branch is associated with.)
-
-## Config yaml guidelines
-
-Guidelines for config yamls that are included in the site docs. These
-are the yaml or json files that contain Kubernetes object
-configuration to be used with `kubectl create -f` Config yamls should
-be:
-
-* Separate deployable files, not embedded in the document, unless very
-  small variations of a full config.
-* Included in the doc with the include code
-  [above.](#include-code-from-another-file)
-* In the same directory as the doc that they are being used in
-  * If you are re-using a yaml from another doc, that is OK, just
-    leave it there, don't move it up to a higher level directory.
-* Tested in
-  [test/examples_test.go](https://github.com/kubernetes/kubernetes.github.io/blob/master/test/examples_test.go)
-* Follows
-  [best practices.](http://kubernetes.io/docs/user-guide/config-best-practices/)
-
-Don't assume the reader has this repository checked out, use `kubectl
-create -f https://github...` in example commands. For Docker images
-used in config yamls, try to use an image from an existing Kubernetes
-example. If creating an image for a doc, follow the
-[example guidelines](https://github.com/kubernetes/kubernetes/blob/master/examples/guidelines.md#throughout)
-section on "Docker images" from the Kubernetes repository.
-
-## Partners
-Kubernetes partners refers to the companies who contribute to the Kubernetes core codebase, extend their platform to support Kubernetes or provide managed services to users centered around the Kubernetes platform. Partners can get their services and offerings added to the [partner page](https://k8s.io/partners) by completing and submitting the [partner request form](https://goo.gl/qcSnZF). Once the information and assets are verified, the partner product/services will be listed in the partner page. This would typically take 7-10 days.
+* [Contributing to the Kubernetes Documentation](http://kubernetes.io/editdocs/)
+* [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/)
+* [Review Issues](http://kubernetes.io/docs/home/contribute/review-issues/)
+* [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!

-Kubernetes thrives on community participation and we really appreciate your
+Kubernetes thrives on community participation, and we really appreciate your
 contributions to our site and our documentation!
@@ -1,11 +1,13 @@
 name: Kubernetes
+title: Kubernetes
+url: https://kubernetes.io
+description: Production-Grade Container Orchestration
 markdown: kramdown
 kramdown:
  input: GFM
  html_to_native: true
  hard_wrap: false
  syntax_highlighter: rouge
-baseurl: /
 incremental: true

 safe: false
@@ -16,9 +18,39 @@ defaults:
    scope:
      path: ""
    values:
-      version: "v1.3"
+      fullversion: "v1.9.0"
+      version: "v1.9"
      githubbranch: "master"
      docsbranch: "master"
+      versions:
+        - fullversion: "v1.9.0"
+          version: "v1.9"
+          githubbranch: "v1.9.0"
+          docsbranch: "release-1.9"
+          url: https://kubernetes.io/docs/home/
+        - fullversion: "v1.8.4"
+          version: "v1.8"
+          githubbranch: "v1.8.4"
+          docsbranch: "release-1.8"
+          url: https://v1-8.docs.kubernetes.io/docs/home/
+        - fullversion: "v1.7.6"
+          version: "v1.7"
+          githubbranch: "v1.7.6"
+          docsbranch: "release-1.7"
+          url: https://v1-7.docs.kubernetes.io/docs/home/
+        - fullversion: "v1.6.8"
+          version: "v1.6"
+          githubbranch: "v1.6.8"
+          docsbranch: "release-1.6"
+          url: https://v1-6.docs.kubernetes.io/docs/home/
+        - fullversion: "v1.5.7"
+          version: "v1.5"
+          githubbranch: "v1.5.7"
+          docsbranch: "release-1.5"
+          url: https://v1-5.docs.kubernetes.io/docs/
+      deprecated: false
+      currentUrl: https://kubernetes.io/docs/home/
+      nextUrl: http://kubernetes-io-vnext-staging.netlify.com/
  -
    scope:
      path: "docs"
@@ -28,5 +60,31 @@ defaults:

 permalink: pretty

-gems:
-  - jekyll-redirect-from
+plugins:
+  - jekyll-feed
+  - jekyll-sitemap
+  - jekyll-seo-tag
+  - jekyll-include-cache
+# disabled gems
+#  - jekyll-redirect-from
+
+include: [_redirects,_headers]
+
+# SEO
+logo: /images/favicon.png
+twitter:
+  username: kubernetesio
+
+# empty array for tabs
+emptyArray: []
+
+# Tables of contents, stored in the _data folder, that control the sidebar nav
+tocs:
+  - docs-home
+  - setup
+  - tasks
+  - tutorials
+  - concepts
+  - reference
+  - samples
+  - search
@@ -0,0 +1,3 @@
+id: architecture
+name: Architecture
+description: The inner components of Kubernetes.
@@ -0,0 +1,3 @@
+id: community
+name: Community
+description: Related to Kubernetes open-source development.
@@ -0,0 +1,3 @@
+id: core-object
+name: Core Object
+description: A resource type that Kubernetes supports by default.
@@ -0,0 +1,3 @@
+id: extension
+name: Extension
+description: Supported customizations of Kubernetes.
@@ -0,0 +1,3 @@
+id: fundamental
+name: Fundamental
+description: Relevant for a first-time user of Kubernetes.
@@ -0,0 +1,3 @@
+id: networking
+name: Networking
+description: How Kubernetes components talk to each other (and to programs outside the cluster).
@@ -0,0 +1,3 @@
+id: operation
+name: Operation
+description: Starting and maintaining Kubernetes.
@@ -0,0 +1,3 @@
+id: security
+name: Security
+description: Keeping Kubernetes applications safe and secure.
@@ -0,0 +1,3 @@
+id: storage
+name: Storage
+description: How Kubernetes applications handle persistent data.
@@ -0,0 +1,3 @@
+id: tool
+name: Tool
+description: Software that makes Kubernetes easier or better to use.
@@ -0,0 +1,3 @@
+id: user-type
+name: User Type
+description: Represents a common type of Kubernetes user.
@@ -0,0 +1,3 @@
+id: workload
+name: Workload
+description: Applications running on Kubernetes.
@@ -1,9 +1,114 @@
 bigheader: "Concepts"
 abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
 toc:
- title: Concepts
-  path: /docs/concepts/
- title: Object Metadata
+- docs/concepts/index.md
+
+- title: Overview
  section:
-  - title: Annotations
-    path: /docs/concepts/object-metadata/annotations/
+  - 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/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
+
+- title: Kubernetes Architecture
+  section:
+  - docs/concepts/architecture/nodes.md
+  - docs/concepts/architecture/master-node-communication.md
+  - docs/concepts/architecture/cloud-controller.md
+
+- title: Extending Kubernetes
+  section:
+  - docs/concepts/overview/extending.md
+  - title: Extending the Kubernetes API
+    section:
+    - docs/concepts/api-extension/apiserver-aggregation.md
+    - docs/concepts/api-extension/custom-resources.md
+  - title: Compute, Storage, and Networking Extensions
+    section:
+    - docs/concepts/cluster-administration/network-plugins.md
+    - docs/concepts/cluster-administration/device-plugins.md
+    - docs/concepts/cluster-administration/sysctl-cluster.md
+  - docs/concepts/service-catalog/index.md
+
+- title: Containers
+  section:
+  - docs/concepts/containers/images.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.md
+    - docs/concepts/workloads/pods/pod-lifecycle.md
+    - docs/concepts/workloads/pods/init-containers.md
+    - docs/concepts/workloads/pods/podpreset.md
+    - docs/concepts/workloads/pods/disruptions.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/daemonset.md
+    - docs/concepts/workloads/controllers/garbage-collection.md
+    - docs/concepts/workloads/controllers/jobs-run-to-completion.md
+    - docs/concepts/workloads/controllers/cron-jobs.md
+
+- title: Configuration
+  section:
+  - docs/concepts/configuration/overview.md
+  - docs/concepts/configuration/manage-compute-resources-container.md
+  - docs/concepts/configuration/assign-pod-node.md
+  - docs/concepts/configuration/taint-and-toleration.md
+  - docs/concepts/configuration/secret.md
+  - docs/concepts/configuration/organize-cluster-access-kubeconfig.md
+  - docs/concepts/configuration/pod-priority-preemption.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/network-policies.md
+  - docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md
+
+- title: Storage
+  section:
+  - docs/concepts/storage/volumes.md
+  - docs/concepts/storage/persistent-volumes.md
+  - docs/concepts/storage/storage-classes.md
+  - docs/concepts/storage/dynamic-provisioning.md
+
+- title: Cluster Administration
+  section:
+  - docs/concepts/cluster-administration/cluster-administration-overview.md
+  - docs/concepts/cluster-administration/certificates.md
+  - docs/concepts/cluster-administration/cloud-providers.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/kubelet-garbage-collection.md
+  - docs/concepts/cluster-administration/federation.md
+  - docs/concepts/cluster-administration/sysctl-cluster.md
+  - docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig.md
+  - docs/concepts/cluster-administration/master-node-communication.md
+  - docs/concepts/cluster-administration/proxies.md
+  - docs/concepts/cluster-administration/controller-metrics.md
+  - docs/concepts/cluster-administration/device-plugins.md
+  - title: Policies
+    section:
+    - docs/concepts/policy/resource-quotas.md
+    - docs/concepts/policy/pod-security-policy.md
+
+
@@ -1,5 +1,22 @@
-bigheader: "Kubernetes Documentation"
+bigheader: "Documentation Home"
 abstract: "Documentation for using and learning about Kubernetes."
 toc:
- title: Kubernetes Documentation
-  path: /docs/
+- docs/home/index.md
+
+- title: Release Notes
+  path: https://git.k8s.io/kubernetes/CHANGELOG.md
+- 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
+  - 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
+  - docs/home/contribute/includes.md
@@ -1,10 +1,10 @@
 tocs:
 - docs-home
 - guides
- tutorials
+- setup
 - tasks
+- tutorials
 - concepts
 - reference
- tools
 - samples
 - support
@@ -0,0 +1,27 @@
+id: _example
+name: Example K8s Term
+full-link: kubernetes.io/docs/link-to-long-dedicated-docs-page
+aka:
+- Slang K8s Term
+- Misnomer
+- Formerly Known as Prince
+related:
+- id-of-less-fancy-k8s-term
+- id-of-tangential-term
+- id-of-commonly-used-with-term
+tags:
+- Some Tag
+short-description: >
+  Required.
+  Markdown allowed (e.g. for cross-linking).
+  One or two lines that provide a minimum definition.
+  Do not repeat the term.
+  Prefer fragments.
+  End with a period.
+long-description: >
+  Optional.
+  Markdown allowed.
+  Longer additional text to appear after (in conjunction with) short description.
+  Provide where the short description is not sufficient as the intro paragraph to a topic.
+  Write complete but concise sentences.
+  **See /_includes/templates/glossary/README.md for the official style guide.**
@@ -0,0 +1,9 @@
+id: annotation
+name: Annotation
+full-link: docs/concepts/overview/working-with-objects/annotations
+tags:
+- fundamental
+short-description: >
+  A key-value pair that is used to attach arbitrary non-identifying metadata to objects.
+long-description: >
+  The metadata in an annotation can be small or large, structured or unstructured, and can include characters not permitted by labels. Clients such as tools and libraries can retrieve this metadata.
@@ -0,0 +1,11 @@
+id: application-architect
+name: Application Architect
+related:
+  - application-developer
+tags:
+  - user-type
+short-description: >
+  A person responsible for the high-level design of an application.
+long-description: >
+  An architect ensures that an app's implementation allows it to interact with its surrounding components in a scalable, maintainable way.
+  Surrounding components include databases, logging infrastructure, and other microservices.
@@ -0,0 +1,11 @@
+id: application-developer
+name: Application Developer
+related:
+  - application-architect
+tags:
+  - user-type
+short-description: >
+  A person who writes an application that runs in a Kubernetes cluster.
+long-description: >
+  An application developer focuses on one part of an application.
+  The scale of their focus may vary significantly in size.
@@ -0,0 +1,10 @@
+id: approver
+name: Approver
+tags:
+- community
+short-description: >
+  A person who can review and approve Kubernetes code contributions.
+long-description: >
+  While code review is focused on code quality and correctness, approval is focused on the holistic acceptance of a contribution.
+  Holistic acceptance includes backwards/forwards compatibility, adhering to API and flag conventions, subtle performance and correctness issues, interactions with other parts of the system, and others.
+  Approver status is scoped to a part of the codebase.
@@ -0,0 +1,9 @@
+id: cla
+name: CLA (Contributor License Agreement)
+full-link: https://github.com/kubernetes/community/blob/master/CLA.md
+tags:
+- community
+short-description: >
+  Terms under which a {% glossary_tooltip text="contributor" term_id="contributor" %} grants a license to an open source project for their contributions.
+long-description: >
+  CLAs help resolve legal disputes involving contributed material and intellectual property (IP).
@@ -0,0 +1,11 @@
+id: cluster-architect
+name: Cluster Architect
+related:
+  - cluster
+  - cluster-operator
+tags:
+  - user-type
+short-description: >
+  A person who designs infrastructure that involves one or more Kubernetes clusters.
+long-description: >
+  Cluster architects are concerned with best practices for distributed systems, for example&#58; high availability and security.
@@ -0,0 +1,15 @@
+id: cluster-operator
+name: Cluster Operator
+aka:
+  - Cluster Administrator
+related:
+  - cluster
+  - cluster-architect
+tags:
+  - user-type
+short-description: >
+  A person who configures, controls, and monitors clusters.
+long-description: |
+  Their primary responsibility is keeping a cluster up and running, which may involve periodic maintenance activities or upgrades.<br>
+
+  **NOTE:** Cluster operators are different from the [Operator pattern](https://coreos.com/operators) that extends the Kubernetes API.
@@ -0,0 +1,9 @@
+id: cluster
+name: Cluster
+tags:
+- fundamental
+- operation
+short-description: >
+  A set of machines, called nodes, that run containerized applications managed by Kubernetes.
+long-description: >
+  A cluster has several worker nodes and at least one master node.
@@ -0,0 +1,11 @@
+id: code-contributor
+name: Code Contributor
+aka:
+  - Community Developer
+tags:
+- community
+- user-type
+short-description: >
+  A person who develops and contributes code to the Kubernetes open source codebase.
+long-description: >
+  They are also an active {% glossary_tooltip text="community member" term_id="member" %} who participates in one or more {% glossary_tooltip text="Special Interest Groups (SIGs)" term_id="sig" %}.
@@ -0,0 +1,13 @@
+id: configmap
+name: ConfigMap
+full-link: /docs/tasks/configure-pod-container/configmap/
+related:
+- pod
+- secret
+tags:
+- core-object
+short-description: >
+  An API object used to store non-confidential data in key-value pairs. Can be consumed as environment variables, command-line arguments, or config files in a {% glossary_tooltip text="volume" term_id="volume" %}.
+long-description: >
+  Allows you to decouple environment-specific configuration from your {% glossary_tooltip text="container images" term_id="container" %}, so that your applications are easily portable.
+  When storing confidential data use a [Secret](https://kubernetes.io/docs/concepts/configuration/secret/).
@@ -0,0 +1,10 @@
+id: container
+name: Container
+full-link: /docs/concepts/overview/what-is-kubernetes/#why-containers
+tags:
+- fundamental
+- workload
+short-description: >
+  A lightweight and portable executable image that contains software and all of its dependencies.
+long-description: >
+  Containers decouple applications from underlying host infrastructure to make deployment easier in different cloud or OS environments, and for easier scaling.
@@ -0,0 +1,8 @@
+id: contributor
+name: Contributor
+tags:
+- community
+short-description: >
+  Someone who donates code, documentation, or their time to help the Kubernetes project or community.
+long-description: >
+  Contributions include pull requests (PRs), issues, feedback, {% glossary_tooltip text="special interest groups (SIG)" term_id="sig" %} participation, or organizing community events.
@@ -0,0 +1,10 @@
+id: cronjob
+name: CronJob
+full-link: /docs/concepts/workloads/controllers/cron-jobs/
+tags:
+- core-object
+- workload
+short-description: >
+  Manages a [Job](/docs/concepts/workloads/controllers/jobs-run-to-completion/) that runs on a periodic schedule.
+long-description: >
+  Similar to a line in a *crontab* file, a Cronjob object specifies a schedule using the [Cron](https://en.wikipedia.org/wiki/Cron) format.
@@ -0,0 +1,10 @@
+id: daemonset
+name: DaemonSet
+full-link: /docs/concepts/workloads/controllers/daemonset
+tags:
+- fundamental
+- workload
+short-description: >
+  Ensures a copy of a {% glossary_tooltip term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip term_id="cluster" %}.
+long-description: >
+  Used to deploy system daemons such as log collectors and monitoring agents that typically must run on every {% glossary_tooltip term_id="node" %}.
@@ -0,0 +1,11 @@
+id: deployment
+name: Deployment
+full-link: /docs/concepts/workloads/controllers/deployment/
+tags:
+- fundamental
+- core-object
+- workload
+short-description: >
+  An API object that manages a replicated application.
+long-description: >
+  Each replica is represented by a {% glossary_tooltip term_id="pod" %}, and the Pods are distributed among the nodes of a cluster.
@@ -0,0 +1,11 @@
+id: developer
+name: Developer (disambiguation)
+aka:
+  - Kubernetes Developer
+tags:
+- community
+- user-type
+short-description: >
+  May refer to&#58; {% glossary_tooltip text="Application Developer" term_id="application-developer" %}, {% glossary_tooltip text="Code Contributor" term_id="code-contributor" %}, or {% glossary_tooltip text="Platform Developer" term_id="platform-developer" %}.
+long-description: >
+  This overloaded term may have different meanings depending on the context
@@ -0,0 +1,11 @@
+id: downstream
+name: Downstream (disambiguation)
+related:
+- upstream
+tags:
+- community
+short-description: >
+  May refer to: code in the Kubernetes ecosystem that depends upon the core Kubernetes codebase or a forked repo.
+long-description: |
+  * In the **Kubernetes Community**: Conversations often use *downstream* to mean the ecosystem, code, or third-party tools that rely on the core Kubernetes codebase. For example, a new feature in Kubernetes may be adopted by applications *downstream* to improve their functionality.
+  * In **GitHub** or **git**: The convention is to refer to a forked repo as *downstream*, whereas the source repo is considered *upstream*.
@@ -0,0 +1,10 @@
+id: helm-chart
+name: Helm Chart
+full-link: https://github.com/kubernetes/helm/blob/master/docs/charts.md
+tags:
+- tool
+short-description: >
+  A package of pre-configured Kubernetes resources that can be managed with the Helm tool.
+long-description: |
+  Charts provide a reproducible way of creating and sharing Kubernetes applications.
+  A single chart can be used to deploy something simple, like a memcached Pod, or something complex, like a full web app stack with HTTP servers, databases, caches, and so on.
@@ -0,0 +1,15 @@
+id: horizontal-pod-autoscaler
+name: Horizontal Pod Autoscaler
+full-link: /docs/tasks/run-application/horizontal-pod-autoscale/
+aka:
+- HPA
+related:
+- pod
+tags:
+- operation
+short-description: >
+  An API resource that automatically scales the number of pod replicas based on targeted CPU
+  utilization or custom metric targets.
+long-description: >
+  HPA is typically used with replication controllers, deployments or replica sets and cannot be
+  applied to objects that cannot be scaled, for example DaemonSets.  
@@ -0,0 +1,9 @@
+id: image
+name: Image
+tags:
+- fundamental
+short-description: >
+  Stored instance of a container that holds a set of software needed to run an application.
+long-description: >
+  A way of packaging software that allows it to be stored in a container registry, pulled to a local system, and run as an application. Meta data is included in the image that can indicate what executable to run, who built it, and other information.
+
@@ -0,0 +1,13 @@
+id: ingress
+name: Ingress
+full-link: /docs/concepts/services-networking/ingress/
+aka:
+  - Ingress controller
+tags:
+- networking
+- architecture
+- extension
+short-description: >
+  An API object that manages external access to the services in a cluster, typically HTTP.
+long-description: >
+  Ingress can provide load balancing, SSL termination and name-based virtual hosting.
@@ -0,0 +1,13 @@
+id: istio
+name: Istio
+full-link: https://istio.io/docs/concepts/what-is-istio/overview.html
+tags:
+- networking
+- architecture
+- extension
+short-description: >
+  An open platform (not Kubernetes-specific) that provides a uniform way to integrate microservices, manage traffic flow, enforce policies, and aggregate telemetry data.
+long-description: >
+  Adding Istio does not require changing application code.
+  It is a layer of infrastructure between a service and the network, which when combined with service deployments, is commonly referred to as a service mesh.
+  Istio's control plane abstracts away the underlying cluster management platform, which may be Kubernetes, Mesosphere, etc.
@@ -0,0 +1,9 @@
+id: job
+name: Job
+full-link: /docs/concepts/workloads/controllers/jobs-run-to-completion
+tags:
+- core-object
+short-description: >
+  A finite or batch task that runs to completion.
+long-description: >
+  Creates one or more {% glossary_tooltip term_id="pod" %} objects and ensures that a specified number of them successfully terminate. As Pods successfully complete, the Job tracks the successful completions.
@@ -0,0 +1,19 @@
+id: kops
+name: Kops
+full-link: /docs/getting-started-guides/kops/
+tags:
+- tool
+- operation
+short-description: >
+  A CLI tool that helps you create, destroy, upgrade and maintain production-grade, highly available, Kubernetes clusters. *NOTE&#58; Officially supports AWS only, with GCE and VMware vSphere in alpha*.
+long-description: |
+  `kops` provisions your cluster with&#58;
+
+    * Fully automated installation
+    * DNS-based cluster identification
+    * Self-healing&#58; everything runs in Auto-Scaling Groups
+    * Limited OS support (Debian preferred, Ubuntu 16.04 supported, early support for CentOS & RHEL)
+    * High availability (HA) support
+    * The ability to directly provision, or generate terraform manifests
+
+  You can also build your own cluster using {% glossary_tooltip term_id="kubeadm" %} as a building block. `kops` builds on the kubeadm work.
@@ -0,0 +1,10 @@
+id: kubeadm
+name: Kubeadm
+full-link: /docs/admin/kubeadm/
+tags:
+- tool
+- operation
+short-description: >
+  A tool for quickly installing Kubernetes and setting up a secure cluster.
+long-description: >
+  You can use kubeadm to install both the control plane and the worker node components.
@@ -0,0 +1,10 @@
+id: kubectl
+name: Kubectl
+full-link: /docs/user-guide/kubectl-overview/
+tags:
+- tool
+- fundamental
+short-description: >
+  A command line tool for communicating with a {% glossary_tooltip text="Kubernetes API" term_id="kubernetes-api" %} server.
+long-description: >
+  You can use kubectl to create, inspect, update, and delete Kubernetes objects.
@@ -0,0 +1,10 @@
+id: kubelet
+name: Kubelet
+full-link: docs/reference/generated/kubelet
+tags:
+- fundamental
+- core-object
+short-description: >
+  An agent that runs on each node in the cluster. It makes sure that containers are running in a pod.
+long-description: >
+  The kubelet takes a set of PodSpecs that are provided through various mechanisms and ensures that the containers described in those PodSpecs are running and healthy. The kubelet doesn’t manage containers which were not created by Kubernetes.
@@ -0,0 +1,13 @@
+id: kubernetes-api
+name: Kubernetes API
+full-link: /docs/concepts/overview/kubernetes-api/
+tags:
+- fundamental
+- architecture
+short-description: >
+  The application that serves Kubernetes functionality through a RESTful interface and stores the state of the cluster.
+long-description: >
+  Kubernetes resources and "records of intent" are all stored as API objects, and modified via RESTful calls to the API.
+  The API allows configuration to be managed in a declarative way.
+  Users can interact with the Kubernetes API directly, or via tools like `kubectl`.
+  The core Kubernetes API is flexible and can also be extended to support custom resources.
@@ -0,0 +1,9 @@
+id: labels
+name: Labels
+full-link: /docs/concepts/overview/working-with-objects/labels
+tags:
+- fundamental
+short-description: >
+  Used to tag objects with identifying attributes that are meaningful and relevant to users.
+long-description: >
+  Labels are key/value pairs that are attached to objects, such as pods. They can be used to organize and to select subsets of objects.
@@ -0,0 +1,8 @@
+id: maintainer
+name: Maintainer
+tags:
+- community
+short-description: >
+  A highly experienced {% glossary_tooltip text="contributor" term_id="contributor" %}, active in multiple areas of Kubernetes, who has cross-area ownership and write access to a project's GitHub repository.
+long-description: >
+  Maintainers work holistically across the project to maintain its health and success and have made substantial contributions, both through code development and broader organizational efforts.
@@ -0,0 +1,9 @@
+id: managed-service
+name: Managed Service
+tags:
+- extension
+short-description: >
+  A software offering maintained by a third-party provider.
+long-description: >
+  Some examples of Managed Services are AWS EC2, Azure SQL Database, and GCP Pub/Sub, but they can be any software offering that can be used by an application.
+  [Service Catalog](/docs/concepts/service-catalog/) provides a way to list, provision, and bind with Managed Services offered by {% glossary_tooltip text="Service Brokers" term_id="service-broker" %}.
@@ -0,0 +1,10 @@
+id: member
+name: Member
+tags:
+- community
+short-description: >
+  A continuously active {% glossary_tooltip text="contributor" term_id="contributor" %} in the K8s community.
+long-description: >
+  Members can have issues and PRs assigned to them and participate in {% glossary_tooltip text="special interest groups (SIGs)" term_id="sig" %} through GitHub teams.
+  Pre-submit tests are automatically run for members' PRs.
+  A member is expected to remain an active contributor to the community.
@@ -0,0 +1,10 @@
+id: minikube
+name: Minikube
+full-link: /docs/getting-started-guides/minikube/
+tags:
+- fundamental
+- tool
+short-description: >
+  A tool for running Kubernetes locally.
+long-description: >
+  Minikube runs a single-node cluster inside a VM on your computer.
@@ -0,0 +1,9 @@
+id: namespace
+name: Namespace
+full-link: /docs/concepts/overview/working-with-objects/namespaces
+tags:
+- fundamental
+short-description: >
+  An abstraction used by Kubernetes to support virtual clusters on the same physical {% glossary_tooltip term_id="cluster" %}.
+long-description: >
+  Namespaces are used to organize objects in a cluster and provide a way to divide cluster resources. Names of resources need to be unique within a namespace, but not across namespaces.
@@ -0,0 +1,13 @@
+id: network-policy
+name: Network Policy
+full-link: /docs/concepts/services-networking/network-policies/
+aka:
+  - NetworkPolicy
+tags:
+- networking
+- architecture
+- extension
+short-description: >
+  A specification of how groups of Pods are allowed to communicate with each other and with other network endpoints.
+long-description: >
+  Network Policies help you declaratively configure which Pods are allowed to connect to each other, which namespaces are allowed to communicate, and more specifically which port numbers to enforce each policy on. `NetworkPolicy` resources use labels to select Pods and define rules which specify what traffic is allowed to the selected Pods. Network Policies are implemented by a supported network plugin provided by a network provider. Be aware that creating a network resource without a controller to implement it will have no effect.
@@ -0,0 +1,13 @@
+id: node
+name: Node
+full-link: /docs/concepts/architecture/nodes/
+aka:
+- Minion
+related:
+- deployment
+tags:
+- fundamental
+short-description: >
+  A node is a worker machine in Kubernetes.
+long-description: >
+  A worker machine may be a VM or physical machine, depending on the cluster. It has the {% glossary_tooltip text="Services" term_id="service" %} necessary to run {% glossary_tooltip text="Pods" term_id="pod" %} and is managed by the master components. The {% glossary_tooltip text="Services" term_id="service" %} on a node include Docker, kubelet and kube-proxy.
@@ -0,0 +1,11 @@
+id: platform-developer
+name: Platform Developer
+aka:
+  - Kubernetes Developer
+  - Extension Developer
+tags:
+  - user-type
+short-description: >
+  A person who customizes the Kubernetes platform to fit the needs of their project.
+long-description: >
+  A platform developer may, for example, use [Custom Resources](/docs/concepts/api-extension/custom-resources/) or [Extend the Kubernetes API with the aggregation layer](/docs/concepts/api-extension/apiserver-aggregation/) to add functionality to their instance of Kubernetes, specifically for their application.  Some Platform Developers are also {% glossary_tooltip text="contributors" term_id="contributor" %} and develop extensions which are contributed to the Kubernetes community.  Others develop closed-source commercial or site-specific extensions.
@@ -0,0 +1,19 @@
+id: pod-security-policy
+name: Pod Security Policy
+full-link: /docs/concepts/policy/pod-security-policy/
+related:
+- pod
+- container
+- sidecar
+- deployment
+- statefulset
+- security
+tags:
+- core-object
+- fundamental
+short-description: >
+  Enables fine-grained authorization of {% glossary_tooltip term_id="pod" %} creation and updates.
+long-description: >
+  A cluster-level resource that controls security sensitive aspects of the Pod specification.
+  The `PodSecurityPolicy` objects define a set of conditions that a Pod must run with in order to be accepted into the system, as well as defaults for the related fields.
+  Pod Security Policy control is implemented as an optional admission controller.
@@ -0,0 +1,17 @@
+id: pod
+name: Pod
+full-link: /docs/concepts/workloads/pods/pod-overview/
+related:
+- container
+- sidecar
+- deployment
+- statefulset
+tags:
+- core-object
+- fundamental
+short-description: >
+  The smallest and simplest Kubernetes object. A Pod represents a set of running {% glossary_tooltip text="containers" term_id="container" %} on your cluster.
+long-description: >
+  A Pod is typically set up to run a single primary container.
+  It can also run optional sidecar containers that add supplementary features like logging.
+  Pods are commonly managed by a {% glossary_tooltip term_id="deployment" %}.
@@ -0,0 +1,10 @@
+id: rbac
+name: RBAC (Role-Based Access Control)
+full-link: /docs/admin/authorization/rbac/
+tags:
+- security
+- fundamental
+short-description: >
+  Manages authorization decisions, allowing admins to dynamically configure access policies through the {% glossary_tooltip text="Kubernetes API" term_id="kubernetes-api" %}.
+long-description: >
+  RBAC utilizes *roles*, which contain permission rules, and *role bindings*, which grant the permissions defined in a role to a set of users.
@@ -0,0 +1,13 @@
+id: replica-set
+name: ReplicaSet
+full-link: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
+related:
+- replication-controller
+tags:
+- core-object
+- architecture
+short-description: >
+  ReplicaSet is the next-generation Replication Controller.
+long-description: >
+  ReplicaSet, like ReplicationController, ensures that a specified number of pods replicas are running at one time.
+  ReplicaSet supports the new set-based selector requirements as described in the labels user guide, whereas a Replication Controller only supports equality-based selector requirements.
@@ -0,0 +1,9 @@
+id: replication-controller
+name: Replication Controller
+tags:
+- fundamental
+short-description: >
+  Kubernetes service that ensures a specific number of instances of a pod are always running.
+long-description: >
+  Will automatically add or remove running instances of a pod, based on a set value for that pod. Allows the pod to return to the defined number of instances if pods are deleted or if too many are started by mistake.
+
@@ -0,0 +1,11 @@
+id: resource-quota
+name: Resource Quotas
+full-link: /docs/concepts/policy/resource-quotas/
+tags:
+- fundamental
+- operation
+- architecture
+short-description: >
+  Provides constraints that limit aggregate resource consumption per {% glossary_tooltip term_id="namespace" %}.
+long-description: >
+  Limits the quantity of objects that can be created in a namespace by type, as well as the total amount of compute resources that may be consumed by resources in that project.
@@ -0,0 +1,8 @@
+id: reviewer
+name: Reviewer
+tags:
+- community
+short-description: >
+  A person who reviews code for quality and correctness on some part of the project.
+long-description: >
+  Reviewers are knowledgeable about both the codebase and software engineering principles. Reviewer status is scoped to a part of the codebase.
@@ -0,0 +1,15 @@
+id: secret
+name: Secret
+full-link: /docs/concepts/configuration/secret/
+related:
+- pods
+- volume
+tags:
+- core-object
+- security
+short-description: >
+  Stores sensitive information, such as passwords, OAuth tokens, and ssh keys.
+long-description: >
+  Allows for more control over how sensitive information is used and reduces the risk of accidental exposure, including [encryption](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/#ensure-all-secrets-are-encrypted) at rest. 
+  A {% glossary_tooltip text="Pod" term_id="pod" %} references the secret as a file in a volume mount or by the kubelet pulling images for a pod.
+  Secrets are great for confidential data and [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configmap/) for non-confidential data.
@@ -0,0 +1,9 @@
+id: security-context
+name: Security Context
+full-link: /docs/tasks/configure-pod-container/security-context/
+tags:
+- security
+short-description: >
+  The securityContext field defines privilege and access control settings for a Pod or Container, including the runtime UID and GID.
+long-description: >
+  The securityContext field in a {% glossary_tooltip term_id="pod" %} (applying to all containers) or container is used to set the user (runAsUser) and group (fsGroup), capabilities, privilege settings, and security policies (SELinux/AppArmor/Seccomp) that container processes use.
@@ -0,0 +1,10 @@
+id: service-account
+name: Service Account
+full-link: /docs/tasks/configure-pod-container/configure-service-account/
+tags:
+- fundamental
+- core-object
+short-description: >
+  Provides an identity for processes that run in a Pod {% glossary_tooltip text="Pods" term_id="pod" %}.
+long-description: >
+  When processes inside Pods access the cluster, they are authenticated by the API server as a particular service account, for example, `default`. When you create a Pod, if you do not specify a service account, it is automatically assigned the default service account in the same namespace {% glossary_tooltip text="Namespace" term_id="namespace" %}.
@@ -0,0 +1,9 @@
+id: service-broker
+name: Service Broker
+tags:
+- extension
+short-description: >
+  An endpoint for a set of {% glossary_tooltip text="Managed Services" term_id="managed-service" %} offered and maintained by a third-party.
+long-description: >
+  {% glossary_tooltip text="Service Brokers" term_id="service-broker" %} implement the [Open Service Broker API spec](https://github.com/openservicebrokerapi/servicebroker/blob/v2.13/spec.md) and provide a standard interface for applications to use their Managed Services.
+  [Service Catalog](/docs/concepts/service-catalog/) provides a way to list, provision, and bind with Managed Services offered by Service Brokers.
@@ -0,0 +1,8 @@
+id: service-catalog
+name: Service Catalog
+tags:
+- extension
+short-description: >
+  An extension API that enables applications running in Kubernetes clusters to easily use external managed software offerings, such as a datastore service offered by a cloud provider.
+long-description: >
+  Service Catalog provides a way to list, provision, and bind with external {% glossary_tooltip text="Managed Services" term_id="managed-service" %} from {% glossary_tooltip text="Service Brokers" term_id="service-broker" %} without needing detailed knowledge about how those services are created or managed.
@@ -0,0 +1,10 @@
+id: service
+name: Service
+full-link: /docs/concepts/services-networking/service/
+tags:
+- fundamental
+- core-object
+short-description: >
+  An API object that describes how to access applications, such as a set of {% glossary_tooltip text="Pods" term_id="pod" %}, and can describe ports and load-balancers.
+long-description: >
+  The access point can be internal or external to the cluster.
@@ -0,0 +1,12 @@
+id: sig
+name: SIG (special interest group)
+full-link: https://github.com/kubernetes/community/blob/master/sig-list.md#master-sig-list
+tags:
+- community
+short-description: >
+  {% glossary_tooltip text="Community members" term_id="member" %} who collectively manage an ongoing piece or aspect of the larger Kubernetes open source project.
+long-description: |
+  Members within a SIG have a shared interest in advancing a specific area, such as architecture, API machinery, or documentation.
+  SIGs must follow the [SIG Governance](https://github.com/kubernetes/community/blob/master/sig-governance.md) guidelines but can have their own contribution policy and channels of communication.
+
+  For more information, see the [kubernetes/community](https://github.com/kubernetes/community) repo and the current list of [SIGs and Working Groups](https://github.com/kubernetes/community/blob/master/sig-list.md).
@@ -0,0 +1,18 @@
+id: statefulset
+name: StatefulSet
+full-link: /docs/concepts/workloads/controllers/statefulset/
+aka:
+- PetSet
+related:
+- deployment
+- pod
+tags:
+- core-object
+- workload
+- storage
+short-description: >
+  Manages the deployment and scaling of a set of {% glossary_tooltip text="Pods" term_id="pod" %}, *and provides guarantees about the ordering and uniqueness* of these Pods.
+long-description: |
+  Like a {% glossary_tooltip term_id="deployment" %}, a StatefulSet manages Pods that are based on an identical container spec. Unlike a Deployment, a StatefulSet maintains a sticky identity for each of their Pods. These pods are created from the same spec, but are not interchangeable&#58; each has a persistent identifier that it maintains across any rescheduling.
+
+  A StatefulSet operates under the same pattern as any other Controller. You define your desired state in a StatefulSet *object*, and the StatefulSet *controller* makes any necessary updates to get there from the current state.
@@ -0,0 +1,11 @@
+id: upstream
+name: Upstream (disambiguation)
+related:
+- downstream
+tags:
+- community
+short-description: >
+  May refer to: core Kubernetes or the source repo from which a repo was forked.
+long-description: |
+  * In the **Kubernetes Community**: Conversations often use *upstream* to mean the core Kubernetes codebase, which the general ecosystem, other code, or third-party tools relies upon. For example, [community members](#term-member) may suggest that a feature is moved upstream so that it is in the core codebase instead of in a plugin or third-party tool.
+  * In **GitHub** or **git**: The convention is to refer to a source repo as *upstream*, whereas the forked repo is considered *downstream*.
@@ -0,0 +1,17 @@
+id: volume
+name: Volume
+full-link: /docs/concepts/storage/volumes/
+related:
+- pod
+- container
+- secret
+tags:
+- core-object
+- fundamental
+short-description: >
+ A directory containing data, accessible to the containers in a {% glossary_tooltip text="pod" term_id="pod" %}.
+long-description: >
+ A Kubernetes volume lives as long as the {% glossary_tooltip text="pod" term_id="pod" %} that encloses it.
+ Consequently, a volume outlives any {% glossary_tooltip text="containers" term_id="container" %} that run within the
+ {% glossary_tooltip text="pod" term_id="pod" %}, and data is preserved across
+ {% glossary_tooltip text="container" term_id="container" %} restarts. 
@@ -0,0 +1,11 @@
+id: wg
+name: WG (working group)
+full-link: https://github.com/kubernetes/community/blob/master/sig-list.md#master-working-group-list
+tags:
+- community
+short-description: >
+  Facilitates the discussion and/or implementation of a short-lived, narrow, or decoupled project for a committee, {% glossary_tooltip text="SIG" term_id="sig" %}, or cross-SIG effort.
+long-description: |
+  Working groups are a way of organizing people to accomplish a discrete task, and are relatively easy to create and deprecate when inactive.
+
+  For more information, see the [kubernetes/community](https://github.com/kubernetes/community) repo and the current list of [SIGs and working groups](https://github.com/kubernetes/community/blob/master/sig-list.md).
@@ -1,304 +0,0 @@
-bigheader: "Guides"
-abstract: "How to get started, and accomplish tasks, using Kubernetes."
-toc:
- title: Guides
-  path: /docs/user-guide/
-
- title: Getting Started
-  section:
-  - title: What is Kubernetes?
-    path: /docs/whatisk8s/
-  - title: Installing Kubernetes on Linux with kubeadm
-    path: /docs/getting-started-guides/kubeadm/
-  - title: Installing Kubernetes on AWS with kops
-    path: /docs/getting-started-guides/kops/
-  - title: Hello World on Google Container Engine
-    path: /docs/hellonode/
-  - title: Installing kubectl
-    path: /docs/getting-started-guides/kubectl/
-  - title: Downloading or Building Kubernetes
-    path: /docs/getting-started-guides/binary_release/
-  - title: Online Training Course
-    path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615
-
- title: Accessing the Cluster
-  section:
-  - title: Installing and Setting up kubectl
-    path: /docs/user-guide/prereqs/
-  - title: Accessing Clusters
-    path: /docs/user-guide/accessing-the-cluster/
-  - title: Sharing Cluster Access with kubeconfig
-    path: /docs/user-guide/sharing-clusters/
-  - title: Authenticating Across Clusters with kubeconfig
-    path: /docs/user-guide/kubeconfig-file/
-
- title: User Guide
-  path: /docs/user-guide/
-
- title: Web UI (Dashboard)
-  path: /docs/user-guide/ui/
-
- title: Workload Deployment and Management
-  section:
-  - title: Launching, Exposing, and Killing Applications
-    path: /docs/user-guide/quick-start/
-  - title: Deploying Applications
-    path: /docs/user-guide/deploying-applications/
-  - title: Managing Resources
-    path: /docs/user-guide/managing-deployments/
-  - title: Replication Controller Operations
-    path: /docs/user-guide/replication-controller/operations/
-  - title: Resizing a Replication Controller
-    path: /docs/user-guide/resizing-a-replication-controller/
-  - title: Rolling Updates
-    path: /docs/user-guide/rolling-updates/
-  - title: Rolling Update Demo
-    path: /docs/user-guide/update-demo/
-  - title: Secrets Walkthrough
-    path: /docs/user-guide/secrets/walkthrough/
-  - title: Using ConfigMap
-    path: /docs/user-guide/configmap/
-  - title: Horizontal Pod Autoscaling
-    path: /docs/user-guide/horizontal-pod-autoscaling/walkthrough/
-  - title: Best Practices for Configuration
-    path: /docs/user-guide/config-best-practices/
-  - title: Using kubectl to Manage Resources
-    path: /docs/user-guide/working-with-resources/
-  - title: Garbage Collection (Beta)
-    path: /docs/user-guide/garbage-collection/
-  - title: Using NetworkPolicy
-    section:
-    - title: Example Walkthrough
-      path: /docs/getting-started-guides/network-policy/walkthrough/
-    - title: Using Calico for NetworkPolicy
-      path: /docs/getting-started-guides/network-policy/calico/
-    - title: Using Romana for NetworkPolicy
-      path: /docs/getting-started-guides/network-policy/romana/
-
- title: Batch Jobs
-  section:
-  - title: Jobs
-    path: /docs/user-guide/jobs/
-  - title: Parallel Processing using Expansions
-    path: /docs/user-guide/jobs/expansions/
-  - title: Coarse Parallel Processing using a Work Queue
-    path: /docs/user-guide/jobs/work-queue-1/
-  - title: Fine Parallel Processing using a Work Queue
-    path: /docs/user-guide/jobs/work-queue-2/
-  - title: Cron Jobs
-    path: /docs/user-guide/cron-jobs/
-
- title: Service Discovery and Load Balancing
-  section:
-  - title: Connecting Applications with Services
-    path: /docs/user-guide/connecting-applications/
-  - title: Service Operations
-    path: /docs/user-guide/services/operations/
-  - title: Creating an External Load Balancer
-    path: /docs/user-guide/load-balancer/
-  - title: Configuring Your Cloud Provider's Firewalls
-    path: /docs/user-guide/services-firewalls/
-  - title: Cross-cluster Service Discovery using Federated Services
-    path: /docs/user-guide/federation/federated-services/
-
- title: Containers and Pods
-  section:
-  - title: Running Your First Containers
-    path: /docs/user-guide/simple-nginx/
-  - title: Creating Single-Container Pods
-    path: /docs/user-guide/pods/single-container/
-  - title: Creating Multi-Container Pods
-    path: /docs/user-guide/pods/multi-container/
-  - title: Configuring Containers
-    path: /docs/user-guide/configuring-containers/
-  - title: Working with Containers in Production
-    path: /docs/user-guide/production-pods/
-  - title: Commands and Capabilities
-    path: /docs/user-guide/containers/
-  - title: Using Environment Variables
-    path: /docs/user-guide/environment-guide/
-  - title: Managing Compute Resources
-    path: /docs/user-guide/compute-resources/
-  - title: The Lifecycle of a Pod
-    path: /docs/user-guide/pod-states/
-  - title: Checking Pod Health
-    path: /docs/user-guide/liveness/
-  - title: Container Lifecycle Hooks
-    path: /docs/user-guide/container-environment/
-  - title: Assigning Pods to Nodes
-    path: /docs/user-guide/node-selection/
-  - title: Using the Downward API to Convey Pod Properties
-    path: /docs/user-guide/downward-api/
-  - title: Downward API Volumes
-    path: /docs/user-guide/downward-api/volume
-  - title: Persistent Volumes Walkthrough
-    path: /docs/user-guide/persistent-volumes/walkthrough/
-  - title: Bootstrapping Pet Sets
-    path: /docs/user-guide/petset/bootstrapping/
-
- title: Monitoring, Logging, and Debugging Containers
-  section:
-  - title: Resource Usage Monitoring
-    path: /docs/user-guide/monitoring/
-  - title: Logging
-    path: /docs/getting-started-guides/logging/
-  - title: Logging with Elasticsearch and Kibana
-    path: /docs/getting-started-guides/logging-elasticsearch/
-  - title: Running Commands in a Container with kubectl exec
-    path: /docs/user-guide/getting-into-containers/
-  - title: Connect with Proxies
-    path: /docs/user-guide/connecting-to-applications-proxy/
-  - title: Connect with Port Forwarding
-    path: /docs/user-guide/connecting-to-applications-port-forward/
-  - title: Using Explorer to Examine the Runtime Environment
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/explorer
-
- title: Creating a Cluster
-  section:
-  - title: Picking the Right Solution
-    path: /docs/getting-started-guides/
-  - title: Running Kubernetes on Your Local Machine
-    section:
-    - title: Running Kubernetes Locally via Minikube
-      path: /docs/getting-started-guides/minikube/
-    - title: Deprecated Alternatives
-      path: /docs/getting-started-guides/alternatives/
-  - title: Running Kubernetes on Turn-key Cloud Solutions
-    section:
-    - title: Running Kubernetes on Google Container Engine
-      path: https://cloud.google.com/container-engine/docs/before-you-begin/
-    - title: Running Kubernetes on Google Compute Engine
-      path: /docs/getting-started-guides/gce/
-    - title: Running Kubernetes on AWS EC2
-      path: /docs/getting-started-guides/aws/
-    - title: Running Kubernetes on Azure
-      path: /docs/getting-started-guides/azure/
-    - title: Running Kubernetes on Azure (Weave-based)
-      path: /docs/getting-started-guides/coreos/azure/
-    - title: Running Kubernetes on CenturyLink Cloud
-      path: /docs/getting-started-guides/clc/
-    - title: Running Kubernetes on IBM SoftLayer
-      path: https://github.com/patrocinio/kubernetes-softlayer
-  - title: Running Kubernetes on Custom Solutions
-    section:
-    - title: Creating a Custom Cluster from Scratch
-      path: /docs/getting-started-guides/scratch/
-    - title: Custom Cloud Solutions
-      section:
-      - title: CoreOS on AWS or GCE
-        path: /docs/getting-started-guides/coreos/
-      - title: Ubuntu on AWS or Joyent
-        path: /docs/getting-started-guides/juju/
-      - title: CoreOS on Rackspace
-        path: /docs/getting-started-guides/rackspace/
-    - title: On-Premise VMs
-      section:
-      - title: CoreOS on Vagrant
-        path: /docs/getting-started-guides/coreos/
-      - title: Cloudstack
-        path: /docs/getting-started-guides/cloudstack/
-      - title: VMware vSphere
-        path: /docs/getting-started-guides/vsphere/
-      - title: VMware Photon Controller
-        path: /docs/getting-started-guides/photon-controller/
-      - title: Juju
-        path: /docs/getting-started-guides/juju/
-      - title: DCOS
-        path: /docs/getting-started-guides/dcos/
-      - title: CoreOS on libvirt
-        path: /docs/getting-started-guides/libvirt-coreos/
-      - title: oVirt
-        path: /docs/getting-started-guides/ovirt/
-      - title: OpenStack Heat
-        path: /docs/getting-started-guides/openstack-heat/
-      - title: rkt
-        section:
-        - title: Running Kubernetes with rkt
-          path: /docs/getting-started-guides/rkt/
-        - title: Known Issues when Using rkt
-          path: /docs/getting-started-guides/rkt/notes/
-      - title: Kubernetes on Mesos
-        path: /docs/getting-started-guides/mesos/
-      - title: Kubernetes on Mesos on Docker
-        path: /docs/getting-started-guides/mesos-docker/
-    - title: Bare Metal
-      section:
-      - title: Offline
-        path: /docs/getting-started-guides/coreos/bare_metal_offline/
-      - title: Fedora via Ansible
-        path: /docs/getting-started-guides/fedora/fedora_ansible_config/
-      - title: Fedora (Single Node)
-        path: /docs/getting-started-guides/fedora/fedora_manual_config/
-      - title: Fedora (Multi Node)
-        path: /docs/getting-started-guides/fedora/flannel_multi_node_cluster/
-      - title: CentOS
-        path: /docs/getting-started-guides/centos/centos_manual_config/
-      - title: CoreOS
-        path: /docs/getting-started-guides/coreos
-      - title: Ubuntu
-        path: /docs/getting-started-guides/ubuntu/
-    - title: Validate Node Setup
-      path: /docs/admin/node-conformance
-  - title: Portable Multi-Node Cluster
-    path: /docs/getting-started-guides/docker-multinode/
-  - title: Building Large Clusters
-    path: /docs/admin/cluster-large/
-  - title: Running in Multiple Zones
-    path: /docs/admin/multiple-zones/
-  - title: Building High-Availability Clusters
-    path: /docs/admin/high-availability/
-
- title: Administering Clusters
-  section:
-  - title: Admin Guide
-    path: /docs/admin/
-  - title: Cluster Management Guide
-    path: /docs/admin/cluster-management/
-  - title: kubeadm reference
-    path: /docs/admin/kubeadm/
-  - title: Installing Addons
-    path: /docs/admin/addons/
-  - title: Sharing a Cluster with Namespaces
-    path: /docs/admin/namespaces/
-  - title: Namespaces Walkthrough
-    path: /docs/admin/namespaces/walkthrough/
-  - title: Setting Pod CPU and Memory Limits
-    path: /docs/admin/limitrange/
-  - title: Understanding Resource Quotas
-    path: /docs/admin/resourcequota/
-  - title: Applying Resource Quotas and Limits
-    path: /docs/admin/resourcequota/walkthrough/
-  - title: Kubernetes Components
-    path: /docs/admin/cluster-components/
-  - title: Configuring Kubernetes Use of etcd
-    path: /docs/admin/etcd/
-  - title: Federating Clusters
-    path: /docs/admin/federation/
-  - title: Using Multiple Clusters
-    path: /docs/admin/multi-cluster/
-  - title: Changing Cluster Size
-    path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ#how-do-i-change-the-size-of-my-cluster/
-  - title: Configuring Multiple Schedulers
-    path: /docs/admin/multiple-schedulers/
-  - title: Networking in Kubernetes
-    path: /docs/admin/networking/
-  - title: Using DNS Pods and Services
-    path: /docs/admin/dns/
-  - title: Setting Up and Configuring DNS
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cluster-dns
-  - title: Master <-> Node Communication
-    path: /docs/admin/master-node-communication/
-  - title: Network Plugins
-    path: /docs/admin/network-plugins/
-  - title: Static Pods
-    path: /docs/admin/static-pods/
-  - title: Configuring kubelet Garbage Collection
-    path: /docs/admin/garbage-collection/
-  - title: Configuring Out Of Resource Handling
-    path: /docs/admin/out-of-resource/
-  - title: Configuring Kubernetes with Salt
-    path: /docs/admin/salt/
-  - title: Monitoring Node Health
-    path: /docs/admin/node-problem/
-  - title: AppArmor
-    path: /docs/admin/apparmor/
@@ -1,6 +1,5 @@
 overrides:
- path: docs/api-reference
- path: docs/user-guide/kubectl
+- path: docs/admin/cloud-controller-manager.md
 - path: docs/admin/federation-apiserver.md
 - path: docs/admin/federation-controller-manager.md
 - path: docs/admin/kube-apiserver.md
@@ -8,12 +7,4 @@ overrides:
 - path: docs/admin/kube-proxy.md
 - path: docs/admin/kube-scheduler.md
 - path: docs/admin/kubelet.md
- changedpath: docs/api-reference/extensions/v1beta1/definitions.html _includes/v1.4/extensions-v1beta1-definitions.html
- changedpath: docs/api-reference/extensions/v1beta1/operations.html _includes/v1.4/extensions-v1beta1-operations.html
- changedpath: docs/api-reference/v1/definitions.html _includes/v1.4/v1-definitions.html
- changedpath: docs/api-reference/v1/operations.html _includes/v1.4/v1-operations.html
 - copypath: k8s/federation/docs/api-reference/ docs/federation/
- copypath: k8s/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml docs/getting-started-guides/fluentd-gcp.yaml
- copypath: k8s/examples/blog-logging/counter-pod.yaml docs/getting-started-guides/counter-pod.yaml
- copypath: k8s/examples/blog-logging/counter-pod.yaml docs/user-guide/counter-pod.yaml
-
@@ -1,274 +1,112 @@
 bigheader: "Reference Documentation"
 abstract: "Design docs, concept definitions, and references for APIs and CLIs."
 toc:
- title: Reference Documentation
-  path: /docs/reference/
+- docs/reference/index.md
+- docs/reference/glossary.md

- title: Kubernetes API
+- title: Using the API
  section:
-  - title: Kubernetes API Overview
-    path: /docs/api/
+  - docs/reference/api-overview.md
+  - docs/reference/client-libraries.md
  - title: Accessing the API
    section:
-    - title: Overview
-      path: /docs/admin/accessing-the-api/
-    - title: Authenticating
-      path: /docs/admin/authentication/
-    - title: Using Authorization Plugins
-      path: /docs/admin/authorization/
-    - title: Using Admission Controllers
-      path: /docs/admin/admission-controllers/
-    - title: Managing Service Accounts
-      path: /docs/admin/service-accounts-admin/
-  - title: Kubernetes API Operations
-    path: /docs/api-reference/v1/operations/
-  - title: Kubernetes API Definitions
-    path: /docs/api-reference/v1/definitions/
-  - title: Kubernetes API Swagger Spec
-    path: /kubernetes/third_party/swagger-ui/
+    - docs/admin/accessing-the-api.md
+    - docs/admin/authentication.md
+    - docs/admin/bootstrap-tokens.md
+    - docs/admin/admission-controllers.md
+    - docs/admin/extensible-admission-controllers.md
+    - docs/admin/service-accounts-admin.md
+  - title: Authorization
+    section:
+    - docs/admin/authorization/index.md
+    - docs/admin/authorization/abac.md
+    - docs/admin/authorization/rbac.md
+    - docs/admin/authorization/node.md
+    - docs/admin/authorization/webhook.md
+  - docs/reference/deprecation-policy.md
+  - docs/reference/workloads-18-19.md

- title: Autoscaling API
+- title: API Reference
  section:
-  - title: Autoscaling API Operations
-    path: /docs/api-reference/autoscaling/v1/operations/
-  - title: Autoscaling API Definitions
-    path: /docs/api-reference/autoscaling/v1/definitions/
+  - title: v1.9
+    path: /docs/reference/generated/kubernetes-api/v1.9/
+  - docs/reference/labels-annotations-taints.md
+  - title: OpenAPI and Swagger
+    section:
+    - title: OpenAPI Spec
+      path: https://git.k8s.io/kubernetes/api/openapi-spec/
+    - title: Swagger Spec
+      path: https://git.k8s.io/kubernetes/api/swagger-spec/

- title: Batch API
+- title: Federation API
  section:
-  - title: Batch API Operations
-    path: /docs/api-reference/batch/v1/operations/
-  - title: Batch API Definitions
-    path: /docs/api-reference/batch/v1/definitions/
-
- title: Extensions API
-  section:
-  - title: Extensions API Operations
-    path: /docs/api-reference/extensions/v1beta1/operations/
-  - title: Extensions API Definitions
-    path: /docs/api-reference/extensions/v1beta1/definitions/
+    - docs/reference/generated/federation/v1/operations.html
+    - docs/reference/generated/federation/v1/definitions.html
+    - docs/reference/generated/federation/extensions/v1beta1/operations.html
+    - docs/reference/generated/federation/extensions/v1beta1/definitions.html

 - title: kubectl CLI
  section:
-  - title: kubectl Overview
-    path: /docs/user-guide/kubectl-overview/
-  - title: kubectl for Docker Users
-    path: /docs/user-guide/docker-cli-to-kubectl/
-  - title: kubectl Usage Conventions
-    path: /docs/user-guide/kubectl-conventions/
-  - title: JSONpath Support
-    path: /docs/user-guide/jsonpath/
-  - title: kubectl Cheat Sheet
-    path: /docs/user-guide/kubectl-cheatsheet/
+  - docs/reference/kubectl/overview.md
+  - docs/reference/generated/kubectl/kubectl.md
  - title: kubectl Commands
+    path: /docs/reference/generated/kubectl/kubectl-commands.html
+  - docs/reference/kubectl/docker-cli-to-kubectl.md
+  - docs/reference/kubectl/conventions.md
+  - docs/reference/kubectl/jsonpath.md
+  - docs/reference/kubectl/cheatsheet.md
+
+- title: Setup Tools Reference
+  section:
+  - title: Kubeadm
    section:
-    - title: kubectl
-      path: /docs/user-guide/kubectl/
-    - title: kubectl annotate
-      path: /docs/user-guide/kubectl/kubectl_annotate/
-    - title: kubectl api-versions
-      path: /docs/user-guide/kubectl/kubectl_api-versions/
-    - title: kubectl apply
-      path: /docs/user-guide/kubectl/kubectl_apply/
-    - title: kubectl attach
-      path: /docs/user-guide/kubectl/kubectl_attach/
-    - title: kubectl autoscale
-      path: /docs/user-guide/kubectl/kubectl_autoscale/
-    - title: kubectl cluster-info
-      path: /docs/user-guide/kubectl/kubectl_cluster-info/
-    - title: kubectl config
-      path: /docs/user-guide/kubectl/kubectl_config/
-    - title: kubectl config current-context
-      path: /docs/user-guide/kubectl/kubectl_config_current-context/
-    - title: kubectl config set-cluster
-      path: /docs/user-guide/kubectl/kubectl_config_set-cluster/
-    - title: kubectl config set-context
-      path: /docs/user-guide/kubectl/kubectl_config_set-context/
-    - title: kubectl config set-credentials
-      path: /docs/user-guide/kubectl/kubectl_config_set-credentials/
-    - title: kubectl config set
-      path: /docs/user-guide/kubectl/kubectl_config_set/
-    - title: kubectl config unset
-      path: /docs/user-guide/kubectl/kubectl_config_unset/
-    - title: kubectl config use-context
-      path: /docs/user-guide/kubectl/kubectl_config_use-context/
-    - title: kubectl config view
-      path: /docs/user-guide/kubectl/kubectl_config_view/
-    - title: kubectl convert
-      path: /docs/user-guide/kubectl/kubectl_convert/
-    - title: kubectl cordon
-      path: /docs/user-guide/kubectl/kubectl_cordon/
-    - title: kubectl create
-      path: /docs/user-guide/kubectl/kubectl_create/
-    - title: kubectl create configmap
-      path: /docs/user-guide/kubectl/kubectl_create_configmap/
-    - title: kubectl create namespace
-      path: /docs/user-guide/kubectl/kubectl_create_namespace/
-    - title: kubectl create secret docker-registry
-      path: /docs/user-guide/kubectl/kubectl_create_secret_docker-registry/
-    - title: kubectl create secret
-      path: /docs/user-guide/kubectl/kubectl_create_secret/
-    - title: kubectl create secret generic
-      path: /docs/user-guide/kubectl/kubectl_create_secret_generic/
-    - title: kubectl create serviceaccount
-      path: /docs/user-guide/kubectl/kubectl_create_serviceaccount/
-    - title: kubectl delete
-      path: /docs/user-guide/kubectl/kubectl_delete/
-    - title: kubectl describe
-      path: /docs/user-guide/kubectl/kubectl_describe/
-    - title: kubectl drain
-      path: /docs/user-guide/kubectl/kubectl_drain/
-    - title: kubectl edit
-      path: /docs/user-guide/kubectl/kubectl_edit/
-    - title: kubectl exec
-      path: /docs/user-guide/kubectl/kubectl_exec/
-    - title: kubectl explain
-      path: /docs/user-guide/kubectl/kubectl_explain/
-    - title: kubectl expose
-      path: /docs/user-guide/kubectl/kubectl_expose/
-    - title: kubectl get
-      path: /docs/user-guide/kubectl/kubectl_get/
-    - title: kubectl label
-      path: /docs/user-guide/kubectl/kubectl_label/
-    - title: kubectl logs
-      path: /docs/user-guide/kubectl/kubectl_logs/
-    - title: kubectl patch
-      path: /docs/user-guide/kubectl/kubectl_patch/
-    - title: kubectl port-forward
-      path: /docs/user-guide/kubectl/kubectl_port-forward/
-    - title: kubectl proxy
-      path: /docs/user-guide/kubectl/kubectl_proxy/
-    - title: kubectl replace
-      path: /docs/user-guide/kubectl/kubectl_replace/
-    - title: kubectl rolling-update
-      path: /docs/user-guide/kubectl/kubectl_rolling-update/
-    - title: kubectl rollout
-      path: /docs/user-guide/kubectl/kubectl_rollout/
-    - title: kubectl rollout history
-      path: /docs/user-guide/kubectl/kubectl_rollout_history/
-    - title: kubectl rollout pause
-      path: /docs/user-guide/kubectl/kubectl_rollout_pause/
-    - title: kubectl rollout resume
-      path: /docs/user-guide/kubectl/kubectl_rollout_resume/
-    - title: kubectl rollout undo
-      path: /docs/user-guide/kubectl/kubectl_rollout_undo/
-    - title: kubectl run
-      path: /docs/user-guide/kubectl/kubectl_run/
-    - title: kubectl scale
-      path: /docs/user-guide/kubectl/kubectl_scale/
-    - title: kubectl uncordon
-      path: /docs/user-guide/kubectl/kubectl_uncordon/
-    - title: kubectl version
-      path: /docs/user-guide/kubectl/kubectl_version/
-    - title: Superseded and Deprecated Commands
-      section:
-      - title: kubectl namespace
-        path: /docs/user-guide/kubectl/kubectl_namespace/
-      - title: kubectl stop
-        path: /docs/user-guide/kubectl/kubectl_stop/
+    - docs/reference/setup-tools/kubeadm/kubeadm.md
+    - docs/reference/setup-tools/kubeadm/kubeadm-init.md
+    - docs/reference/setup-tools/kubeadm/kubeadm-join.md
+    - docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md
+    - docs/reference/setup-tools/kubeadm/kubeadm-config.md
+    - docs/reference/setup-tools/kubeadm/kubeadm-reset.md
+    - docs/reference/setup-tools/kubeadm/kubeadm-token.md
+    - docs/reference/setup-tools/kubeadm/kubeadm-version.md
+    - docs/reference/setup-tools/kubeadm/kubeadm-alpha.md
+  - title: Kubefed
+    section:
+    - docs/reference/generated/kubefed.md
+    - docs/reference/generated/kubefed_options.md
+    - docs/reference/generated/kubefed_init.md
+    - docs/reference/generated/kubefed_join.md
+    - docs/reference/generated/kubefed_unjoin.md
+    - docs/reference/generated/kubefed_version.md

- title: Kubernetes Components
+- title: Command-line Tools Reference
  section:
-  - title: kube-apiserver
-    path: /docs/admin/kube-apiserver/
-  - title: kube-controller-manager
-    path: /docs/admin/kube-controller-manager/
-  - title: kube-proxy
-    path: /docs/admin/kube-proxy/
-  - title: kube-scheduler
-    path: /docs/admin/kube-scheduler/
-  - title: kubelet
-    path: /docs/admin/kubelet/
-
- title: Glossary
-  section:
-  - title: Annotations
-    path: /docs/user-guide/annotations/
-  - title: Daemon Sets
-    path: /docs/admin/daemons/
-  - title: Deployments
-    path: /docs/user-guide/deployments/
-  - title: Horizontal Pod Autoscaling
-    path: /docs/user-guide/horizontal-pod-autoscaling/
-  - title: Images
-    path: /docs/user-guide/images/
-  - title: Ingress Resources
-    path: /docs/user-guide/ingress/
-  - title: Jobs
-    path: /docs/user-guide/jobs/
-  - title: Labels and Selectors
-    path: /docs/user-guide/labels/
-  - title: Names
-    path: /docs/user-guide/identifiers/
-  - title: Namespaces
-    path: /docs/user-guide/namespaces/
-  - title: Network Policies
-    path: /docs/user-guide/networkpolicies/
-  - title: Nodes
-    path: /docs/admin/node/
-  - title: Persistent Volumes
-    path: /docs/user-guide/persistent-volumes/
-  - title: Pet Sets
-    path: /docs/user-guide/petset/
-  - title: Pods
-    path: /docs/user-guide/pods/
-  - title: Pod Security Policies
-    path: /docs/user-guide/pod-security-policy/
-  - title: Replica Sets
-    path: /docs/user-guide/replicasets/
-  - title: Replication Controller
-    path: /docs/user-guide/replication-controller/
-  - title: Resource Quotas
-    path: /docs/admin/resourcequota/
-  - title: Cron Jobs
-    path: /docs/user-guide/cron-jobs/
-  - title: Secrets
-    path: /docs/user-guide/secrets/
-  - title: Security Context
-    path: /docs/user-guide/security-context/
-  - title: Services
-    path: /docs/user-guide/services/
-  - title: Service Accounts
-    path: /docs/user-guide/service-accounts/
-  - title: Third Party Resources
-    path: /docs/user-guide/thirdpartyresources/
-  - title: Volumes
-    path: /docs/user-guide/volumes/
+  - docs/reference/generated/kubelet.md
+  - docs/admin/kubelet-authentication-authorization.md
+  - docs/reference/generated/kube-apiserver.md
+  - docs/reference/generated/kube-controller-manager.md
+  - docs/reference/generated/kube-proxy.md
+  - docs/reference/generated/kube-scheduler.md
+  - docs/admin/kubelet-tls-bootstrapping.md
+  - docs/reference/generated/cloud-controller-manager.md
+  - docs/reference/generated/federation-apiserver.md
+  - docs/reference/generated/federation-controller-manager.md

 - title: Kubernetes Design Docs
  section:
  - title: Kubernetes Architecture
-    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/architecture.md
+    path: https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md
  - title: Kubernetes Design Overview
-    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/
+    path: https://github.com/kubernetes/kubernetes/tree/release-1.6/docs/design
  - title: Kubernetes Identity and Access Management
-    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/access.md
-  - title: Kubernetes OpenVSwitch GRE/VxLAN networking
-    path: /docs/admin/ovs-networking/
+    path: https://git.k8s.io/community/contributors/design-proposals/auth/access.md
+  - docs/admin/ovs-networking.md
  - title: Security Contexts
-    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security_context.md
+    path: https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md
  - title: Security in Kubernetes
-    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security.md
+    path: https://git.k8s.io/community/contributors/design-proposals/auth/security.md

- title: Federation
+- title: Kubernetes Issues and Security
  section:
-  - title: Federation User Guide
-    path: /docs/user-guide/federation/
-  - title: Federated Events
-    path: /docs/user-guide/federation/events/
-  - title: Federated Ingress
-    path: /docs/user-guide/federation/federated-ingress/
-  - title: Federated Namespaces
-    path: /docs/user-guide/federation/namespaces/
-  - title: Federated ReplicaSets
-    path: /docs/user-guide/federation/replicasets/
-  - title: Federated Secrets
-    path: /docs/user-guide/federation/secrets/
-  - title: Federation API
-    path: /docs/federation/api-reference/README/
-  - title: Federation Components
-    section:
-    - title: federation-apiserver
-      path: /docs/admin/federation-apiserver
-    - title : federation-controller-mananger
-      path: /docs/admin/federation-controller-manager
+  - title: Kubernetes Issue Tracker on GitHub
+    path: https://github.com/kubernetes/kubernetes/issues/
+  - docs/reference/security.md
@@ -1,79 +0,0 @@
-bigheader: "Samples"
-abstract: "A collection of example applications that show how to use Kubernetes."
-toc:
- title: Samples
-  path: /docs/samples/
-
- title: Storage / Database / KV
-  section:
-  - title: Apache Cassandra Database
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cassandra
-  - title: Ceph
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rbd/
-  - title: CephFS
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cephfs/
-  - title: CockroachDB
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.4/examples/cockroachdb/
-  - title: GlusterFS
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/glusterfs/
-  - title: Hazelcast
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/hazelcast
-  - title: iSCSI
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/iscsi/
-  - title: MySQL Galera
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/mysql-galera
-  - title: NFS
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/nfs/
-  - title: Redis
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/redis/
-  - title: RethinkDB
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rethinkdb/
-  - title: Vitess
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/vitess/
-
- title: Big Data
-  section:
-  - title: Apache Spark
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/spark
-  - title: Apache Storm
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/storm
-
- title: Messaging / Queueing
-  section:
-  - title: Celery + RabbitMQ
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/celery-rabbitmq
-  - title: Hazelcast
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/hazelcast
-
- title: Miscellaneous
-  section:
-  - title: Meteor Applications
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/meteor/
-  - title: OpenShift Origin
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/openshift-origin/
-  - title: Selenium
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/selenium/
-
- title: Monitoring and Logging
-  section:
-  - title: Elasticsearch
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/elasticsearch/
-  - title: NewRelic
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/newrelic
-
- title: Multi-tier Applications
-  section:
-  - title: Guestbook - Go Server
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/guestbook-go/
-  - title: GuestBook - PHP Server
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/guestbook/
-  - title: MEAN stack on Google Cloud Platform
-    path: /docs/getting-started-guides/meanstack/
-  - title: MySQL + Wordpress
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/mysql-wordpress-pd/
-  - title: MySQL + Phabricator Server
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/phabricator/
-  - title: Nodejs + Mongo
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/nodesjs-mongodb
-  - title: Petstore
-    path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/k8petstore/
@@ -0,0 +1,4 @@
+bigheader: ""
+abstract: ""
+toc:
+- docs/search.md
@@ -0,0 +1,108 @@
+bigheader: "Setup"
+abstract: "Instructions for setting up a Kubernetes cluster."
+toc:
+- docs/setup/index.md
+- docs/setup/pick-right-solution.md
+
+- title: Independent Solutions
+  section:
+  - docs/getting-started-guides/minikube.md
+
+  - title: Bootstrapping Clusters with kubeadm
+    section:
+    - docs/setup/independent/install-kubeadm.md
+    - docs/setup/independent/create-cluster-kubeadm.md
+    - docs/setup/independent/troubleshooting-kubeadm.md
+
+  - docs/getting-started-guides/scratch.md
+  - docs/getting-started-guides/alternatives.md
+
+- title: Hosted Solutions
+  section:
+  - title: Running Kubernetes on Google Kubernetes Engine
+    path: https://cloud.google.com/kubernetes-engine/docs/before-you-begin/
+  - title: Running Kubernetes on Azure Container Service
+    path: https://docs.microsoft.com/en-us/azure/container-service/container-service-kubernetes-walkthrough
+  - title: Running Kubernetes on IBM Cloud Container Service
+    path: https://console.bluemix.net/docs/containers/container_index.html
+
+- title: Turn-key Cloud Solutions
+  section:
+  - docs/getting-started-guides/gce.md
+  - docs/getting-started-guides/aws.md
+  - docs/getting-started-guides/azure.md
+  - docs/getting-started-guides/alibaba-cloud.md
+  - docs/getting-started-guides/clc.md
+  - title: Running Kubernetes on IBM Cloud
+    path: https://github.com/patrocinio/kubernetes-softlayer
+  - docs/getting-started-guides/stackpoint.md
+
+- title: Custom Solutions
+
+  section:
+  - title: Custom Cloud Solutions
+    section:
+    - docs/getting-started-guides/coreos/index.md
+    - docs/getting-started-guides/ubuntu/index.md
+    - docs/getting-started-guides/kops.md
+    - docs/getting-started-guides/kubespray.md
+    - docs/getting-started-guides/running-cloud-controller.md
+
+  - title: On-Premise VMs
+    section:
+    - docs/getting-started-guides/coreos/index.md
+    - docs/getting-started-guides/cloudstack.md
+    - docs/getting-started-guides/vsphere.md
+    - docs/getting-started-guides/photon-controller.md
+    - docs/getting-started-guides/dcos.md
+    - docs/getting-started-guides/libvirt-coreos.md
+    - docs/getting-started-guides/ovirt.md
+    - docs/getting-started-guides/openstack-heat.md
+
+    - title: rkt
+      section:
+      - docs/getting-started-guides/rkt/index.md
+      - docs/getting-started-guides/rkt/notes.md
+
+    - docs/getting-started-guides/mesos/index.md
+    - docs/getting-started-guides/mesos-docker.md
+
+    - title: Bare Metal
+      section:
+      - docs/getting-started-guides/coreos/bare_metal_offline.md
+      - docs/getting-started-guides/fedora/fedora_ansible_config.md
+      - docs/getting-started-guides/fedora/fedora_manual_config.md
+      - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
+      - docs/getting-started-guides/centos/centos_manual_config.md
+      - docs/getting-started-guides/coreos/index.md
+      - docs/getting-started-guides/ubuntu/index.md
+
+      - title: Ubuntu
+        section:
+        - docs/getting-started-guides/ubuntu/index.md
+        - docs/getting-started-guides/ubuntu/validation.md
+        - docs/getting-started-guides/ubuntu/backups.md
+        - docs/getting-started-guides/ubuntu/upgrades.md
+        - docs/getting-started-guides/ubuntu/scaling.md
+        - docs/getting-started-guides/ubuntu/installation.md
+        - docs/getting-started-guides/ubuntu/monitoring.md
+        - docs/getting-started-guides/ubuntu/networking.md
+        - docs/getting-started-guides/ubuntu/security.md
+        - docs/getting-started-guides/ubuntu/storage.md
+        - docs/getting-started-guides/ubuntu/troubleshooting.md
+        - docs/getting-started-guides/ubuntu/decommissioning.md
+        - docs/getting-started-guides/ubuntu/operational-considerations.md
+        - docs/getting-started-guides/ubuntu/glossary.md
+        - docs/getting-started-guides/ubuntu/local.md
+        - docs/getting-started-guides/ubuntu/logging.md
+
+    - docs/getting-started-guides/windows/index.md
+
+  - docs/admin/node-conformance.md
+
+- docs/concepts/cluster-administration/addons.md
+- docs/admin/salt.md
+- docs/admin/cluster-large.md
+- docs/admin/multiple-zones.md
+- docs/admin/high-availability/index.md
+- docs/getting-started-guides/binary_release.md
@@ -1,55 +0,0 @@
-bigheader: "Support"
-abstract: "Troubleshooting resources, frequently asked questions, and community support channels."
-toc:
- title: Support
-  path: /docs/troubleshooting/
-
- title: Contributing to the Kubernetes Docs
-  section:
-  - title: Creating a Documentation Pull Request
-    path: /docs/contribute/create-pull-request/
-  - title: Writing a New Topic
-    path: /docs/contribute/write-new-topic/
-  - title: Staging Your Documentation Changes
-    path: /docs/contribute/stage-documentation-changes/
-  - title: Using Page Templates
-    path: /docs/contribute/page-templates/
-  - title: Documentation Style Guide
-    path: /docs/contribute/style-guide/
-
- title: Troubleshooting
-  section:
-  - title: Debugging Pods and Replication Controllers
-    path: /docs/user-guide/debugging-pods-and-replication-controllers/
-  - title: Application Introspection and Debugging
-    path: /docs/user-guide/introspection-and-debugging/
-  - title: Retrieving Logs
-    path: /docs/user-guide/logging/
-  - title: Troubleshooting Applications
-    path: /docs/user-guide/application-troubleshooting/
-  - title: Troubleshooting Clusters
-    path: /docs/admin/cluster-troubleshooting/
-  - title: Debugging Services
-    path: /docs/user-guide/debugging-services/
-
- title: Frequently Asked Questions
-  section:
-  - title: User FAQ
-    path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ/
-  - title: Debugging FAQ
-    path: https://github.com/kubernetes/kubernetes/wiki/Debugging-FAQ/
-  - title: Services FAQ
-    path: https://github.com/kubernetes/kubernetes/wiki/Services-FAQ/
-
- title: Other Resources
-  section:
-  - title: Kubernetes Issue Tracker on GitHub
-    path: https://github.com/kubernetes/kubernetes/issues/
-  - title: Report a Security Vulnerability
-    path: /docs/reporting-security-issues/
-  - title: Release Notes
-    path: https://github.com/kubernetes/kubernetes/releases/
-  - title: Release Roadmap
-    path: https://github.com/kubernetes/kubernetes/milestones/
-  - title: Contributing to Kubernetes Documentation
-    path: /editdocs/
@@ -1,34 +1,208 @@
 bigheader: "Tasks"
-abstract: "Step-by-step instructions for performing operations with Kuberentes."
+abstract: "Step-by-step instructions for performing operations with Kubernetes."
 toc:
- title: Tasks
-  path: /docs/tasks/
- title: Configuring Pods and Containers
-  section:
-  - title: Defining Environment Variables for a Container
-    path: /docs/tasks/configure-pod-container/define-environment-variable-container/
-  - title: Defining a Command and Arguments for a Container
-    path: /docs/tasks/configure-pod-container/define-command-argument-container/
-  - title: Assigning CPU and RAM Resources to a Container
-    path: /docs/tasks/configure-pod-container/assign-cpu-ram-container/
- title: Accessing Applications in a Cluster
-  section:
-  - title: Using Port Forwarding to Access Applications in a Cluster
-    path: /docs/tasks/access-application-cluster/port-forward-access-application-cluster/
+- docs/tasks/index.md

-
- title: Debugging Applications in a Cluster
+- title: Install Tools
  section:
-  - title: Determining the Reason for Pod Failure
-    path: /docs/tasks/debug-application-cluster/determine-reason-pod-failure/
+  - docs/tasks/tools/install-kubectl.md
+  - docs/tasks/tools/install-minikube.md
+  - docs/setup/independent/install-kubeadm.md

-
- title: Accessing the Kubernetes API
+- title: Configure Pods and Containers
  section:
-  - title: Using an HTTP Proxy to Access the Kubernetes API
-    path: /docs/tasks/access-kubernetes-api/http-proxy-access-api/
- title: Administering a Cluster
-  section:
-  - title: Assigning Pods to Nodes
-    path: /docs/tasks/administer-cluster/assign-pods-nodes/
+  - docs/tasks/configure-pod-container/assign-memory-resource.md
+  - docs/tasks/configure-pod-container/assign-cpu-resource.md
+  - docs/tasks/configure-pod-container/quality-service-pod.md
+  - docs/tasks/configure-pod-container/assign-cpu-ram-container.md
+  - docs/tasks/configure-pod-container/extended-resource.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/configure-projected-volume-storage.md
+  - docs/tasks/configure-pod-container/projected-volume.md
+  - docs/tasks/configure-pod-container/security-context.md
+  - docs/tasks/configure-pod-container/environment-variable-expose-pod-information.md
+  - docs/tasks/configure-pod-container/configure-service-account.md
+  - docs/tasks/configure-pod-container/pull-image-private-registry.md
+  - docs/tasks/configure-pod-container/configure-liveness-readiness-probes.md
+  - docs/tasks/configure-pod-container/assign-pods-nodes.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/configmap.md
+  - docs/tasks/configure-pod-container/configure-pod-configmap.md
+  - docs/tools/kompose/user-guide.md

+- title: Inject Data Into Applications
+  section:
+  - docs/tasks/inject-data-application/define-command-argument-container.md
+  - docs/tasks/inject-data-application/define-environment-variable-container.md
+  - docs/tasks/inject-data-application/environment-variable-expose-pod-information.md
+  - docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md
+  - docs/tasks/inject-data-application/distribute-credentials-secure.md
+  - docs/tasks/inject-data-application/podpreset.md
+
+- title: Run Applications
+  section:
+  - docs/tasks/run-application/run-stateless-application-deployment.md
+  - docs/tasks/run-application/run-single-instance-stateful-application.md
+  - docs/tasks/run-application/run-replicated-stateful-application.md
+  - docs/tasks/run-application/update-api-object-kubectl-patch.md
+  - docs/tasks/run-application/upgrade-pet-set-to-stateful-set.md
+  - docs/tasks/run-application/scale-stateful-set.md
+  - docs/tasks/run-application/delete-stateful-set.md
+  - docs/tasks/run-application/force-delete-stateful-set-pod.md
+  - docs/tasks/run-application/rolling-update-replication-controller.md
+  - docs/tasks/run-application/horizontal-pod-autoscale.md
+  - docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md
+  - docs/tasks/run-application/configure-pdb.md
+
+- title: Run 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: Access Applications in a Cluster
+  section:
+  - docs/tasks/access-application-cluster/web-ui-dashboard.md
+  - docs/tasks/access-application-cluster/access-cluster.md
+  - docs/tasks/access-application-cluster/configure-access-multiple-clusters.md
+  - 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/service-access-application-cluster.md
+  - docs/tasks/access-application-cluster/connecting-frontend-backend.md
+  - docs/tasks/access-application-cluster/create-external-load-balancer.md
+  - docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md
+  - docs/tasks/access-application-cluster/list-all-running-container-images.md
+  - docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume.md
+  - title: Configuring DNS for a Cluster
+    path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/cluster-dns
+
+- title: Monitor, Log, and Debug
+  section:
+  - docs/tasks/debug-application-cluster/core-metrics-pipeline.md
+  - docs/tasks/debug-application-cluster/resource-usage-monitoring.md
+  - docs/tasks/debug-application-cluster/get-shell-running-container.md
+  - docs/tasks/debug-application-cluster/monitor-node-health.md
+  - docs/tasks/debug-application-cluster/logging-stackdriver.md
+  - docs/tasks/debug-application-cluster/events-stackdriver.md
+  - docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md
+  - docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
+  - docs/tasks/debug-application-cluster/debug-init-containers.md
+  - docs/tasks/debug-application-cluster/debug-pod-replication-controller.md
+  - docs/tasks/debug-application-cluster/debug-service.md
+  - docs/tasks/debug-application-cluster/debug-cluster.md
+  - docs/tasks/debug-application-cluster/debug-application.md
+  - docs/tasks/debug-application-cluster/debug-stateful-set.md
+  - docs/tasks/debug-application-cluster/debug-application-introspection.md
+  - docs/tasks/debug-application-cluster/audit.md
+  - docs/tasks/debug-application-cluster/local-debugging.md
+  - title: Use Explorer to Examine the Runtime Environment
+    path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer
+
+- title: Extend Kubernetes
+  section:
+  - docs/tasks/access-kubernetes-api/http-proxy-access-api.md
+  - docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions.md
+  - docs/tasks/access-kubernetes-api/extend-api-third-party-resource.md
+  - docs/tasks/access-kubernetes-api/migrate-third-party-resource.md
+  - docs/tasks/access-kubernetes-api/configure-aggregation-layer.md
+  - docs/tasks/access-kubernetes-api/setup-extension-api-server.md
+  - docs/tasks/service-catalog/install-service-catalog-using-helm.md
+  - docs/tasks/service-catalog/install-service-catalog-using-sc.md
+
+- title: TLS
+  section:
+  - docs/tasks/tls/managing-tls-in-a-cluster.md
+  - docs/tasks/tls/certificate-rotation.md
+
+- title: Administer a Cluster
+  section:
+  - title: Manage Memory, CPU, and API Resources
+    section:
+    - docs/tasks/administer-cluster/memory-default-namespace.md
+    - docs/tasks/administer-cluster/cpu-default-namespace.md
+    - docs/tasks/administer-cluster/memory-constraint-namespace.md
+    - docs/tasks/administer-cluster/cpu-constraint-namespace.md
+    - docs/tasks/administer-cluster/apply-resource-quota-limit.md
+    - docs/tasks/administer-cluster/quota-memory-cpu-namespace.md
+    - docs/tasks/administer-cluster/quota-pod-namespace.md
+    - docs/tasks/administer-cluster/quota-api-object.md
+    - docs/tasks/administer-cluster/extended-resource-node.md
+    - docs/tasks/administer-cluster/cpu-management-policies.md
+  - docs/tasks/administer-cluster/access-cluster-api.md
+  - docs/tasks/administer-cluster/access-cluster-services.md
+  - docs/tasks/administer-cluster/securing-a-cluster.md
+  - docs/tasks/administer-cluster/encrypt-data.md
+  - docs/tasks/administer-cluster/configure-upgrade-etcd.md
+  - docs/tasks/administer-cluster/static-pod.md
+  - docs/tasks/administer-cluster/cluster-management.md
+  - docs/tasks/administer-cluster/upgrade-1-6.md
+  - docs/tasks/administer-cluster/kubeadm-upgrade-1-7.md
+  - docs/tasks/administer-cluster/kubeadm-upgrade-1-8.md
+  - docs/tasks/administer-cluster/kubeadm-upgrade-1-9.md
+  - docs/tasks/administer-cluster/namespaces.md
+  - docs/tasks/administer-cluster/namespaces-walkthrough.md
+  - docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
+  - docs/tasks/administer-cluster/coredns.md
+  - docs/tasks/administer-cluster/safely-drain-node.md
+  - docs/tasks/administer-cluster/cpu-memory-limit.md
+  - docs/tasks/administer-cluster/out-of-resource.md
+  - docs/tasks/administer-cluster/reserve-compute-resources.md
+  - docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md
+  - docs/tasks/administer-cluster/declare-network-policy.md
+  - docs/tasks/administer-cluster/reconfigure-kubelet.md
+  - docs/tasks/administer-cluster/kubelet-config-file.md
+  - title: Install Network Policy Provider
+    section:
+    - docs/tasks/administer-cluster/calico-network-policy.md
+    - docs/tasks/administer-cluster/cilium-network-policy.md
+    - docs/tasks/administer-cluster/kube-router-network-policy.md
+    - docs/tasks/administer-cluster/romana-network-policy.md
+    - docs/tasks/administer-cluster/weave-network-policy.md
+  - docs/tasks/administer-cluster/change-pv-reclaim-policy.md
+  - docs/tasks/administer-cluster/configure-pod-disruption-budget.md
+  - docs/tasks/administer-cluster/limit-storage-consumption.md
+  - docs/tasks/administer-cluster/change-default-storage-class.md
+  - docs/tasks/administer-cluster/running-cloud-controller.md
+  - docs/tasks/administer-cluster/developing-cloud-controller-manager.md
+  - docs/tasks/administer-cluster/highly-available-master.md
+  - docs/tasks/administer-cluster/configure-multiple-schedulers.md
+  - docs/tasks/administer-cluster/ip-masq-agent.md
+  - docs/tasks/administer-cluster/dns-custom-nameservers.md
+  - docs/tasks/administer-cluster/pvc-protection.md
+
+- title: Federation - Run an App on Multiple Clusters
+  section:
+  - docs/tasks/federation/federation-service-discovery.md
+  - docs/tasks/federation/set-up-cluster-federation-kubefed.md
+  - docs/tasks/federation/set-up-coredns-provider-federation.md
+  - docs/tasks/federation/set-up-placement-policies-federation.md
+  - docs/tasks/administer-federation/cluster.md
+  - 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/hpa.md
+  - docs/tasks/administer-federation/ingress.md
+  - docs/tasks/administer-federation/job.md
+  - docs/tasks/administer-federation/namespaces.md
+  - docs/tasks/administer-federation/replicaset.md
+  - docs/tasks/administer-federation/secret.md
+
+- title: Manage Cluster Daemons
+  section:
+  - docs/tasks/manage-daemon/update-daemon-set.md
+  - docs/tasks/manage-daemon/rollback-daemon-set.md
+
+- title: Manage GPUs
+  section:
+  - docs/tasks/manage-gpus/scheduling-gpus.md
+
+- title: Manage HugePages
+  section:
+  - docs/tasks/manage-hugepages/scheduling-hugepages.md
+
+- title: Extend kubectl with plugins
+  section:
+  - docs/tasks/extend-kubectl/kubectl-plugins.md
@@ -1,5 +1,22 @@
 bigheader: "Tools"
 abstract: "Tools to help you use and enhance Kubernetes."
 toc:
- title: Tools
-  path: /docs/tools/
+- docs/tools/index.md
+
+- title: Native Tools
+  section:
+  - title: Kubectl
+    path: /docs/reference/kubectl/overview/
+  - title: Kubeadm
+    path: /docs/getting-started-guides/kubeadm
+  - title: Kubefed
+    path: /docs/admin/federation/kubefed/
+  - title: Kubernetes Dashboard
+    path: /docs/user-guide/ui/
+  
+- title: Third-Party Tools
+  section:
+  - docs/tools/kompose/index.md
+  - docs/tools/kompose/user-guide.md
+  - title: Helm
+    path: https://github.com/kubernetes/helm
@@ -1,57 +1,69 @@
 bigheader: "Tutorials"
 abstract: "Detailed walkthroughs of common Kubernetes operations and workflows."
 toc:
- title: Tutorials
-  path: /docs/tutorials/
+- docs/tutorials/index.md
 - title: Kubernetes Basics
  section:
-  - title: Overview
-    path: /docs/tutorials/kubernetes-basics/
+  - docs/tutorials/kubernetes-basics/index.html
  - title: 1. Create a Cluster
    section:
-    - title: Using Minikube to Create a Cluster
-      path: /docs/tutorials/kubernetes-basics/cluster-intro/
-    - title: Interactive Tutorial - Creating a Cluster
-      path: /docs/tutorials/kubernetes-basics/cluster-interactive/
+    - docs/tutorials/kubernetes-basics/cluster-intro.html
+    - docs/tutorials/kubernetes-basics/cluster-interactive.html
  - title: 2. Deploy an App
    section:
-    - title: Using kubectl to Create a Deployment
-      path: /docs/tutorials/kubernetes-basics/deploy-intro/
-    - title: Interactive Tutorial - Deploying an App
-      path: /docs/tutorials/kubernetes-basics/deploy-interactive/
+    - docs/tutorials/kubernetes-basics/deploy-intro.html
+    - docs/tutorials/kubernetes-basics/deploy-interactive.html
  - title: 3. Explore Your App
    section:
-    - title: Viewing Pods and Nodes
-      path: /docs/tutorials/kubernetes-basics/explore-intro/
-    - title: Interactive Tutorial - Exploring Your App
-      path: /docs/tutorials/kubernetes-basics/explore-interactive/
+    - docs/tutorials/kubernetes-basics/explore-intro.html
+    - docs/tutorials/kubernetes-basics/explore-interactive.html
  - title: 4. Expose Your App Publicly
    section:
-    - title: Using a Service to Expose Your App
-      path: /docs/tutorials/kubernetes-basics/expose-intro/
-    - title: Interactive Tutorial - Exposing Your App
-      path: /docs/tutorials/kubernetes-basics/expose-interactive/
+    - docs/tutorials/kubernetes-basics/expose-intro.html
+    - docs/tutorials/kubernetes-basics/expose-interactive.html
  - title: 5. Scale Your App
    section:
-    - title: Running Multiple Instances of Your App
-      path: /docs/tutorials/kubernetes-basics/scale-intro/
-    - title: Interactive Tutorial - Scaling Your App
-      path: /docs/tutorials/kubernetes-basics/scale-interactive/
+    - docs/tutorials/kubernetes-basics/scale-intro.html
+    - docs/tutorials/kubernetes-basics/scale-interactive.html
  - title: 6. Update Your App
    section:
-    - title: Performing a Rolling Update
-      path: /docs/tutorials/kubernetes-basics/update-intro/
-    - title: Interactive Tutorial - Updating Your App
-      path: /docs/tutorials/kubernetes-basics/update-interactive/
+    - docs/tutorials/kubernetes-basics/update-intro.html
+    - docs/tutorials/kubernetes-basics/update-interactive.html
+- title: Online Training Courses
+  section:
+  - title: Scalable Microservices with Kubernetes (Udacity)
+    path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615
+  - title: Introduction to Kubernetes (edX)
+    path: https://www.edx.org/course/introduction-kubernetes-linuxfoundationx-lfs158x#
+- docs/tutorials/stateless-application/hello-minikube.md
+- docs/user-guide/walkthrough/index.md
+- docs/user-guide/walkthrough/k8s201.md
+- title: Configuration
+  section:
+  - docs/tutorials/configuration/configure-redis-using-configmap.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:
-  - title: Running a Stateless Application Using a Deployment
-    path: /docs/tutorials/stateless-application/run-stateless-application-deployment/
-  - title: Using a Service to Access an Application in a Cluster
-    path: /docs/tutorials/stateless-application/expose-external-ip-address-service/
-  - title: Exposing an External IP Address to Access an Application in a Cluster
-    path: /docs/tutorials/stateless-application/expose-external-ip-address/
+  - docs/tasks/run-application/run-stateless-application-deployment.md
+  - docs/tutorials/stateless-application/guestbook.md
+  - docs/tasks/access-application-cluster/service-access-application-cluster.md
+  - docs/tutorials/stateless-application/expose-external-ip-address.md
 - title: Stateful Applications
  section:
-  - title: Running a Single-Instance Stateful Application
-    path: /docs/tutorials/stateful-application/run-stateful-application/
+  - docs/tutorials/stateful-application/basic-stateful-set.md
+  - docs/tasks/run-application/run-single-instance-stateful-application.md
+  - docs/tasks/run-application/run-replicated-stateful-application.md
+  - docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md
+  - docs/tutorials/stateful-application/cassandra.md
+  - docs/tutorials/stateful-application/zookeeper.md
+- title: Clusters
+  section:
+  - docs/tutorials/clusters/apparmor.md
+- title: Services
+  section:
+  - docs/tutorials/services/source-ip.md
@@ -0,0 +1,2 @@
+The topics in the `/docs/api-reference/` section of the Kubernetes docs
+are being moved to the [Reference](/docs/reference/) section. The content in this topic has moved to:
@@ -1,313 +0,0 @@
-<style>
-	#caseStudyTitle {
-		margin-top: 1em !important;
-	}
-	
-	.gridPage p {
-		color: rgb(26,26,26) !important;
-		margin-left: 0 !important;
-		padding-left: 0 !important;
-		font-weight: 300 !important;
-	}
-
-	.gridPage #mainContent {
-		padding: 0;
-	}
-
-	.gridPage #mainContent .content {
-		padding-top: 0;
-	}
-
-	.gridPage main {
-		max-width: 1100px !important;
-	}
-
-	.gridPage .content {
-		position: relative;
-		margin: 0 auto 50px;
-		max-width: 90%;
-	}
-
-	.gridPage .content p {
-		line-height: 24px !important;
-	}
-
-	.gridPage .content h3 {
-		padding: 0 !important;
-	}
-	
-	.gridPage #hero h5 {
-		padding-left: 20px;
-		margin: 0;
-	}
-	
-	.case-studies {
-		position: relative;
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-		margin-top: 50px;
-	}
-	
-	.case-study {
-		position: relative;
-		width: 50%;
-		padding: 0 40px 0 242px;
-		margin-bottom: 60px;
-		min-height: 152px;
-	}
-	
-	.case-study:nth-child(3), .case-study:nth-child(4) {
-		margin-bottom: 0;
-	}
-	
-	.case-study img {
-		position: absolute;
-		top: 0;
-		left: 0;
-	}
-
-	.gridPage #mainContent .content .case-study p {
-		font-family: "Roboto", sans-serif;
-		font-size: 16px;
-		padding: 0;
-	}
-	
-	p.attrib {
-		font-style: italic;
-	}
-	
-	.gridPage #video {
-		background: #f9f9f9;
-		height: auto;
-		/*height: 340px;*/
-	}
-	
-	.gridPage #video main {
-		position: relative;
-		max-width: 900px !important;
-		height: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		padding: 50px 20px;
-	}
-
-	.gridPage #video main > div {
-		width: 50%;
-	}
-
-	.gridPage #video main #zulilyLogo {
-		width: 100px;
-	}
-
-	.gridPage #video main img {
-		max-width: 100%;
-	}
-
-	.gridPage #video h3 {
-		font-size: 32px;
-		font-weight: 300;
-		line-height: 38px;
-		max-width: 80%;
-		margin: 0 0 1em 0;
-	}
-
-	.gridPage #video p {
-		margin: 0;
-	}
-
-	.gridPage #video p.attrib {
-		margin-bottom: 20px;
-	}
-	
-	.gridPage #video button > h6 {
-		font-size: 18px;
-		font-weight: 500;
-		margin: 1em 0;
-		color: #326de6;
-	}
-	
-	.gridPage #users {
-		padding: 50px;
-	}
-
-	.gridPage #users main {
-		max-width: 1150px !important;
-	}
-
-	.gridPage #users main h3 {
-		padding-left: 20px;
-		margin-bottom: 20px;
-	}
-	
-	.gridPage #usersGrid {
-		position: relative;
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: center;
-	}
-
-	.gridPage #usersGrid a {
-		display: inline-block;
-		margin: 5px;
-	}
-
-	.gridPage #usersGrid a img {
-		box-shadow: 1px 1px 2px transparent;
-		transition: box-shadow 0.25s;
-	}
-
-	.gridPage #usersGrid a img:hover {
-		box-shadow: 1px 1px 2px #cccccc;
-	}
-
-	.gridPage #usersGrid a:last-child img,
-	.gridPage #usersGrid a:last-child img:hover {
-		box-shadow: 1px 1px 2px transparent;
-	}
-	
-	.tell-your-story {
-		border: 1px solid #dddddd;
-		border-radius: 6px;
-		box-shadow: 1px 2px 2px #dddddd;
-	}
-	
-	.gridPage .feature {
-		position: relative;
-		padding: 20px 0 20px 242px;
-	}
-	
-	.gridPage .feature img {
-		position: absolute;
-		top: 20px;
-		left: 0;
-	}
-	
-	section.bullets {
-		background-color: #eeeeee;
-		margin-bottom: 50px;
-	}
-	
-	section.bullets main {
-		position: relative;
-		max-width: 1100px;
-		padding: 50px 0;
-	}
-	
-	section.bullets .content {
-		position: relative;
-		display: flex;
-		flex-wrap: wrap;
-		margin-bottom: 0 !important;
-	}
-	
-	.bullet {
-		position: relative;
-		width: 50%;
-		padding: 15px 30px;
-	}
-	
-	.bullet h4 {
-		margin-bottom: 0.5em;
-	}
-	
-	.bullet li {
-		margin-left: 1.25em;
-		list-style: disc;
-		font-weight: 300;
-		color: rgb(26,26,26);
-		line-height: 1.5em;
-		margin-bottom: 0.5em;
-	}
-	
-	.details h4, p {
-		margin-bottom: 0.5em;
-	}
-	
-	.gridPage .feature p.quote {
-		font-size: 20px;
-		line-height: 28px !important;
-	}
-	
-	@media screen and (max-width: 1024px){
-		.case-study {
-			padding: 0 10%;
-			margin-bottom: 50px;
-		}
-
-		.case-study img {
-			position: relative;
-		}
-
-		.case-study p.quote {
-			margin-top: 20px !important;
-		}
-
-		.case-study p.attrib {
-			font-style: italic;
-		}
-	}
-
-	@media screen and (max-width: 900px){
-		.gridPage #video main {
-			flex-direction: column;
-			align-items: center;
-		}
-
-		.gridPage #video main > div {
-			width: 400px;
-		}
-
-		.gridPage #video main > div + div {
-			margin-top: 30px;
-		}
-
-		.gridPage #video h3 {
-			max-width: 100%;
-		}
-	}
-
-	@media screen and (max-width: 640px){
-		.case-study {
-			width: 100%;
-		}
-
-		.case-study:nth-child(3) {
-			margin-bottom: 60px;
-		}
-
-		.case-study img {
-			left: 50%;
-			transform: translateX(-50%);
-		}
-
-		.gridPage .feature {
-			margin-top: 50px;
-			padding: 180px 0 0;
-		}
-
-		.gridPage .feature img {
-			top: 0;
-			left: 50%;
-			transform: translateX(-50%);
-		}
-	}
-
-	@media screen and (max-width: 480px){
-		.gridPage #hero {
-			padding-right: 20px;
-			padding-left: 20px;
-		}
-
-		.gridPage #video main > div {
-			width: 80%;
-			min-width: 280px;
-		}
-
-		.bullet {
-			width: 100%;
-		}
-	}
-</style>
-
@@ -1,11 +1,26 @@
 {% capture samplecode %}{% include_relative {{include.file}} %}{% endcapture %}
 {% if include.k8slink %}{% capture ghlink %}https://raw.githubusercontent.com/kubernetes/kubernetes/blob/{{page.githubbranch}}{{include.k8slink}}{% endcapture %}{% endif %}
-{% if include.ghlink %}{% capture ghlink %}https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/{{page.docsbranch}}{{include.ghlink}}{% endcapture %}{% endif %}
+{% if include.ghlink %}{% capture ghlink %}https://raw.githubusercontent.com/kubernetes/website/{{page.docsbranch}}{{include.ghlink}}{% endcapture %}{% endif %}
 {% capture mysample %}
 ```{{include.language}}
 {{ samplecode | raw | strip }}
 ```
 {: id="{{include.file | handleize}}"}
 {% endcapture %}
-<table class="includecode"><thead><tr><th>{% if ghlink %}<a href="{{ghlink}}" download="{{include.file}}">{% endif %}<code>{{include.file}}</code></a><img src="/images/copycode.svg" style="max-height:24px" onClick="copyCode('{{include.file | handleize}}')" title="Copy {{include.file}} to clipboard"></th></tr></thead>
-<tr><td>{{ mysample | markdownify }}</td></tr></table>
+<table class="includecode">
+    <thead>
+        <tr>
+            <th>
+                {% if ghlink %}<a href="{{ghlink}}" download="{{include.file}}">{% endif %}
+                    <code>{{include.file}}</code>
+                {% if ghlink %}</a>{% endif %}
+                <img src="/images/copycode.svg" style="max-height:24px" onclick="copyCode('{{include.file | handleize}}')" title="Copy {{include.file}} to clipboard">
+            </th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{ mysample | markdownify }}</td>
+        </tr>
+    </tbody>
+</table>
@@ -0,0 +1,6 @@
+You need to either have a dynamic PersistentVolume provisioner with a default
+[StorageClass](/docs/concepts/storage/storage-classes/),
+or [statically provision PersistentVolumes](/docs/user-guide/persistent-volumes/#provisioning)
+yourself to satisfy the [PersistentVolumeClaims](/docs/user-guide/persistent-volumes/#persistentvolumeclaims)
+used here.
+
@@ -0,0 +1,12 @@
+{% if page.deprecated %}
+<section id="deprecationWarning">
+  <main>
+    <div class="content deprecation-warning">
+      <h3>
+        Documentation for Kubernetes {{ page.version}} is no longer actively maintained. The version you are currently viewing is a static snapshot.
+        For up-to-date documentation, see the <a href="{{ page.currentUrl }}">latest</a> version.
+      </h3>
+    </div>
+  </main>
+</section>
+{% endif %}
--- a/Show More
+++ b/Show More