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
5835 changed files with 336265 additions and 786077 deletions
@@ -1,6 +1,11 @@
-> NOTE: Please check the “Allow edits from maintainers” box (see image below) to  
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> 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)
@@ -1,29 +1,20 @@
 language: go
 go:
-  - 1.8.1
+  - 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
+- 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/kubernetes.github.io/test
+- 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/

-# (2) Fetch md-check along with all its dependencies.
- 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
-
-# (3) Fetch mungedocs
- go get -v k8s.io/kubernetes/cmd/mungedocs
-
 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
- $GOPATH/bin/mungedocs --verbose --verify --upstream=origin --root-dir=$HOME/gopath/src/k8s.io/kubernetes.github.io/docs/ --repo-root=$HOME/gopath/src/k8s.io/kubernetes.github.io --skip-munges=remove-whitespace,blank-lines-surround-preformatted,header-lines,sync-examples,analytics,analytics,kubectl-dash-f,table-of-contents,md-links,kubectl-dash-f
@@ -1 +0,0 @@
-kubernetes.io
@@ -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/home/contribute/style-guide/) and follow the [instructions for using page templates](http://kubernetes.io/docs/home/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,10 +26,10 @@ 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

@@ -1,4 +1,53 @@
 source "https://rubygems.org"

-gem "github-pages", group: :jekyll_plugins
+# 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,123 +1,61 @@
 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.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
+    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.12.2)
    colorator (1.1.0)
-    ethon (0.10.1)
+    ethon (0.11.0)
      ffi (>= 1.3.0)
    execjs (2.7.0)
-    faraday (0.10.0)
+    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)
-    github-pages (112)
-      activesupport (= 4.2.7)
-      github-pages-health-check (= 1.3.0)
-      jekyll (= 3.3.1)
-      jekyll-avatar (= 0.4.2)
-      jekyll-coffeescript (= 1.0.1)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.8.0)
-      jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 2.2.0)
-      jekyll-mentions (= 1.2.0)
-      jekyll-optional-front-matter (= 0.1.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.0.3)
-      jekyll-redirect-from (= 0.11.0)
-      jekyll-relative-links (= 0.2.1)
-      jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 2.1.0)
-      jekyll-sitemap (= 0.12.0)
-      jekyll-swiss (= 0.4.0)
-      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.5)
-      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.3)
-      jemoji (= 0.7.0)
-      kramdown (= 1.11.1)
-      liquid (= 3.0.6)
-      listen (= 3.0.6)
-      mercenary (~> 0.3)
-      minima (= 2.0.0)
-      rouge (= 1.11.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.3.0)
-      addressable (~> 2.3)
-      net-dns (~> 0.8)
-      octokit (~> 4.0)
-      public_suffix (~> 2.0)
-      typhoeus (~> 0.7)
-    html-pipeline (2.4.2)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
-    i18n (0.7.0)
-    jekyll (3.3.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.4.2)
+    jekyll-avatar (0.5.0)
      jekyll (~> 3.0)
    jekyll-coffeescript (1.0.1)
      coffee-script (~> 2.2)
    jekyll-default-layout (0.1.4)
      jekyll (~> 3.0)
-    jekyll-feed (0.8.0)
+    jekyll-feed (0.9.2)
      jekyll (~> 3.3)
-    jekyll-gist (1.4.0)
+    jekyll-gist (1.4.1)
      octokit (~> 4.2)
-    jekyll-github-metadata (2.2.0)
+    jekyll-github-metadata (2.9.3)
      jekyll (~> 3.1)
      octokit (~> 4.0, != 4.4.0)
    jekyll-include-cache (0.1.0)
      jekyll (~> 3.3)
-    jekyll-mentions (1.2.0)
-      activesupport (~> 4.0)
-      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-optional-front-matter (0.1.2)
+    jekyll-optional-front-matter (0.3.0)
      jekyll (~> 3.0)
    jekyll-paginate (1.1.0)
    jekyll-readme-index (0.0.3)
      jekyll (~> 3.0)
-    jekyll-redirect-from (0.11.0)
-      jekyll (>= 2.0)
-    jekyll-relative-links (0.2.1)
+    jekyll-redirect-from (0.12.1)
      jekyll (~> 3.3)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-seo-tag (2.1.0)
+    jekyll-relative-links (0.5.1)
      jekyll (~> 3.3)
-    jekyll-sitemap (0.12.0)
+    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)
@@ -138,66 +76,101 @@ GEM
      jekyll (~> 3.3)
    jekyll-theme-modernist (0.0.3)
      jekyll (~> 3.3)
-    jekyll-theme-primer (0.1.5)
-      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.1.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 (2.0.0)
-    minitest (5.10.1)
+    method_source (0.9.0)
+    minima (2.1.1)
+      jekyll (~> 3.3)
    multipart-post (2.0.0)
-    net-dns (0.8.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    octokit (4.6.2)
+    octokit (4.7.0)
      sawyer (~> 0.8.0, >= 0.5.3)
-    pathutil (0.14.0)
+    pathutil (0.16.0)
      forwardable-extended (~> 2.6)
-    public_suffix (2.0.4)
-    rb-fsevent (0.9.8)
-    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.23)
+    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.7.3)
-      unicode-display_width (~> 1.1.1)
-    thread_safe (0.3.5)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.1.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.3.0)

 PLATFORMS
  ruby

 DEPENDENCIES
-  github-pages
+  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-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.13.6
+   1.15.4
@@ -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,6 +1,6 @@
-assignees:
- smarterclayton
- janetkuo
- pwittrock
- kelseyhightower
- jaredbhatti
+reviewers:
+- a-mccarthy
+- abiogenesis-now
+- bradamant3
+- steveperry-53
+- zacharysarah
@@ -4,11 +4,14 @@ Welcome! We are very pleased you want to contribute to the Kubernetes documentat

 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:

 * [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/)
@@ -18,10 +18,39 @@ defaults:
    scope:
      path: ""
    values:
-      fullversion: "v1.7.0"
-      version: "v1.7"
+      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"
@@ -31,12 +60,15 @@ 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
@@ -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.
@@ -20,11 +20,21 @@ toc:
  section:
  - docs/concepts/architecture/nodes.md
  - docs/concepts/architecture/master-node-communication.md
+  - docs/concepts/architecture/cloud-controller.md

- title: Extending the Kubernetes API
+- title: Extending Kubernetes
  section:
-  - docs/concepts/api-extension/custom-resources.md
-  - docs/concepts/api-extension/apiserver-aggregation.md  
+  - 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:
@@ -40,6 +50,7 @@ toc:
    - 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:
@@ -47,7 +58,6 @@ toc:
    - docs/concepts/workloads/controllers/replicationcontroller.md
    - docs/concepts/workloads/controllers/deployment.md
    - docs/concepts/workloads/controllers/statefulset.md
-    - docs/concepts/workloads/controllers/petset.md
    - docs/concepts/workloads/controllers/daemonset.md
    - docs/concepts/workloads/controllers/garbage-collection.md
    - docs/concepts/workloads/controllers/jobs-run-to-completion.md
@@ -58,7 +68,10 @@ toc:
  - 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:
@@ -73,12 +86,14 @@ toc:
  section:
  - docs/concepts/storage/volumes.md
  - docs/concepts/storage/persistent-volumes.md
-  - title: Dynamic Provisioning
-    path: http://blog.kubernetes.io/2016/10/dynamic-provisioning-and-storage-in-kubernetes.html
+  - 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
@@ -90,6 +105,7 @@ toc:
  - 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
@@ -3,8 +3,6 @@ abstract: "Documentation for using and learning about Kubernetes."
 toc:
 - docs/home/index.md

- docs/home/index.md
-
 - title: Release Notes
  path: https://git.k8s.io/kubernetes/CHANGELOG.md
 - title: Release Roadmap
@@ -21,3 +19,4 @@ toc:
  - docs/home/contribute/page-templates.md
  - docs/home/contribute/review-issues.md
  - docs/home/contribute/style-guide.md
+  - docs/home/contribute/includes.md
@@ -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,4 +1,5 @@
 overrides:
+- 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
@@ -7,4 +8,3 @@ overrides:
 - path: docs/admin/kube-scheduler.md
 - path: docs/admin/kubelet.md
 - 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
@@ -2,10 +2,12 @@ bigheader: "Reference Documentation"
 abstract: "Design docs, concept definitions, and references for APIs and CLIs."
 toc:
 - docs/reference/index.md
+- docs/reference/glossary.md

 - title: Using the API
  section:
  - docs/reference/api-overview.md
+  - docs/reference/client-libraries.md
  - title: Accessing the API
    section:
    - docs/admin/accessing-the-api.md
@@ -22,15 +24,12 @@ toc:
    - docs/admin/authorization/node.md
    - docs/admin/authorization/webhook.md
  - docs/reference/deprecation-policy.md
+  - docs/reference/workloads-18-19.md

 - title: API Reference
  section:
-  - title: v1.7
-    path: /docs/api-reference/v1.7/
-  - title: v1.6
-    path: /docs/api-reference/v1.6/
-  - title: v1.5
-    path: /docs/api-reference/v1.5/
+  - title: v1.9
+    path: /docs/reference/generated/kubernetes-api/v1.9/
  - docs/reference/labels-annotations-taints.md
  - title: OpenAPI and Swagger
    section:
@@ -41,57 +40,73 @@ toc:

 - title: Federation API
  section:
-    - docs/reference/federation/v1/operations.html
-    - docs/reference/federation/v1/definitions.html
-    - docs/reference/federation/v1beta1/operations.html
-    - docs/reference/federation/v1beta1/definitions.html
-    - docs/reference/federation/extensions/v1beta1/operations.html
-    - docs/reference/federation/extensions/v1beta1/definitions.html
+    - 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:
-  - docs/user-guide/kubectl-overview.md
-  - title: v1.7 Commands
-    path: /docs/user-guide/kubectl/v1.7/
-  - title: v1.6 Commands
-    path: /docs/user-guide/kubectl/v1.6/
-  - title: v1.5 Commands
-    path: /docs/user-guide/kubectl/v1.5/
-  - docs/user-guide/docker-cli-to-kubectl.md
-  - docs/user-guide/kubectl-conventions.md
-  - docs/user-guide/jsonpath.md
-  - docs/user-guide/kubectl-cheatsheet.md
+  - 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

- docs/admin/kubeadm.md
-
- title: Config Reference
+- title: Setup Tools Reference
  section:
-  - docs/admin/kubelet.md
-  - docs/admin/kube-apiserver.md
-  - docs/admin/kube-controller-manager.md
-  - docs/admin/kube-proxy.md
-  - docs/admin/kube-scheduler.md
-  - docs/admin/federation-apiserver.md
-  - docs/admin/federation-controller-manager.md
+  - title: Kubeadm
+    section:
+    - 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: Command-line Tools Reference
+  section:
+  - 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://git.k8s.io/community/contributors/design-proposals/architecture.md
+    path: https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md
  - title: Kubernetes Design Overview
    path: https://github.com/kubernetes/kubernetes/tree/release-1.6/docs/design
  - title: Kubernetes Identity and Access Management
-    path: https://git.k8s.io/community/contributors/design-proposals/access.md
+    path: https://git.k8s.io/community/contributors/design-proposals/auth/access.md
  - docs/admin/ovs-networking.md
  - title: Security Contexts
-    path: https://git.k8s.io/community/contributors/design-proposals/security_context.md
+    path: https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md
  - title: Security in Kubernetes
-    path: https://git.k8s.io/community/contributors/design-proposals/security.md
+    path: https://git.k8s.io/community/contributors/design-proposals/auth/security.md

 - title: Kubernetes Issues and Security
  section:
  - title: Kubernetes Issue Tracker on GitHub
    path: https://github.com/kubernetes/kubernetes/issues/
  - docs/reference/security.md
-
-
@@ -12,26 +12,28 @@ toc:
    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 Container Engine
-    path: https://cloud.google.com/container-engine/docs/before-you-begin/
+  - 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 Bluemix Container Service
-    path: https://console.ng.bluemix.net/docs/containers/container_index.html
+  - 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 Bluemix
+  - title: Running Kubernetes on IBM Cloud
    path: https://github.com/patrocinio/kubernetes-softlayer
  - docs/getting-started-guides/stackpoint.md

@@ -93,7 +95,6 @@ toc:
        - 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/ubuntu/manual.md

    - docs/getting-started-guides/windows/index.md

@@ -11,7 +11,11 @@ toc:

 - title: Configure Pods and Containers
  section:
+  - 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
@@ -42,6 +46,7 @@ toc:
  - 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
@@ -61,7 +66,7 @@ toc:
  section:
  - docs/tasks/access-application-cluster/web-ui-dashboard.md
  - docs/tasks/access-application-cluster/access-cluster.md
-  - docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig.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
@@ -75,6 +80,7 @@ toc:

 - 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
@@ -90,10 +96,11 @@ toc:
  - 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: Access and Extend the Kubernetes API
+- 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
@@ -101,47 +108,69 @@ toc:
  - 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/apply-resource-quota-limit.md
-  - docs/tasks/administer-cluster/out-of-resource.md
-  - docs/tasks/administer-cluster/cpu-memory-limit.md
-  - docs/tasks/administer-cluster/reserve-compute-resources.md
  - docs/tasks/administer-cluster/static-pod.md
-  - docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.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/calico-network-policy.md
-  - docs/tasks/administer-cluster/romana-network-policy.md
-  - docs/tasks/administer-cluster/weave-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/share-configuration.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
-  - title: Change Cluster Size
-    path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ#how-do-i-change-the-size-of-my-cluster/
+  - docs/tasks/administer-cluster/pvc-protection.md

 - title: Federation - Run an App on Multiple Clusters
  section:
@@ -154,7 +183,9 @@ toc:
  - 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
@@ -168,4 +199,10 @@ toc:
  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
@@ -6,7 +6,7 @@ toc:
 - title: Native Tools
  section:
  - title: Kubectl
-    path: /docs/user-guide/kubectl/
+    path: /docs/reference/kubectl/overview/
  - title: Kubeadm
    path: /docs/getting-started-guides/kubeadm
  - title: Kubefed
@@ -29,9 +29,15 @@ toc:
    section:
    - docs/tutorials/kubernetes-basics/update-intro.html
    - docs/tutorials/kubernetes-basics/update-interactive.html
- title: Online Training Course
-  path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615
+- 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
@@ -61,4 +67,3 @@ toc:
 - title: Services
  section:
  - docs/tutorials/services/source-ip.md
-
@@ -1,6 +1,6 @@
 {% 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 }}
@@ -1,5 +1,5 @@
 You need to either have a dynamic PersistentVolume provisioner with a default
-[StorageClass](/docs/user-guide/persistent-volumes/#storageclasses),
+[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 %}
@@ -25,7 +25,7 @@
            </div>
        </div>
        <div id="miceType" class="center">
-            &copy; {{ 'now' | date: "%Y" }} The Kubernetes Authors | Documentation Distributed under <a href="https://git.k8s.io/kubernetes.github.io/LICENSE" class="light-text">CC BY 4.0</a>
+            &copy; {{ 'now' | date: "%Y" }} The Kubernetes Authors | Documentation Distributed under <a href="https://git.k8s.io/website/LICENSE" class="light-text">CC BY 4.0</a>
        </div>
        <div id="miceType" class="center">
            Copyright &copy; {{ 'now' | date: "%Y" }} The Linux Foundation&reg;. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page: <a href="https://www.linuxfoundation.org/trademark-usage" class="light-text">https://www.linuxfoundation.org/trademark-usage</a>
@@ -4,10 +4,14 @@
    <link rel="shortcut icon" type="image/png" href="/images/favicon.png">
    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic">
    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto+Mono">
-    <link rel="stylesheet" type="text/css" href="/css/styles.css">
+    {% if page.case_study_styles %}<link rel="stylesheet" type="text/css" href="/css/case_study_styles.css"><!-- custom case_study_styles on -->{% else %}<link rel="stylesheet" type="text/css" href="/css/styles.css"><!-- default styles.css on -->{% endif %}
    <link rel="stylesheet" type="text/css" href="/css/jquery-ui.min.css">
    <link rel="stylesheet" type="text/css" href="/css/sweetalert.css">
+    <link rel="stylesheet" type="text/css" href="/css/callouts.css">
+    <link rel="stylesheet" type="text/css" href="/css/custom-jekyll/tags.css">
+    {% if page.deprecated %}<link rel="stylesheet" type="text/css" href="/css/deprecation-warning.css">{% endif %}
    {% if page.class == "gridPage" %}<link rel="stylesheet" type="text/css" href="/css/gridpage.css">{% endif %}
+    {% if page.css %}<link rel="stylesheet" type="text/css" href="{{ page.css }}"><!-- custom css added -->{% else %}<!-- no custom css detected -->{% endif %}

    {% if page.description %}
    <meta name="description" content="{{ page.description }}" />
@@ -20,5 +24,6 @@
    <script src="/js/script.js"></script>
    <script src="/js/sweetalert.min.js"></script>
    <script src="/js/bootstrap.min.js"></script>
+    <script src="/js/custom-jekyll/tags.js"></script>
    {% seo %}
 </head>
@@ -10,6 +10,17 @@
            <li><a href="/partners/">Partners</a></li>
            <li><a href="/community/">Community</a></li>
            <li><a href="/case-studies/">Case Studies</a></li>
+            <li>
+                <a href="#">
+                    {{page.version}} <span class="ui-icon ui-icon-carat-1-s"></span>
+                </a>
+                <ul>
+                {% for version in page.versions %}
+                  <li><a href="{{ version.url }}">{{ version.version }}</a></li>
+                {% endfor %}
+                </ul>
+              </li>
+            </li>
        </ul>
        <!-- <a href="/docs/home" class="button" id="viewDocs" data-auto-burger-exclude>View Documentation</a> -->
        <a href="/docs/tutorials/kubernetes-basics/" class="button" id="tryKubernetes" data-auto-burger-exclude>Try Kubernetes</a>
@@ -1,5 +1,97 @@
+/*  SECTIONS  */
+.section {
+	clear: both;
+	padding: 0px;
+	margin-bottom: 2em;
+}
+
+.kcsp_section {
+	clear: both;
+	padding: 0px;
+	margin-bottom: 2em;
+}
+
+/*  COLUMN SETUP  */
+.col {
+	display: block;
+	float:left;
+	margin: 1% 0 1% 1.6%;
+	background-color: #f9f9f9;
+}
+.col:first-child { margin-left: 0; }
+
+
+/*  GROUPING  */
+.group:before,
+.group:after {
+	content:"";
+	display:table;
+}
+.group:after {
+	clear:both;
+}
+.group {
+    zoom:1; /* For IE 6/7 */
+}
+
+/*  GRID OF FOUR  */
+.span_4_of_4 {
+	width: 23%;
+	background-color: #f9f9f9;
+	padding: 20px;
+}
+.span_3_of_4 {
+	width: 23%;
+	background-color: #f9f9f9;
+	padding: 20px;
+}
+.span_2_of_4 {
+	width: 23%;
+	background-color: #f9f9f9;
+	padding: 20px;
+}
+.span_1_of_4 {
+	width: 23%;
+	background-color: #f9f9f9;
+	padding: 20px;
+}
+
+.col-container {
+    display: table; /* Make the container element behave like a table */
+    width: 100%; /* Set full-width to expand the whole page */
+		padding-bottom: 80px;
+}
+
+.col-nav {
+    display: table-cell; /* Make elements inside the container behave like table cells */
+		width: 25%;
+		background-color: #f9f9f9;
+		padding: 20px;
+		border: 5px solid white;
+}
+
+/*  GO FULL WIDTH AT LESS THAN 480 PIXELS */
+
+@media only screen and (max-width: 480px) {
+	.col { margin: 1% 0 1% 0%;}
+	.span_4_of_4, .span_3_of_4, .span_2_of_4, .span_1_of_4 { width: 100%; }
+}
+
+@media only screen and (max-width: 650px) {
+    .col-nav {
+        display: block;
+        width: 100%;
+    }
+}
+
+.button{
+  max-width: 100%;
+	line-height: 14px;
+	padding: 15px;
+ }
+
 h5 {
-	font-size: 18px;
+	font-size: 16px;
 	line-height: 1.5em;
 	margin-bottom: 2em;
 }
@@ -9,7 +101,7 @@ h5 {
 	background-color: #f9f9f9;
 }

-#isvContainer, #servContainer {
+#distContainer, #kcspContainer, #isvContainer, #servContainer {
 	position: relative;
 	width: 100%;
 	display: flex;
@@ -21,6 +113,14 @@ h5 {
 	margin-bottom: 80px;
 }

+#kcspContainer {
+	margin-bottom: 80px;
+}
+
+#distContainer {
+	margin-bottom: 80px;
+}
+
 .partner-box {
 	position: relative;
 	width: 47%;
@@ -30,7 +130,7 @@ h5 {
 	padding: 20px;
 	flex: 1;
 	display: flex;
-	justify-content: space-between;
+	justify-content: left;
 	align-items: flex-start;
 }

@@ -58,7 +158,7 @@ h5 {
 }

@media screen and (max-width: 568px) {
-	#isvContainer, #servContainer {
+	#distContainter, #kcspContainer, #isvContainer, #servContainer {
 		justify-content: center;
 	}

@@ -76,7 +176,7 @@ h5 {
 }

@media screen and (max-width: 568px) {
-	#isvContainer, #servContainer {
+	#distContainer, #kcspContainer, #isvContainer, #servContainer {
 		justify-content: center;
 	}

@@ -0,0 +1,15 @@
+<!-- Use include_cached when incorporating this file, in order to reduce computation/build time -->
+
+{% assign glossary_terms = site.data.glossary | where_exp: "term", "term.id != '_example'" %}
+
+{% assign tag_map = "" | split: " " %}
+
+{% for tag in site.data.canonical-tags %}
+
+{% assign term_list = glossary_terms | where_exp:"term", "term.tags contains tag" | map: "id" %}
+
+{% assign tag_obj = "" | split: " " | push: tag | push: term_list %}
+
+{% assign tag_map = tag_map | push: tag_obj %}
+
+{% endfor %}
@@ -1,4 +1,14 @@
 You need to have a Kubernetes cluster, and the kubectl command-line tool must
 be configured to communicate with your cluster. If you do not already have a
 cluster, you can create one by using
-[Minikube](/docs/getting-started-guides/minikube).
+[Minikube](/docs/getting-started-guides/minikube),
+or you can use one of these Kubernetes playgrounds:
+
+* [Katacoda](https://www.katacoda.com/courses/kubernetes/playground)
+* [Play with Kubernetes](http://labs.play-with-k8s.com/)
+
+{% if page.min-kubernetes-server-version == page.version %}
+Your Kubernetes server must be version {{page.min-kubernetes-server-version}}.
+{% elsif page.min-kubernetes-server-version %}
+Your Kubernetes server must be version {{page.min-kubernetes-server-version}} or later.
+{% endif %} To check the version, enter `kubectl version`.
@@ -0,0 +1,64 @@
+# Kubernetes Glossary
+
+To write a glossary snippet, start with a copy of the template, [`/_data/glossary/_example.yml`](/_data/glossary/_example.yml). Make sure to provide (or omit) values for the following fields:
+
+* (Required) `id`
+  * This field must match the name of the glossary file itself (without the `*.yml` extension). It is *not* intended to be displayed to users, and is only used programmatically.
+* (Required) `name`
+  * The name of the term.
+* (Required) `tags`
+  * Must be one of the tags listed in the [tags directory in the website repository](https://github.com/kubernetes/website/tree/master/_data/canonical-tags).
+* (Required) `short description`
+  * Make sure to replace the instructional text in the template with your content.
+* (Optional) `aka`
+  * These synonyms do not need to be glossary terms themselves (if they are deprecated), and can include spaces.
+* (Optional) `related`
+  * These should be the `id`s (not the `names`) of related glossary terms.
+* (Optional) `long description`
+  * If you do not provide a long description, remove the field -- that is, the complete key-value pair.
+
+The `_example.yml` template also contains basic information about how to write your snippet. For additional guidance, continue reading this readme.
+
+## Glossary snippet style guide
+
+This style guide supplements the guidance provided in the glossary template. It's intended to help you think about what and how to write glossary definitions. For more general guidance on style, consult [the core docs style guide](https://kubernetes.io/docs/home/contribute/style-guide/).
+
+### Minimum viable snippet:
+
+Every snippet must include at least the short description. The long description is optional, but should be provided for terms that need additional clarification. For consistency with existing *Concept* definitions, *write your definitions as if the term is plural*.
+
+**short-description** (Required): One line (or two short lines) that provides a minimum definition. Do not repeat the term. Prefer fragments. Model after tooltips. End with a period.
+
+**long-description** (Optional): Longer additional text to appear after (in conjunction with) short description. Provide in cases where the short description is not sufficient for the intro paragraph to a topic. Write complete but concise sentences.
+
+### Examples
+
+```yaml
+- name: Pod
+- tags:
+  - Fundamental
+  - Workload
+  - API Object
+- short-description: The smallest and simplest Kubernetes objects. Represent a set of running processes on your cluster.
+- long-description: Pods most often run only a single container, and are managed by a Deployment.
+```
+
+```yaml
+- name: Deployment
+- tags:
+  - Fundamental
+  - Workload
+  - API Object
+- short-description: Controllers that provide declarative updates for Pods and ReplicaSets.
+- long-description: Deployments are responsible for creating and updating instances of an application.
+```
+
+### Thinking about definitions
+
+* **Think of the short description as it would appear in a tooltip.** Is it sufficient to get the reader started? Is it short enough to be read inside a small UI element?
+
+  *Tip*: look at the API reference doc content (for example, https://kubernetes.io/docs/api-reference/v1.7/). Note, however, that this content should be used with care. The concept docs for Pod, for example, are clearer than the reference docs.
+
+* **The long description should follow the short description to make a complete introduction to a topic.** (This is the content that appears at the top of the content, before any generated TOC.) Does it provide information that's not already clear from the short description? Does it provide information that readers should have a general sense of before they dive into the details of the topic it helps introduce?
+
+  *Tip:* the long description does not need to be long; it's intended to extend but not replace the short description. Look through current related docs for ideas. (The Deployment long description is taken from a tutorial, for example.)
@@ -0,0 +1,10 @@
+### ERROR: You must define a <span style="font-family: monospace">`{{ include.missing_block }}`</span> field
+{: style="color:red" }
+
+The glossary template requires that you provide text that {{ include.purpose }}.
+
+To get rid of this message and take advantage of this template, define the `{{ include.missing_block }}`
+field for the `{{ include.term }}` glossary term and populate it with content.
+
+See `_data/glossary/_example.yml` for reference.
+<!-- TEMPLATE_ERROR -->
@@ -0,0 +1,29 @@
+{% assign term_data = site.data.glossary.[include.term_id] %}
+
+{% if include.length == "all" or include.length == "short" %}
+
+{% if term_data.short-description %}
+
+{{ term_data.short-description | liquify | markdownify }}
+
+{% else %}
+
+{% include templates/glossary/_error.md term=term_data.name missing_block='short-description' purpose='concisely describes the key term in 1-2 lines' %}
+
+{% endif %}
+
+{% endif %}
+
+{% if include.length == "all" or include.length == "long" %}
+
+{% if term_data.long-description %}
+
+{{ term_data.long-description | liquify | markdownify }}
+
+{% else %}
+
+{% include templates/glossary/_error.md term=term_data.name missing_block='long-description' purpose='describes the key term in greater depth, supplementing the short-description' %}
+
+{% endif %}
+
+{% endif %}
@@ -35,6 +35,8 @@
  </div>
 </section>

+{% include deprecation-warning.html %}
+
 <section id="encyclopedia">
  <div id="docsToc">
        <div class="pi-accordion">
@@ -53,7 +55,8 @@
        {{ content }}

        <p><a href=""><img src="https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/{{ page.path }}?pixel" alt="Analytics" /></a></p>
-        {% if page.url != "/404.html" and page.url != "/docs/search/" %}
+        {% if page.url != "/404.html" and page.url != "/docs/search/"%}
+	{% unless page.no_issue %}
        <script type="text/javascript">
            PDRTJS_settings_8345992 = {
                "id" : "8345992",
@@ -65,7 +68,10 @@
        </script>
        <a href="" onclick="window.open('https://github.com/kubernetes/kubernetes.github.io/issues/new?title=Issue%20with%20' +
        'k8s.io'+window.location.pathname)" class="button issue">Create an Issue</a>
-        <a href="/editdocs#{{ page.path }}" class="button issue">Edit this Page</a>
+	{% endunless %}
+        {% unless page.noedit %}
+          <a href="/editdocs#{{ page.path }}" class="button issue">Edit this Page</a>
+        {% endunless %}
    {% endif %}
    </div>
 </section>
--- a/Show More
+++ b/Show More