remove field-selector from 1.8 (#6671 )

Merge branch 'master' into release-1.8
Merge pull request #6588 from ivange94/replica-set
2017-12-14 17:36:52 -08:00 · 2017-12-14 14:09:40 -06:00 · 2017-12-14 13:23:34 -05:00 · 2017-12-14 09:39:56 -08:00 · 2017-12-14 00:57:38 -06:00 · 2017-12-13 19:22:06 -08:00
5124 changed files with 26662 additions and 856344 deletions
@@ -1,10 +1,11 @@
 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-> For 1.8 Features: set Milestone to `1.8` and Base Branch to `release-1.8`
+> 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)
@@ -6,15 +6,15 @@ go:
 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/

 script:
- go test -v k8s.io/kubernetes.github.io/test
+- go test -v k8s.io/website/test
 - ./verify-docs-format.sh
@@ -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.6)
-    kramdown (1.11.1)
-    liquid (3.0.6)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    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.15.2
+   1.15.4
@@ -1,5 +1,6 @@
 reviewers:
+- a-mccarthy
+- abiogenesis-now
 - bradamant3
- chenopis
 - steveperry-53
 - zacharysarah
@@ -4,6 +4,8 @@ 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/)
@@ -32,7 +32,7 @@ defaults:
          version: "v1.7"
          githubbranch: "v1.7.6"
          docsbranch: "release-1.7"
-          url: https://kubernetes-io-v1-7.netlify.com/docs/home/
+          url: https://v1-7.docs.kubernetes.io/docs/home/
        - fullversion: "v1.6.8"
          version: "v1.6"
          githubbranch: "v1.6.8"
@@ -60,7 +60,7 @@ defaults:

 permalink: pretty

-gems:
+plugins:
  - jekyll-feed
  - jekyll-sitemap
  - jekyll-seo-tag
@@ -1,12 +0,0 @@
- Fundamental
- API Object
- Metadata
- Configuration
- Security
- Networking
- Storage
- Operation
- Workload
- Component
- API
- Extension
@@ -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:
@@ -75,12 +86,13 @@ 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
@@ -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
@@ -1,17 +1,27 @@
 id: _example
 name: Example K8s Term
-formerly:
+full-link: kubernetes.io/docs/link-to-long-dedicated-docs-page
+aka:
 - Slang K8s Term
 - Misnomer
 - Formerly Known as Prince
 related:
- Less Fancy K8s Term
- Tangential Term
- Commonly Used With
+- id-of-less-fancy-k8s-term
+- id-of-tangential-term
+- id-of-commonly-used-with-term
 tags:
 - Some Tag
-short-description: |
-  Required. One or two lines that provide a minimum definition. Do not repeat the term. Write about the plural of 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 where the short description is not sufficient as the intro paragraph to a topic. Write complete but concise sentences.
+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).
@@ -1,18 +1,18 @@
 id: statefulset
 name: StatefulSet
-formerly:
+full-link: /docs/concepts/workloads/controllers/statefulset/
+aka:
 - PetSet
 related:
- Deployment
- Pod
+- deployment
+- pod
 tags:
- Storage
- Workload
- API Object
-short-description: |
-  Manage the deployment and scaling of a set of Pods, *and provide guarantees about ordering*. They do so by maintaining a *unique*, sticky identity for each of their Pods.
-
+- 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 Deployments, StatefulSets manage Pods that are based on an identical container spec. However, although their specs are the same, the Pods in a StatefulSet are not interchangeable. Each Pod has a persistent identifier that it maintains across any rescheduling.
+  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.

-  StatefulSets also operate according to the Controller pattern. You define your desired state in a StatefulSet *object*, and the StatefulSet *controller* makes any necessary updates to the get there from the current state.
+  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).
@@ -2,6 +2,7 @@ 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:
@@ -29,12 +30,6 @@ toc:
  section:
  - title: v1.8
    path: /docs/api-reference/v1.8/
-  - 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/
  - docs/reference/labels-annotations-taints.md
  - title: OpenAPI and Swagger
    section:
@@ -54,45 +49,39 @@ toc:

 - title: kubectl CLI
  section:
-  - docs/user-guide/kubectl-overview.md
-  - title: v1.8 Commands
-    path: /docs/user-guide/kubectl/v1.8/
-  - 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-options.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: Cloud Controller Manager
+- title: Setup Tools Reference
  section:
-  - docs/admin/cloud-controller-manager.md
-
- title: Setup Tools
-  section:
-  - docs/admin/kubeadm.md
+  - docs/reference/generated/kubeadm.md
  - title: Kubefed
    section:
-    - docs/admin/kubefed.md
-    - docs/admin/kubefed_options.md
-    - docs/admin/kubefed_init.md
-    - docs/admin/kubefed_join.md
-    - docs/admin/kubefed_unjoin.md
-    - docs/admin/kubefed_version.md
+    - 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: Config Reference
+- title: Command-line 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
+  - 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:
@@ -113,5 +102,3 @@ toc:
  - title: Kubernetes Issue Tracker on GitHub
    path: https://github.com/kubernetes/kubernetes/issues/
  - docs/reference/security.md
-
-
@@ -12,18 +12,19 @@ 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:
@@ -32,7 +33,7 @@ toc:
  - 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

@@ -15,7 +15,7 @@ toc:
  - 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/opaque-integer-resource.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
@@ -96,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
@@ -107,6 +108,8 @@ 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:
@@ -125,7 +128,7 @@ toc:
    - 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/opaque-integer-resource-node.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
@@ -147,6 +150,7 @@ toc:
  - 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
@@ -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
@@ -36,6 +36,8 @@ toc:
  - 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
@@ -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.
@@ -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>
@@ -8,6 +8,7 @@
    <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 %}
@@ -23,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>
@@ -1,25 +1,11 @@
 ;(function () {
 	var partners = [
-		{
-			type: 2,
-			name: 'CoreOS',
-			logo: 'core_os',
-			link: 'https://tectonic.com/',
-			blurb: 'Tectonic is the enterprise-ready Kubernetes product, by CoreOS. It adds key features to allow you to manage, update, and control clusters in production.'
-		},
-		{
-			type: 2,
-			name: 'StackPointCloud',
-			logo: 'stackpoint',
-			link: 'https://stackpoint.io',
-			blurb: 'StackPointCloud builds Stackpoint.io, the universal control plane for Kubernetes Anywhere -- compose and build your own infrastructure as easily as a DigitalOcean droplet at any public cloud provider.'
-		},
 		{
 			type: 0,
-			name: 'Sysdig Cloud',
+			name: 'Sysdig',
 			logo: 'sys_dig',
 			link: 'https://sysdig.com/blog/monitoring-kubernetes-with-sysdig-cloud/',
-			blurb: 'Container native monitoring with deep support for Kubernetes.'
+			blurb: 'Sysdig is the container intelligence company. Sysdig has created the only unified platform to deliver monitoring, security, and troubleshooting in a microservices-friendly architecture.'
 		},
 		{
 			type: 0,
@@ -44,32 +30,11 @@
 		},
 		{
 			type: 0,
-			name: 'Weave Works',
+			name: 'Weaveworks',
 			logo: 'weave_works',
 			link: ' https://weave.works/kubernetes',
 			blurb: 'Weaveworks enables Developers and Dev/Ops teams to easily connect, deploy, secure, manage, and troubleshoot microservices in Kubernetes.'
 		},
-		{
-			type: 0,
-			name: 'Wercker',
-			logo: 'wercker',
-			link: 'http://www.wercker.com/integrations/kubernetes',
-			blurb: 'Wercker automates your build, test and deploy pipelines for launching containers and triggering rolling updates on your Kubernetes cluster. '
-		},
-		{
-			type: 0,
-			name: 'Rancher Labs',
-			logo: 'rancher-labs',
-			link: 'http://rancher.com/kubernetes/',
-			blurb: 'Rancher is an open-source, production-ready container management platform that makes it easy to deploy and manage Kubernetes.'
-		},
-		{
-			type: 0,
-			name: 'Red Hat',
-			logo: 'redhat',
-			link: 'https://www.openshift.com/',
-			blurb: 'Leverage an enterprise Kubernetes platform to orchestrate complex, multi-container apps.'
-		},
 		{
 			type: 0,
 			name: 'Intel',
@@ -77,13 +42,6 @@
 			link: 'https://tectonic.com/press/intel-coreos-collaborate-on-openstack-with-kubernetes.html',
 			blurb: 'Powering the GIFEE (Google’s Infrastructure for Everyone Else), to run OpenStack deployments on Kubernetes.'
 		},
-		{
-			type: 0,
-			name: 'ElasticKube',
-			logo: 'elastickube',
-			link: 'https://www.ctl.io/elastickube-kubernetes/',
-			blurb: 'Self-service container management for Kubernetes.'
-		},
 		{
 			type: 0,
 			name: 'Platform9',
@@ -119,13 +77,6 @@
 			link: 'http://blog.aquasec.com/security-best-practices-for-kubernetes-deployment',
 			blurb: 'Deep, automated security for your containers running on Kubernetes.'
 		},
-		{
-			type: 2,
-			name: 'Canonical',
-			logo: 'canonical',
-			link: 'https://jujucharms.com/canonical-kubernetes/',
-			blurb: 'The Canonical Distribution of Kubernetes enables you to operate Kubernetes clusters on demand on any major public cloud and private	infrastructure.'
-		},
 		{
 			type: 0,
 			name: 'Distelli',
@@ -153,54 +104,61 @@
 			logo: 'diamanti',
 			link: 'https://www.diamanti.com/products/',
 			blurb: 'Diamanti deploys containers with guaranteed performance using Kubernetes in the first hyperconverged appliance purpose built for containerized applications.'
-		},
-		{
-			type: 0,
-			name: 'Apprenda',
-			logo: 'apprenda',
-			link: 'https://apprenda.com/kubernetes-support/',
-			blurb: 'Apprenda creates and supports modern, enterprise-ready application platforms for both cloud native and traditional application workloads.'
-		},
+				},
 		{
 			type: 0,
 			name: 'Aporeto',
 			logo: 'aporeto',
 			link: 'https://aporeto.com/trireme',
 			blurb: 'Aporeto makes cloud-native applications secure by default without impacting developer velocity and works at any scale, on any cloud.'
-		},
+				},
 		{
  		type: 2,
 			name: 'Giant Swarm',
 			logo: 'giant_swarm',
 			link: 'https://giantswarm.io',
 			blurb: 'Giant Swarm provides fully-managed Kubernetes Clusters in your location of choice, so you can focus on your product.'
- 		},
+ 				},
 		{
- 			type: 2,
+		 	type: 3,
+		 	name: 'Giant Swarm',
+		 	logo: 'giant_swarm',
+		 	link: 'https://giantswarm.io/product/',
+		 	blurb: 'Giant Swarm - Managed Kubernetes on AWS'
+		 		},
+		{
+		 	type: 3,
+			name: 'Hasura',
+			logo: 'hasura',
+			link: 'https://hasura.io',
+			blurb: 'Hasura - Hasura'
+				},
+		{
+ 			type: 3,
 			name: 'Mirantis',
 			logo: 'mirantis',
- 			link: 'https://content.mirantis.com/Containerizing-OpenStack-on-Kubernetes-Video-Landing-Page.html',
- 			blurb: 'Mirantis builds and manages private clouds with open source software such as OpenStack, deployed as containers orchestrated by Kubernetes.'
- 		},
+ 			link: 'https://www.mirantis.com/software/kubernetes/',
+ 			blurb: 'Mirantis - Mirantis Cloud Platform'
+ 				},
+		{
+		 	type: 2,
+		 	name: 'Mirantis',
+		 	logo: 'mirantis',
+		 	link: 'https://content.mirantis.com/Containerizing-OpenStack-on-Kubernetes-Video-Landing-Page.html',
+		 	blurb: 'Mirantis builds and manages private clouds with open source software such as OpenStack, deployed as containers orchestrated by Kubernetes.'
+		 		},
 		{
 			type: 0,
 			name: 'Kubernetic',
 			logo: 'kubernetic',
 			link: 'https://kubernetic.com/',
 			blurb: 'Kubernetic is a Kubernetes Desktop client that simplifies and democratizes cluster management for DevOps.'
- 		},
-		{
-			type: 1,
-			name: 'Apprenda',
-			logo: 'apprenda',
-			link: 'https://apprenda.com/kubernetes-support/',
-			blurb: 'Apprenda offers flexible and wide range of support plans for pure play Kubernetes on your choice of infrastructure, cloud provider and operating system.'
-		},
+ 				},
 		{
 			type: 1,
 			name: 'Reactive Ops',
 			logo: 'reactive_ops',
-			link: 'https://www.reactiveops.com/kubernetes/',
+			link: 'https://www.reactiveops.com/the-kubernetes-experts/',
 			blurb: 'ReactiveOps has written automation on best practices for infrastructure as code on GCP & AWS using Kubernetes, helping you build and maintain a world-class infrastructure at a fraction of the price of an internal hire.'
 		},
 		{
@@ -238,13 +196,6 @@
 			link: 'http://docs.projectcalico.org/latest/getting-started/kubernetes/',
 			blurb: 'Tigera builds high performance, policy driven, cloud native networking solutions for Kubernetes.'
 		},
-		{
-			type: 1,
-			name: 'Skippbox',
-			logo: 'skippbox',
-			link: 'http://www.skippbox.com/services/',
-			blurb: 'Skippbox brings its Kubernetes expertise to help companies embrace Kubernetes on their way to digital transformation. Skippbox offers both professional services and expert training.'
-		},
 		{
 			type: 1,
 			name: 'Harbur',
@@ -266,6 +217,13 @@
 			link: 'http://www.inwinstack.com/index.php/en/solutions-en/',
 			blurb: 'Our container service leverages OpenStack-based infrastructure and its container orchestration engine Magnum to manage Kubernetes clusters.'
  		},
+	{
+	 	type: 3,
+	 	name: 'InwinSTACK',
+	 	logo: 'inwinstack',
+	 	link: 'https://github.com/inwinstack/kube-ansible',
+	 	blurb: 'inwinSTACK - kube-ansible'
+	  	},
 		{
 			type: 1,
 			name: 'Semantix',
@@ -333,8 +291,8 @@
 			type: 0,
 			name: 'CA Technologies',
 			logo: 'ca',
- 			link: 'https://www.ca.com/us/products/application-deployment.html',
- 			blurb: 'The RA CDE Kubernetes plugin enables an automated process for pushing changes to production by applying standard Kubernetes YAML files'
+ 			link: 'https://docops.ca.com/ca-continuous-delivery-director/integrations/en/plug-ins/kubernetes-plug-in',
+ 			blurb: 'The CA Continuous Delivery Director Kubernetes plugin orchestrates deployment of containerized applications within an end-to-end release pipeline.'
  		},
 		{
 			type: 0,
@@ -359,7 +317,7 @@
  		},
 		{
 			type: 1,
- 			name: 'codecrux web technologies pvt ltd',
+ 			name: 'Codecrux web technologies pvt ltd',
 			logo: 'codecrux',
 			link: 'http://codecrux.com/kubernetes/',
 			blurb: 'At CodeCrux we help your organization get the most out of Containers and Kubernetes, regardless of where you are in your journey'
@@ -373,10 +331,10 @@
  		},
 		{
 			type: 1,
- 			name: 'StackOVerdrive.io',
+ 			name: 'StackOverdrive.io',
 			logo: 'stackoverdrive',
 			link: 'http://www.stackoverdrive.net/kubernetes-consulting/',
- 			blurb: 'We are a devops consulting firm and we do alot of work with containers and Kunbernetes is one of our go to tools.'
+ 			blurb: 'StackOverdrive helps organizations of all sizes leverage Kubernetes for container based orchestration and management.'
  		},
 		{
 			type: 0,
@@ -450,10 +408,10 @@
  		},
 		{
 			type: 1,
- 			name: 'EASYNUBE LTD',
+ 			name: 'EASYNUBE',
 			logo: 'easynube',
- 			link: 'https://www.carrefour.es/supermercado/?ic_source=portal-home&ic_medium=menu-links&ic_content=section-home',
- 			blurb: 'Provide consultancy, architecture and implementation'
+ 			link: 'http://easynube.co.uk/devopsnube/',
+ 			blurb: 'EasyNube provide architecture, implementation, and manage scalable applications using Kubernetes and Openshift.'
  		},
 		{
 			type: 1,
@@ -462,33 +420,19 @@
 			link: 'http://www.opcito.com/kubernetes/',
 			blurb: 'Opcito is a software consultancy that uses Kubernetes to help organisations build, architect & deploy highly scalable applications.'
  		},
-		{
- 			type: 2,
- 			name: 'Huawei Technologies Co., Ltd.',
- 			logo: 'huawei',
- 			link: 'http://developer.huawei.com/ict/en/site-paas',
- 			blurb: 'FusionStage is an enterprise-grade PaaS, the core of which is based on open source container technology including Kubernetes and Docker.'
-  		},
 		{
 			type: 0,
- 			name: '{code} by Dell EMC',
+ 			name: 'code by Dell EMC',
 			logo: 'codedellemc',
 			link: 'https://blog.codedellemc.com',
 			blurb: 'Respected as a thought leader in storage persistence for containerized applications. Contributed significant work to K8 and Ecosystem'
 			},
-		{
- 			type: 0,
-	 		name: 'SUSE Llc.',
-	 		logo: 'suse',
-	 		link: 'https://www.suse.com/products/caas-platform/',
-	 		blurb: 'SUSE delivers Kubernetes as part of SUSE CaaS Platform and SUSE OpenStack Cloud, for enterprises that want truly open, open source solutions for cloud-native applications.'
-			},
 		{
 	 		type: 0,
 		 	name: 'Instana',
 		 	logo: 'instana',
 		 	link: 'https://www.instana.com/supported-technologies/',
-		 	blurb: 'Instana monitors the infrastructure, containers and services deployed on a Kubernetes cluster.'
+		 	blurb: 'Instana monitors performance of the applications, infrastructure, containers and services deployed on a Kubernetes cluster.'
 			},
 		{
 		 	type: 0,
@@ -500,17 +444,10 @@
 		{
 			type: 2,
 			name: 'Treasure Data',
-			logo: 'treasure-data',
+			logo: 'treasuredata',
 			link: 'https://fluentd.treasuredata.com/kubernetes-logging/',
 			blurb: 'Fluentd Enterprise brings smart, secure logging to Kubernetes, and brings integrations with backends such as Splunk, Kafka, or AWS S3.'
 			},
-		{
-			type: 2,
-			name: 'IBM',
-			logo: 'IBM',
-			link: 'https://www.ibm.com/cloud-computing/bluemix/containers',
-			blurb: 'IBM Container Service is a managed k8s environment with built-in cluster security and isolation while leveraging services including Watson, IoT, Weather, etc.'
-			},
 		{
 			type: 1,
 			name: 'Kenzan',
@@ -519,12 +456,33 @@
 			blurb: 'Kenzan is a software engineering and full-service consulting firm that provides customized, end-to-end solutions that drive change through digital transformation.'
 			},
 		{
-			type: 0,
+			type: 3,
 			name: 'Kublr',
 			logo: 'kublr',
 			link: 'http://kublr.com',
-			blurb: 'Simplify your Kubernetes experience with a fully production-ready, enterprise-grade cluster management platform.'
+			blurb: 'Kublr - Accelerate and control the deployment, scaling, monitoring and management of your containerized applications.'
 			},
+		{
+			type: 3,
+			name: 'Nirmata',
+			logo: 'nirmata',
+			link: 'https://www.nirmata.com/',
+			blurb: 'Nirmata - Nirmata Managed Kubernetes'
+				},
+		{
+			type: 3,
+			name: 'TenxCloud',
+			logo: 'tenxcloud',
+			link: 'https://tenxcloud.com',
+			blurb: 'TenxCloud - TenxCloud Container Engine (TCE)'
+				},
+		{
+			type: 3,
+			name: 'Twistlock',
+			logo: 'twistlock',
+			link: 'https://www.twistlock.com/',
+			blurb: 'Twistlock - Twistlock'
+				},
 		{
 			type: 0,
 			name: 'Endocode AG',
@@ -581,13 +539,6 @@
 			link: 'https://www.contino.io/',
 			blurb: 'We help enterprise organizations adopt DevOps, containers and cloud computing. Contino is a global consultancy that enables regulated organizations to accelerate innovation through the adoption of modern approaches to software delivery.'
 			},
-		{
-			type: 2,
-			name: 'Heptio',
-			logo: 'heptio',
-			link: 'http://heptio.com',
-			blurb: 'Heptio helps businesses of all sizes get closer to the vibrant Kubernetes community.'
-			},
 		{
 			type: 2,
 			name: 'Booz Allen Hamilton',
@@ -595,16 +546,598 @@
 			link: 'https://www.boozallen.com/',
 			blurb: 'Booz Allen partners with public and private sector clients to solve their most difficult challenges through a combination of consulting, analytics, mission operations, technology, systems delivery, cybersecurity, engineering, and innovation expertise.'
 			},
+		{
+			type: 1,
+			name: 'BigBinary',
+			logo: 'bigbinary',
+			link: 'http://blog.bigbinary.com/categories/Kubernetes',
+			blurb: 'Provider of Digital Solutions for federal and commercial clients, to include DevSecOps, cloud platforms, transformation strategy, cognitive solutions, and UX.'
+				},
 		{
 			type: 0,
-			name: 'Applatix',
-			logo: 'applatix',
-			link: 'https://applatix.com/applatix-product/',
- 			blurb: 'Applatix helps build and run containerized apps on public cloud using Docker and Kubernetes.'
-	  	}
+			name: 'CloudPerceptions',
+			logo: 'cloudperceptions',
+			link: 'https://www.meetup.com/Triangle-Kubernetes-Meetup/files/',
+			blurb: 'Container security solution for small-to-medium size enterprises who plan to run Kubernetes on shared infrastructure.'
+				},
+		{
+			type: 1,
+			name: 'Creationline, Inc.',
+			logo: 'creationline',
+			link: 'https://www.creationline.com/ci',
+			blurb: 'Total solution for container based IT resource management.'
+				},
+		{
+			type: 0,
+			name: 'DataCore Software',
+			logo: 'datacore',
+			link: 'https://www.datacore.com/solutions/virtualization/containerization',
+			blurb: 'DataCore provides highly-available, high-performance universal block storage for Kubernetes, radically improving the speed of deployment.'
+				},
+		{
+			type: 0,
+			name: 'Elastifile',
+			logo: 'elastifile',
+			link: 'https://www.elastifile.com/stateful-containers',
+			blurb: 'Elastifile’s cross-cloud data fabric delivers elastically scalable, high performance, software-defined persistent storage for Kubernetes.'
+				},
+		{
+			type: 0,
+			name: 'GitLab',
+			logo: 'gitlab',
+			link: 'https://about.gitlab.com/2016/11/14/idea-to-production/',
+			blurb: 'With GitLab and Kubernetes, you can deploy a complete CI/CD pipeline with multiple environments, automatic deployments, and automatic monitoring.'
+				},
+		{
+			type: 0,
+			name: 'Gravitational, Inc.',
+			logo: 'gravitational',
+			link: 'https://gravitational.com/telekube/',
+			blurb: 'Telekube combines Kubernetes with Teleport, our modern SSH server, so operators can remotely manage a multitude of K8s application deployments.'
+				},
+		{
+			type: 0,
+			name: 'Hitachi Data Systems',
+			logo: 'hitachi',
+			link: 'https://www.hds.com/en-us/products-solutions/application-solutions/unified-compute-platform-with-kubernetes-orchestration.html',
+			blurb: 'Build the Applications You Need to Drive Your Business - DEVELOP AND DEPLOY APPLICATIONS FASTER AND MORE RELIABLY.'
+				},
+		{
+			type: 1,
+			name: 'Infosys Technologies',
+			logo: 'infosys',
+			link: 'https://www.infosys.com',
+			blurb: 'Monolithic to microservices on openshift is a offering that we are building as part of open source practice.'
+				},
+		{
+			type: 0,
+			name: 'JFrog',
+			logo: 'jfrog',
+			link: 'https://www.jfrog.com/use-cases/12584/',
+			blurb: 'You can use Artifactory to store and manage all of your application’s container images and deploy to Kubernetes and setup a build, test, deploy pipeline using Jenkins and Artifactory. Once an image is ready to be rolled out, Artifactory can trigger a rolling-update deployment into a Kubernetes cluster without downtime – automatically!'
+				},
+		{
+			type: 0,
+			name: 'Navops by Univa',
+			logo: 'navops',
+			link: 'https://www.navops.io',
+			blurb: 'Navops is a suite of products that enables enterprises to take full advantage of Kubernetes and provides the ability to quickly and efficiently run containers at scale.'
+				},
+		{
+			type: 0,
+			name: 'NeuVector',
+			logo: 'neuvector',
+			link: 'http://neuvector.com/solutions-for-kubernetes-security/',
+			blurb: 'NeuVector delivers an application and network intelligent container network security solution integrated with and optimized for Kubernetes.'
+				},
+		{
+			type: 1,
+			name: 'OpsZero',
+			logo: 'opszero',
+			link: 'https://www.opszero.com/kubernetes.html',
+			blurb: 'opsZero provides DevOps for Startups. We build and service your Kubernetes and Cloud Infrastructure to accelerate your release cycle.'
+				},
+		{
+			type: 1,
+			name: 'Shiwaforce.com Ltd.',
+			logo: 'shiwaforce',
+			link: 'https://www.shiwaforce.com/en/',
+			blurb: 'Shiwaforce.com is the Agile Partner in Digital Transformation. Our solutions follow business changes quickly, easily and cost-effectively.'
+				},
+		{
+			type: 1,
+			name: 'SoftServe',
+			logo: 'softserve',
+			link: 'https://www.softserveinc.com/en-us/blogs/kubernetes-travis-ci/',
+			blurb: 'SoftServe allows its clients to adopt modern application design patterns and benefit from fully integrated, highly available, cost effective Kubernetes clusters at any scale.'
+				},
+		{
+			type: 1,
+			name: 'Solinea',
+			logo: 'solinea',
+			link: 'https://www.solinea.com/cloud-consulting-services/container-microservices-offerings',
+			blurb: 'Solinea is a digital transformation consultancy that enables businesses to build innovative solutions by adopting cloud native computing.'
+				},
+		{
+			type: 1,
+			name: 'Sphere Software, LLC',
+			logo: 'spheresoftware',
+			link: 'https://sphereinc.com/kubernetes/',
+			blurb: 'The Sphere Software team of experts allows customers to architect and implement scalable applications using Kubernetes in Google Cloud, AWS, and Azure.'
+				},
+		{
+			type: 1,
+			name: 'Altoros',
+			logo: 'altoros',
+			link: 'https://www.altoros.com/container-orchestration-tools-enablement.html',
+			blurb: 'Deployment and configuration of Kubernetes, Optimization of existing solutions, training for developers on using Kubernetes, support.'
+				},
+		{
+			type: 0,
+			name: 'Cloudbase Solutions',
+			logo: 'cloudbase',
+			link: 'https://cloudbase.it/kubernetes',
+			blurb: 'Cloudbase Solutions provides Kubernetes cross-cloud interoperability for Windows and Linux deployments based on open source technologies.'
+				},
+		{
+			type: 0,
+			name: 'Codefresh',
+			logo: 'codefresh',
+			link: 'https://codefresh.io/kubernetes-deploy/',
+			blurb: 'Codefresh is a complete tool chain for delivering containers to Kubernetes.'
+				},
+		{
+			type: 0,
+			name: 'NetApp',
+			logo: 'netapp',
+			link: 'http://netapp.io/2016/12/23/introducing-trident-dynamic-persistent-volume-provisioner-kubernetes/',
+			blurb: 'Dynamic provisioning and persistent storage support.'
+				},
+		{
+			type: 0,
+			name: 'OpenEBS',
+			logo: 'OpenEBS',
+			link: 'https://openebs.io/',
+ 			blurb: 'OpenEBS is containerized storage for containers integrated tightly into Kubernetes and based on distributed block storage and containerization of storage control. OpenEBS derives intent from K8s and other YAML or JSON such as per container QoS SLAs, tiering and replica policies, and more. OpenEBS is EBS API compliant.'
+				},
+		{
+			type: 3,
+			name: 'Google Kubernetes Engine',
+			logo: 'gcp',
+			link: 'https://cloud.google.com/kubernetes-engine/',
+			blurb: 'Google - Google Kubernetes Engine'
+				},
+		{
+			type: 3,
+			name: 'Apprenda',
+			logo: 'apprenda',
+			link: 'https://apprenda.com/kismatic/',
+			blurb: 'Apprenda - Kismatic Enterprise Toolkit (KET)'
+				},
+		{
+			type: 3,
+			name: 'Red Hat',
+			logo: 'redhat',
+			link: 'https://www.openshift.com',
+			blurb: 'Red Hat - OpenShift Online and OpenShift Container Platform'
+				},
+		{
+			type: 3,
+			name: 'Rancher',
+			logo: 'rancher',
+			link: 'http://rancher.com/kubernetes/',
+			blurb: 'Rancher Inc. - Rancher Kubernetes'
+				},
+		{
+			type: 3,
+			name: 'Canonical',
+			logo: 'canonical',
+			link: 'https://www.ubuntu.com/kubernetes',
+			blurb: 'The Canonical Distribution of Kubernetes enables you to operate Kubernetes clusters on demand on any major public cloud and private infrastructure.'
+				},
+		{
+			type: 2,
+			name: 'Canonical',
+			logo: 'canonical',
+			link: 'https://www.ubuntu.com/kubernetes',
+			blurb: 'Canonical Ltd. - Canonical Distribution of Kubernetes'
+				},
+		{
+			type: 3,
+			name: 'Cisco',
+			logo: 'cisco',
+			link: 'https://www.cisco.com',
+			blurb: 'Cisco Systems - Cisco Container Platform'
+				},
+		{
+			type: 3,
+			name: 'Cloud Foundry',
+			logo: 'cff',
+			link: 'https://www.cloudfoundry.org/container-runtime/',
+			blurb: 'Cloud Foundry - Cloud Foundry Container Runtime'
+				},
+		{
+			type: 3,
+			name: 'IBM',
+			logo: 'ibm',
+			link: 'https://www.ibm.com/cloud/container-service',
+			blurb: 'IBM - IBM Cloud Container Service'
+				},
+		{
+			type: 2,
+			name: 'IBM',
+			logo: 'ibm',
+			link: 'https://www.ibm.com/cloud-computing/bluemix/containers',
+			blurb: 'The IBM Bluemix Container Service combines Docker and Kubernetes to deliver powerful tools, an intuitive user experiences, and built-in security and isolation to enable rapid delivery of applications all while leveraging Cloud Services including cognitive capabilities from Watson.'
+				},
+		{
+			type: 3,
+			name: 'Samsung',
+			logo: 'samsung_sds',
+			link: 'https://github.com/samsung-cnct/kraken',
+			blurb: 'Samsung SDS - Kraken'
+				},
+		{
+			type: 3,
+			name: 'IBM',
+			logo: 'ibm',
+			link: 'https://www.ibm.com/cloud-computing/products/ibm-cloud-private/',
+			blurb: 'IBM - IBM Cloud Private'
+				},
+		{
+			type: 3,
+			name: 'Kinvolk',
+			logo: 'kinvolk',
+			link: 'https://github.com/kinvolk/kube-spawn',
+			blurb: 'Kinvolk - kube-spawn'
+				},
+		{
+			type: 3,
+			name: 'Heptio',
+			logo: 'heptio',
+			link: 'https://aws.amazon.com/quickstart/architecture/heptio-kubernetes',
+			blurb: 'Heptio - AWS-Quickstart'
+				},
+		{
+			type: 2,
+			name: 'Heptio',
+			logo: 'heptio',
+			link: 'http://heptio.com',
+			blurb: 'Heptio helps businesses of all sizes get closer to the vibrant Kubernetes community.'
+				},
+		{
+			type: 3,
+			name: 'StackPointCloud',
+			logo: 'stackpoint',
+			link: 'https://stackpoint.io',
+			blurb: 'StackPointCloud - StackPointCloud'
+				},
+		{
+			type: 2,
+			name: 'StackPointCloud',
+			logo: 'stackpoint',
+			link: 'https://stackpoint.io',
+			blurb: 'StackPointCloud offers a wide range of support plans for managed Kubernetes clusters built through its universal control plane for Kubernetes Anywhere.'
+				},
+		{
+			type: 3,
+			name: 'Caicloud',
+			logo: 'caicloud',
+			link: 'https://caicloud.io/products/compass',
+			blurb: 'Caicloud - Compass'
+				},
+		{
+			type: 2,
+			name: 'Caicloud',
+			logo: 'caicloud',
+			link: 'https://caicloud.io/',
+			blurb: 'Founded by ex-Googlers,and early Kubernetes contributors, Caicloud leverages Kubernetes to provide container products which have successfully served Fortune 500 enterprises, and  further utilizes Kubernetes as a vehicle to deliver ultra-speed deep learning experience.'
+				},
+		{
+			type: 3,
+			name: 'Alibaba',
+			logo: 'alibaba',
+			link: 'https://www.aliyun.com/product/containerservice?spm=5176.8142029.388261.219.3836dbccRpJ5e9',
+			blurb: 'Alibaba Cloud - Alibaba Cloud Container Service'
+				},
+		{
+			type: 3,
+			name: 'Tencent',
+			logo: 'tencent',
+			link: 'https://cloud.tencent.com/product/ccs?lang=en',
+			blurb: 'Tencent Cloud - Tencent Cloud Container Service'
+				},
+		{
+			type: 3,
+			name: 'Huawei',
+			logo: 'huawei',
+			link: 'http://www.huaweicloud.com/product/cce.html',
+			blurb: 'Huawei - Huawei Cloud Container Engine'
+				},
+		{
+			type: 2,
+			name: 'Huawei',
+			logo: 'huawei',
+			link: 'http://developer.huawei.com/ict/en/site-paas',
+			blurb: 'FusionStage is an enterprise-grade Platform as a Service product, the core of which is based on mainstream open source container technology including Kubernetes and Docker.'
+				},
+		{
+			type: 3,
+			name: 'Google',
+			logo: 'gcp',
+			link: 'https://github.com/kubernetes/kubernetes/tree/master/cluster',
+			blurb: 'Google - kube-up.sh on Google Compute Engine'
+				},
+		{
+			type: 3,
+			name: 'Poseidon',
+			logo: 'poseidon',
+			link: 'https://typhoon.psdn.io/',
+			blurb: 'Poseidon - Typhoon'
+				},
+		{
+			type: 3,
+			name: 'Netease',
+			logo: 'netease',
+			link: 'https://www.163yun.com/product/container-service-dedicated',
+			blurb: 'Netease - Netease Container Service Dedicated'
+				},
+		{
+			type: 3,
+			name: 'Loodse',
+			logo: 'loodse',
+			link: 'https://loodse.com',
+			blurb: 'Loodse - Kubermatic Container Engine'
+				},
+		{
+			type: 3,
+			name: 'Microsoft',
+			logo: 'microsoft',
+			link: 'https://github.com/Azure/acs-engine',
+			blurb: 'Microsoft - Azure acs-engine'
+				},
+		{
+			type: 3,
+			name: 'Microsoft',
+			logo: 'microsoft',
+			link: 'https://docs.microsoft.com/en-us/azure/aks/',
+			blurb: 'Microsoft - Azure Container Service AKS'
+						},
+		{
+			type: 3,
+			name: 'Oracle',
+			logo: 'oracle',
+			link: 'http://www.wercker.com/product',
+			blurb: 'Oracle - Oracle Container Engine'
+				},
+		{
+			type: 3,
+			name: 'Oracle',
+			logo: 'oracle',
+			link: 'https://github.com/oracle/terraform-kubernetes-installer',
+			blurb: 'Oracle -  Oracle Terraform Kubernetes Installer'
+				},
+		{
+			type: 3,
+			name: 'Mesosphere',
+			logo: 'mesosphere',
+			link: 'https://mesosphere.com/kubernetes/',
+			blurb: 'Mesosphere -  Kubernetes on DC/OS'
+				},
+		{
+			type: 3,
+			name: 'Appscode',
+			logo: 'appscode',
+			link: 'https://appscode.com/products/cloud-deployment/',
+			blurb: 'Appscode - Pharmer'
+				},
+		{
+			type: 3,
+			name: 'SAP',
+			logo: 'sap',
+			link: 'https://cloudplatform.sap.com/index.html',
+			blurb: 'SAP - Cloud Platform - Gardener (not yet released)'
+				},
+		{
+			type: 3,
+			name: 'Oracle',
+			logo: 'oracle',
+			link: 'https://www.oracle.com/linux/index.html',
+			blurb: 'Oracle - Oracle Linux Container Services for use with Kubernetes'
+				},
+		{
+			type: 3,
+			name: 'CoreOS',
+			logo: 'coreos',
+			link: 'https://github.com/kubernetes-incubator/bootkube',
+			blurb: 'CoreOS - bootkube'
+				},
+		{
+			type: 2,
+			name: 'CoreOS',
+			logo: 'coreos',
+			link: 'https://coreos.com/',
+			blurb: 'Tectonic is the enterprise-ready Kubernetes product, by CoreOS. It adds key features to allow you to manage, update, and control clusters in production.'
+				},
+		{
+			type: 3,
+			name: 'Weaveworks',
+			logo: 'weave_works',
+			link: 'https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/',
+			blurb: 'Weaveworks - kubeadm'
+				},
+		{
+			type: 3,
+			name: 'Wise2c',
+			logo: 'wise2c',
+			link: 'http://www.wise2c.com/solution',
+			blurb: 'Wise2C Technology - WiseCloud'
+				},
+		{
+			type: 2,
+			name: 'Wise2c',
+			logo: 'wise2c',
+			link: 'http://www.wise2c.com',
+			blurb: 'Using Kubernetes to providing IT continuous delivery and Enterprise grade container management solution to Financial Industry.'
+				},
+		{
+			type: 3,
+			name: 'Docker',
+			logo: 'docker',
+			link: 'https://www.docker.com/enterprise-edition',
+			blurb: 'Docker - Docker Enterprise Edition'
+				},
+		{
+			type: 3,
+			name: 'Daocloud',
+			logo: 'daocloud',
+			link: 'http://www.daocloud.io/dce',
+			blurb: 'DaoCloud - DaoCloud Enterprise'
+				},
+		{
+			type: 3,
+			name: 'SUSE',
+			logo: 'suse',
+			link: 'https://www.suse.com/products/caas-platform/',
+			blurb: 'SUSE - SUSE CaaS (Container as a Service) Platform'
+				},
+		{
+			type: 3,
+			name: 'Pivotal',
+			logo: 'pivotal',
+			link: 'https://cloud.vmware.com/pivotal-container-service',
+			blurb: 'Pivotal/VMware - Pivotal Container Service (PKS)'
+				},
+		{
+			type: 3,
+			name: 'VMware',
+			logo: 'vmware',
+			link: 'https://cloud.vmware.com/pivotal-container-service',
+			blurb: 'Pivotal/VMware - Pivotal Container Service (PKS)'
+				},
+		{
+			type: 3,
+			name: 'Alauda',
+			logo: 'alauda',
+			link: 'http://www.alauda.cn/product/detail/id/68.html',
+			blurb: 'Alauda - Alauda EE'
+				},
+		{
+			type: 3,
+			name: 'EasyStack',
+			logo: 'easystack',
+			link: 'https://easystack.cn/eks/',
+			blurb: 'EasyStack - EasyStack Kubernetes Service (EKS)'
+				},
+		{
+			type: 3,
+			name: 'CoreOS',
+			logo: 'coreos',
+			link: 'https://coreos.com/tectonic/',
+			blurb: 'CoreOS - Tectonic'
+				},
+		{
+			type: 0,
+			name: 'GoPaddle',
+			logo: 'gopaddle',
+			link: 'https://gopaddle.io',
+			blurb: 'goPaddle is a DevOps platform for Kubernetes developers. It simplifies the Kubernetes Service creation and maintenance through source to image conversion, build & version management, team management, access controls and audit logs, single click provision of Kubernetes Clusters across multiple clouds from a single console.'
+				},
+		{
+			type: 0,
+			name: 'Vexxhost',
+			logo: 'vexxhost',
+			link: 'https://vexxhost.com/public-cloud/container-services/kubernetes/',
+			blurb: 'VEXXHOST offers a high-performance container management service powered by Kubernetes and OpenStack Magnum.'
+				},
+		{
+			type: 1,
+			name: 'Component Soft',
+			logo: 'componentsoft',
+			link: 'https://www.componentsoft.eu/?p=3925',
+			blurb: 'Component Soft offers training, consultation and support around open cloud technologies like Kubernetes, Docker, Openstack and Ceph.'
+				},
+		{
+			type: 0,
+			name: 'Datera',
+			logo: 'datera',
+			link: 'http://www.datera.io/kubernetes/',
+			blurb: 'Datera delivers high performance, self-managing elastic block storage with self-service provisioning for deploying Kubernetes at scale.'
+				},
+		{
+			type: 0,
+			name: 'Containership',
+			logo: 'containership',
+			link: 'https://containership.io/',
+			blurb: 'Containership is a cloud agnostic managed kubernetes offering that supports automatic provisioning on over 14 cloud providers.'
+				},
+		{
+			type: 0,
+			name: 'Pure Storage',
+			logo: 'pure_storage',
+			link: 'https://hub.docker.com/r/purestorage/k8s/',
+			blurb: 'Our flexvol driver and dynamic provisioner allow FlashArray/Flashblade storage devices to be consumed as first class persistent storage from within Kuberentes.'
+				},
+		{
+			type: 0,
+			name: 'Elastisys',
+			logo: 'elastisys',
+			link: 'https://elastisys.com/kubernetes/',
+			blurb: 'Predictive autoscaling - detects recurring workload variations, irregular traffic spikes, and everything in between. Runs K8s in any public or private cloud.'
+				},
+		{
+			type: 0,
+			name: 'Portworx',
+			logo: 'portworx',
+			link: 'https://docs.portworx.com/scheduler/kubernetes/install.html',
+			blurb: 'With Portworx, you can manage any database or stateful service on any infrastructure using Kubernetes. You get a single data management layer for all of your stateful services, no matter where they run.'
+				},
+		{
+			type: 1,
+			name: 'Object Computing, Inc.',
+			logo: 'objectcomputing',
+			link: 'https://objectcomputing.com/services/software-engineering/devops/kubernetes-services',
+			blurb: 'Our portfolio of DevOps consulting services includes Kubernetes support, development, and training.'
+				},
+		{
+			type: 1,
+			name: 'Isotoma',
+			logo: 'isotoma',
+			link: 'https://www.isotoma.com/blog/2017/10/24/containerisation-tips-for-using-kubernetes-with-aws/',
+			blurb: 'Based in the North of England, Amazon partners who are delivering Kubernetes solutions on AWS for replatforming and native development.'
+				},
+		{
+			type: 1,
+			name: 'Servian',
+			logo: 'servian',
+			link: 'https://www.servian.com/cloud-and-technology/',
+			blurb: 'Based in Australia, Servian provides advisory, consulting and managed services to support both application and data centric kubernetes use cases.'
+				},
+		{
+			type: 1,
+			name: 'Redzara',
+			logo: 'redzara',
+			link: 'http://redzara.com/cloud-service',
+			blurb: 'Redzara has wide and in-depth experience in Cloud automation, now taking one giant step by providing container service offering and services to our customers.'
+				},
+		{
+			type: 0,
+			name: 'Dataspine',
+			logo: 'dataspine',
+			link: 'http://dataspine.xyz/',
+			blurb: 'Dataspine is building a secure, elastic and serverless deployment platform for production ML/AI workloads on top of k8s.'
+				},
+		{
+			type: 0,
+			name: 'Logdna',
+			logo: 'logdna',
+			link: 'https://logdna.com/kubernetes',
+			blurb: 'Pinpoint production issues instantly with LogDNA, the best logging platform you will ever use. Get started with only 2 kubectl commands.'
+				}
 	]

 	var kcspContainer = document.getElementById('kcspContainer')
+	var distContainer = document.getElementById('distContainer')
 	var isvContainer = document.getElementById('isvContainer')
 	var servContainer = document.getElementById('servContainer')

@@ -644,7 +1177,9 @@
      container = servContainer;
    } else if (obj.type === 2) {
      container = kcspContainer;
-    }
+		} else if (obj.type === 3) {
+			container = distContainer;
+		}

 		container.appendChild(box)
 	})
@@ -5,6 +5,12 @@
 	margin-bottom: 2em;
 }

+.kcsp_section {
+	clear: both;
+	padding: 0px;
+	margin-bottom: 2em;
+}
+
 /*  COLUMN SETUP  */
 .col {
 	display: block;
@@ -28,28 +34,54 @@
    zoom:1; /* For IE 6/7 */
 }

-/*  GRID OF THREE  */
-.span_3_of_3 {
-	width: 32.2%;
+/*  GRID OF FOUR  */
+.span_4_of_4 {
+	width: 23%;
 	background-color: #f9f9f9;
 	padding: 20px;
 }
-.span_2_of_3 {
-	width: 32.2%;
+.span_3_of_4 {
+	width: 23%;
 	background-color: #f9f9f9;
 	padding: 20px;
 }
-.span_1_of_3 {
-	width: 32.2%;
+.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_3_of_3, .span_2_of_3, .span_1_of_3 { width: 100%; }
+	.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{
@@ -69,7 +101,7 @@ h5 {
 	background-color: #f9f9f9;
 }

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

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

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

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

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

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

@@ -6,3 +6,9 @@ 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`.
@@ -2,17 +2,19 @@

 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`.
+* (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`.
+* (Required) `name`
  * The name of the term.
-* (Required) `tags`.
-  * Must be one of the tags listed in kubernetes.github.io/_data/canonical-terms-tags.yml.
-* (Required) `short description`.
+* (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) `formerly` and `related`.
-  * If you do not provide these values, remove the fields.
-* (Optional) `long description`.
+* (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.
@@ -1,8 +1,10 @@
-{% assign term_data = site.data.glossary.[include.term] %}
+{% 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 | markdownify }}
+{{ term_data.short-description | liquify | markdownify }}

 {% else %}

@@ -10,11 +12,13 @@

 {% endif %}

-{% if include.length == "long" %}
+{% endif %}
+
+{% if include.length == "all" or include.length == "long" %}

 {% if term_data.long-description %}

-{{ term_data.long-description | markdownify }}
+{{ term_data.long-description | liquify | markdownify }}

 {% else %}

@@ -55,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",
@@ -67,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>
@@ -0,0 +1,75 @@
+# Custom Jekyll Plugins
+
+This directory contains `*.rb` files that extend the original Jekyll classes and provide custom formatting for the docs site:
+
+### `glossary_tags.rb`
+
+A full list of glossary terms is available on the [Standardized Glossary](https://kubernetes.io/docs/reference/glossary/?fundamental=true) page. For further information about term schemas, see the [README](../_includes/templates/glossary/README.md) and the provided [`_example.yml`](../_data/glossary/_example.yml).
+
+*NOTE: The "tags" referenced here are Liquid tags like `{% include %}`, **not** the glossary canonical tags that are used to categorize terms.*
+
+#### (1) `glossary_definition` tag
+
+This renders the definition of the glossary term inside a `<div>`, preserving Markdown formatting where possible. It uses the [`snippet.md` template](../_includes/templates/glossary/snippet.md).
+
+**Usage:**
+
+```
+{% glossary_definition term_id="helm-chart" length="all" %}
+```
+
+**Parameters:**
+
+
+| Name | Default | Description |
+| --- | --- | --- |
+| `term_id` | N/A (Required) | The `id` of the glossary term whose definition will be used. (This `id` is the same as the filename of the term, i.e. `_data/glossary/<ID>.yml`.) |
+| `length` | "short" | Specifies which term definition should be used ("short" for the `short-definition`, "long" for `long-description`, "all" when both should be included). |
+
+#### (2) `glossary_tooltip` tag
+
+This renders the glossary term with a tooltip--when the term is moused over by the user, its definition is displayed above.
+
+**Usage:**
+
+```
+{% glossary_tooltip text="Helm Charts" term_id="helm-chart" %}
+```
+
+This renders the following:
+
+![glossary-tooltip](../images/metadocs/jekyll-tags-glossary-tooltip.png)
+
+**Parameters:**
+
+
+| Name | Default | Description |
+| --- | --- | --- |
+| `text` | the `name` of the glossary term | The text that the user will hover over to display the glossary definition. **You should include this if using the tooltip inside of a glossary term's YAML short-definition.** |
+| `term_id` | N/A (Required) | The `id` of the associated glossary term. (This `id` is the same as the filename of the term, i.e. `_data/glossary/<ID>.yml`.) |
+
+#### (3) `glossary_injector` tag
+
+This takes the definition of the term specified by the `term_id` and uses it to populate the contents of another HTML element specified by `placeholder_id`.
+
+**Usage:**
+
+```
+{% glossary_injector term_id="kubectl" placeholder_id="def-container" length="short" %}
+```
+
+This renders the following:
+
+![glossary-injector](../images/metadocs/jekyll-tags-glossary-injector.gif)
+
+*NOTE: Neither the placeholder nor the term's styling/CSS is determined by this Jekyll tag. You will need to specify this yourself in your Markdown/HTML files, i.e. by assigning a custom class.*
+
+**Parameters:**
+
+
+| Name | Default | Description |
+| --- | --- | --- |
+| `text` | the `name` of the glossary term | The text that the user will hover over to display the glossary definition. |
+| `term_id` | N/A (Required) | The `id` of the glossary term whose definition will be used. (This `id` is the same as the filename of the term, i.e. `_data/glossary/<ID>.yml`.) |
+| `placeholder_id` | N/A (Required) | The `id` of  the HTML element whose contents will be populated with the definition of `term_id` |
+| `length` | "short" | Specifies which term definition should be used ("short" for the `short-definition`, "long" for `long-description`, "all" when both should be included). |
@@ -0,0 +1,122 @@
+# See /_plugins/README.md for full documentation of these custom Jekyll tags
+module Jekyll
+  module GlossaryTags
+    # Base class for tags (not to be instantiated)
+    class Base < Liquid::Tag
+      VALID_PARAM_NAMES = []
+      LENGTH_SHORT = "short"
+      LENGTH_LONG = "long"
+      SNIPPET_TEMPLATE = "templates/glossary/snippet.md"
+
+      def initialize(tag_name, markup, options)
+        super
+        @args = {}
+        @markup.scan(/([\S]+=['"][^=]+["'])+/).each do |arg|
+          key, val = arg.first.split("=")
+          key = key.to_sym
+          next unless val
+          if self.class::VALID_PARAM_NAMES.include?(key)
+            @args[key] = val.gsub("\"", "")
+          end
+        end
+      end
+
+      # "abstract" method
+      def render(context)
+        raise NotImplementedError
+      end
+
+      protected
+
+      def glossary_term_info(context)
+        global_glossary_hash = context.registers[:site].data["glossary"]
+        unless global_glossary_hash.keys.to_set.include?(@args[:term_id])
+          raise StandardError,
+            "#{@args[:term_id]} is not a valid glossary term id. Please " \
+            "see ./_data/glossary/* for the complete list."
+        end
+        global_glossary_hash[@args[:term_id]]
+      end
+
+      def include_snippet(context)
+        @args[:length] ||= LENGTH_SHORT
+        clean_markup = @args.keys.map { |k| "#{k}=\"#{@args[k]}\"" }.join(" ")
+
+        Jekyll::Tags::IncludeTag.parse(
+          "include",
+          "#{SNIPPET_TEMPLATE} #{clean_markup}",
+          nil,
+          @parse_context
+        ).render(context)
+      end
+    end
+
+    # Tag for displaying a glossary term's definition inline
+    class Definition < Base
+      VALID_PARAM_NAMES = [
+        :term_id,
+        :length
+      ].freeze
+
+      def render(context)
+        include_snippet(context)
+      end
+    end
+
+    # Tag to display a tooltip for a specific glossary term
+    class Tooltip < Base
+      VALID_PARAM_NAMES = [
+        :text,
+        :term_id
+      ].freeze
+      GLOSSARY_HOME = "/docs/reference/glossary/?all=true"
+      NESTED_TOOLTIPS = /{% (.*?text="(.*?)".*?) %}/
+      NESTED_MARKDOWN_LINKS = /(\[(.*?)\]\(.*?\))/
+
+      def render(context)
+        term_info = glossary_term_info(context)
+        external_link =
+          term_info["full-link"] ||
+          "#{GLOSSARY_HOME}#term-#{term_info["id"]}"
+        tooltip = term_info["short-description"].
+          gsub(NESTED_TOOLTIPS, '\2').
+          gsub(NESTED_MARKDOWN_LINKS, '\2').
+          strip
+
+        "<a class='glossary-tooltip' href='#{external_link}'>" \
+        "#{@args[:text] || term_info["name"]}" \
+        "<span class='tooltip-text'>" \
+        "#{tooltip}" \
+        "</span>" \
+        "</a>"
+      end
+    end
+
+    # Tag to inject a glossary term definition into another HTML element
+    class Injector < Base
+      VALID_PARAM_NAMES = [
+        :text,
+        :term_id,
+        :placeholder_id,
+        :length
+      ].freeze
+      RENDERED_DESCRIPTION_BLOCK = /.*<p>(.+)<\/p>.*/
+
+      def render(context)
+        term_info = glossary_term_info(context)
+        description = RENDERED_DESCRIPTION_BLOCK.match(include_snippet(context))[1]
+
+        "<span class='glossary-injector' data-placeholder-id='#{@args[:placeholder_id]}'>" \
+        "#{@args[:text] || term_info["name"]}" \
+        "<span class='injector-def hide'>" \
+        "#{description}" \
+        "</span>" \
+        "</span>"
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('glossary_definition', Jekyll::GlossaryTags::Definition)
+Liquid::Template.register_tag('glossary_tooltip', Jekyll::GlossaryTags::Tooltip)
+Liquid::Template.register_tag('glossary_injector', Jekyll::GlossaryTags::Injector)
@@ -0,0 +1,10 @@
+# Filter to force liquid parsing
+module Jekyll
+  module LiquifyFilter
+    def liquify(input)
+      Liquid::Template.parse(input).render(@context)
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::LiquifyFilter)
@@ -4,383 +4,435 @@
 # test at https://play.netlify.com/redirects  #
 ###############################################

-#############
-TEMPORARY
-
-/docs/resources-reference/v1.8/*     /docs/api-reference/v1.8/:splat 301
-
-/docs/tasks/administer-cluster/running-cloud-controller.md     /docs/tasks/administer-cluster/running-cloud-controller/ 301
-/docs/concepts/workloads/controllers/statefulset.md     /docs/concepts/workloads/controllers/statefulset/ 301
-/docs/admin/extensible-admission-controllers.md     /docs/admin/extensible-admission-controllers/ 301
-/docs/tasks/administer-cluster/developing-cloud-controller-manager.md     /docs/tasks/administer-cluster/developing-cloud-controller-manager/ 301
-/docs/concepts/workloads/controllers/job/     /docs/concepts/workloads/controllers/jobs-run-to-completion/ 301
-/docs/federation/api-reference/federation/v1beta1/operations.html     /docs/federation/api-reference/federation/v1beta1/operations/ 301
-/docs/federation/api-reference/federation/v1beta1/definitions.html     /docs/federation/api-reference/federation/v1beta1/definitions/ 301
-/docs/federation/api-reference/extensions/v1beta1/operations.html     /docs/federation/api-reference/extensions/v1beta1/operations/ 301
-/docs/federation/api-reference/v1/operations.html     /docs/federation/api-reference/v1/operations/ 301
-/docs/federation/api-reference/extensions/v1beta1/definitions.html     /docs/federation/api-reference/extensions/v1beta1/definitions/ 301
-/docs/federation/api-reference/v1/definitions.html     /docs/federation/api-reference/v1/definitions/ 301
-/docs/tasks/administer-cluster/certificate-rotation/     /docs/admin/kubelet-tls-bootstrapping/ 301
-/docs/tasks/administer-cluster/running-cloud-controller.md     /docs/tasks/administer-cluster/running-cloud-controller/ 301
-/docs/concepts/workloads/controllers/statefulset.md     /docs/concepts/workloads/controllers/statefulset/ 301
-/docs/concepts/workloads/controllers/deployment.md     /docs/concepts/workloads/controllers/deployment/ 301
-/docs/tasks/administer-cluster/out-of-resource/memory-available.sh     /docs/concepts/cluster-administration/out-of-resource/memory-available.sh 301
-
-#############
-
 /api-ref/     https://github.com/kubernetes/kubernetes/milestones/ 301
-/concepts/containers/container-lifecycle-hooks                  /docs/concepts/containers/container-lifecycle-hooks     301
-/docs/                                                          /docs/home/     301
-/docs/abstractions/controllers/petset                           /docs/concepts/workloads/controllers/statefulset        301
-/docs/admin/                                                    /docs/concepts/cluster-administration/cluster-administration-overview       301
+/concepts/containers/container-lifecycle-hooks/     /docs/concepts/containers/container-lifecycle-hooks/ 301
+/docs/     /docs/home/ 301
+/docs/abstractions/controllers/petset/     /docs/concepts/workloads/controllers/statefulset/ 301
+
+/docs/admin/     /docs/concepts/cluster-administration/cluster-administration-overview/ 301
 /docs/admin/add-ons/     /docs/concepts/cluster-administration/addons/ 301
-/docs/admin/addons                                              /docs/concepts/cluster-administration/addons        301
-/docs/admin/apparmor                                            /docs/tutorials/clusters/apparmor       301
-/docs/admin/audit                                               /docs/tasks/debug-application-cluster/audit     301
+/docs/admin/addons/     /docs/concepts/cluster-administration/addons/ 301
+/docs/admin/apparmor/     /docs/tutorials/clusters/apparmor/ 301
+/docs/admin/audit/     /docs/tasks/debug-application-cluster/audit/ 301
 /docs/admin/authorization/rbac.md     /docs/admin/authorization/rbac/ 301
-/docs/admin/cluster-components                                  /docs/concepts/overview/components      301
-/docs/admin/cluster-management                                  /docs/tasks/administer-cluster/cluster-management       301
-/docs/admin/cluster-troubleshooting                             /docs/tasks/debug-application-cluster/debug-cluster     301
-/docs/admin/daemons                                             /docs/concepts/workloads/controllers/daemonset      301
-/docs/admin/disruptions                                         /docs/concepts/workloads/pods/disruptions       301
-/docs/admin/dns                                                 /docs/concepts/services-networking/dns-pod-service      301
-/docs/admin/etcd                                                /docs/tasks/administer-cluster/configure-upgrade-etcd       301
-/docs/admin/etcd_upgrade                                        /docs/tasks/administer-cluster/configure-upgrade-etcd       301
-/docs/admin/federation/kubefed                                  /docs/tasks/federation/set-up-cluster-federation-kubefed        301
+/docs/admin/cluster-components/     /docs/concepts/overview/components/ 301
+/docs/admin/cluster-management/     /docs/tasks/administer-cluster/cluster-management/ 301
+/docs/admin/cluster-troubleshooting/     /docs/tasks/debug-application-cluster/debug-cluster/ 301
+/docs/admin/daemons/     /docs/concepts/workloads/controllers/daemonset/ 301
+/docs/admin/disruptions/     /docs/concepts/workloads/pods/disruptions/ 301
+/docs/admin/dns/     /docs/concepts/services-networking/dns-pod-service/ 301
+/docs/admin/etcd/     /docs/tasks/administer-cluster/configure-upgrade-etcd/ 301
+/docs/admin/etcd_upgrade/     /docs/tasks/administer-cluster/configure-upgrade-etcd/ 301
+/docs/admin/extensible-admission-controllers.md     /docs/admin/extensible-admission-controllers/ 301
+/docs/admin/federation/kubefed/     /docs/tasks/federation/set-up-cluster-federation-kubefed/ 301
 /docs/admin/federation/kubefed.md     /docs/tasks/federation/set-up-cluster-federation-kubefed/ 301
-/docs/admin/garbage-collection                                  /docs/concepts/cluster-administration/kubelet-garbage-collection        301
-/docs/admin/ha-master-gce                                       /docs/tasks/administer-cluster/highly-available-master      301
-/docs/admin/ha-master-gce.md     /docs/tasks/administer-cluster/highly-available-master/ 301
-/docs/admin/kubeadm-upgrade-1-7                                 /docs/tasks/administer-cluster/kubeadm-upgrade-1-7      301
-/docs/admin/limitrange     /docs/tasks/administer-cluster/cpu-memory-limit/ 301
+/docs/admin/garbage-collection/     /docs/concepts/cluster-administration/kubelet-garbage-collection/ 301
+/docs/admin/ha-master-gce/     /docs/tasks/administer-cluster/highly-available-master/ 301
+/docs/admin/ha-master-gce.md/     /docs/tasks/administer-cluster/highly-available-master/ 301
+/docs/admin/kubeadm-upgrade-1-7/     /docs/tasks/administer-cluster/kubeadm-upgrade-1-7/ 301
+/docs/admin/limitrange/     /docs/tasks/administer-cluster/cpu-memory-limit/ 301
 /docs/admin/limitrange/Limits/     /docs/tasks/administer-cluster/limit-storage-consumption/#limitrange-to-limit-requests-for-storage/ 301
-/docs/admin/master-node-communication                           /docs/concepts/architecture/master-node-communication       301
-/docs/admin/multi-cluster                                       /docs/concepts/cluster-administration/federation        301
-/docs/admin/multiple-schedulers                                 /docs/tasks/administer-cluster/configure-multiple-schedulers        301
-/docs/admin/namespaces                                          /docs/tasks/administer-cluster/namespaces       301
-/docs/admin/namespaces/walkthrough                              /docs/tasks/administer-cluster/namespaces-walkthrough       301
-/docs/admin/network-plugins                                     /docs/concepts/cluster-administration/network-plugins       301
-/docs/admin/networking                                          /docs/concepts/cluster-administration/networking        301
-/docs/admin/node                                                /docs/concepts/architecture/nodes       301
-/docs/admin/node-allocatable                                    /docs/tasks/administer-cluster/reserve-compute-resources        301
+/docs/admin/master-node-communication/     /docs/concepts/architecture/master-node-communication/ 301
+/docs/admin/multi-cluster/     /docs/concepts/cluster-administration/federation/ 301
+/docs/admin/multiple-schedulers/     /docs/tasks/administer-cluster/configure-multiple-schedulers/ 301
+/docs/admin/namespaces/     /docs/tasks/administer-cluster/namespaces/ 301
+/docs/admin/namespaces/walkthrough/     /docs/tasks/administer-cluster/namespaces-walkthrough/ 301
+/docs/admin/network-plugins/     /docs/concepts/cluster-administration/network-plugins/ 301
+/docs/admin/networking/     /docs/concepts/cluster-administration/networking/ 301
+/docs/admin/node/     /docs/concepts/architecture/nodes/ 301
+/docs/admin/node-allocatable/     /docs/tasks/administer-cluster/reserve-compute-resources/ 301
 /docs/admin/node-allocatable.md     /docs/tasks/administer-cluster/reserve-compute-resources/ 301
 /docs/admin/node-conformance.md     /docs/admin/node-conformance/ 301
-/docs/admin/node-problem                                        /docs/tasks/debug-application-cluster/monitor-node-health       301
-/docs/admin/out-of-resource                                     /docs/tasks/administer-cluster/out-of-resource      301
-/docs/admin/rescheduler                                         /docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods        301
+/docs/admin/node-problem/     /docs/tasks/debug-application-cluster/monitor-node-health/ 301
+/docs/admin/out-of-resource/     /docs/tasks/administer-cluster/out-of-resource/ 301
+/docs/admin/rescheduler/     /docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/ 301
 /docs/admin/resourcequota/*     /docs/concepts/policy/resource-quotas/ 301
-/docs/admin/resourcequota/limitstorageconsumption               /docs/tasks/administer-cluster/limit-storage-consumption        301
-/docs/admin/resourcequota/walkthrough                           /docs/tasks/administer-cluster/quota-api-object     301
-/docs/admin/static-pods                                         /docs/tasks/administer-cluster/static-pod       301
-/docs/admin/sysctls                                             /docs/concepts/cluster-administration/sysctl-cluster        301
-/docs/admin/upgrade-1-6                                         /docs/tasks/administer-cluster/upgrade-1-6      301
-/docs/api                                                       /docs/concepts/overview/kubernetes-api      301
-/docs/api-reference/1_5/*     /docs/api-reference/v1.5/ 301
-/docs/api-reference/apps/v1alpha1/definitions                   https://v1-4.docs.kubernetes.io/docs/api-reference/apps/v1alpha1/definitions        301
-/docs/api-reference/apps/v1beta1/operations                     https://v1-4.docs.kubernetes.io/docs/api-reference/apps/v1beta1/operations      301
-/docs/api-reference/authorization.k8s.io/v1beta1/definitions    https://v1-4.docs.kubernetes.io/docs/api-reference/authorization.k8s.io/v1beta1/definitions     301
-/docs/api-reference/authorization.k8s.io/v1beta1/operations     https://v1-4.docs.kubernetes.io/docs/api-reference/authorization.k8s.io/v1beta1/operations      301
-/docs/api-reference/autoscaling/v1/operations                   https://v1-4.docs.kubernetes.io/docs/api-reference/autoscaling/v1/operations        301
-/docs/api-reference/batch/v1/operations                         https://v1-4.docs.kubernetes.io/docs/api-reference/batch/v1/operations      301
-/docs/api-reference/batch/v2alpha1/definitions                  https://v1-4.docs.kubernetes.io/docs/api-reference/batch/v2alpha1/definitions       301
-/docs/api-reference/certificates.k8s.io/v1alpha1/definitions    https://v1-4.docs.kubernetes.io/docs/api-reference/certificates.k8s.io/v1alpha1/definitions     301
-/docs/api-reference/certificates/v1alpha1/operations            https://v1-4.docs.kubernetes.io/docs/api-reference/certificates/v1alpha1/operations     301
-/docs/api-reference/extensions/v1beta1/operations               https://v1-4.docs.kubernetes.io/docs/api-reference/extensions/v1beta1/operations        301
-/docs/api-reference/policy/v1alpha1/definitions                 https://v1-4.docs.kubernetes.io/docs/api-reference/policy/v1alpha1/definitions      301
-/docs/api-reference/policy/v1beta1/definitions                  https://v1-4.docs.kubernetes.io/docs/api-reference/policy/v1beta1/definitions       301
-/docs/api-reference/README                                      https://v1-4.docs.kubernetes.io/docs/api-reference/README       301
-/docs/api-reference/storage.k8s.io/v1beta1/operations           https://v1-4.docs.kubernetes.io/docs/api-reference/storage.k8s.io/v1beta1/operations        301
-/docs/api-reference/v1.5/node_modules/*     https://v1-5.docs.kubernetes.io/docs/api-reference/v1.5 301
-/docs/api-reference/v1.6/node_modules/*     https://v1-6.docs.kubernetes.io/docs/api-reference/v1.6 301
-/docs/api-reference/v1.7/node_modules/*     /docs/api-reference/v1.7/ 301
-/docs/api-reference/v1/definitions                              /docs/api-reference/v1.8      301
-/docs/api-reference/v1/operations                               /docs/api-reference/v1.8      301
-/docs/concepts/abstractions/controllers/garbage-collection      /docs/concepts/workloads/controllers/garbage-collection     301
-/docs/concepts/abstractions/controllers/petsets                 /docs/concepts/workloads/controllers/statefulset        301
-/docs/concepts/abstractions/controllers/statefulsets            /docs/concepts/workloads/controllers/statefulset        301
-/docs/concepts/abstractions/init-containers                     /docs/concepts/workloads/pods/init-containers       301
-/docs/concepts/abstractions/overview                            /docs/concepts/overview/working-with-objects/kubernetes-objects     301
-/docs/concepts/abstractions/pod                                 /docs/concepts/workloads/pods/pod-overview      301
-/docs/concepts/cluster                                          /docs/concepts/cluster-administration/cluster-administration-overview/      301
-/docs/concepts/cluster-administration/access-cluster            /docs/tasks/access-application-cluster/access-cluster       301
-/docs/concepts/cluster-administration/audit                     /docs/tasks/debug-application-cluster/audit     301
-/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig   /docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig      301
-/docs/concepts/cluster-administration/cluster-management        /docs/tasks/administer-cluster/cluster-management       301
-/docs/concepts/cluster-administration/configure-etcd            /docs/tasks/administer-cluster/configure-upgrade-etcd       301
-/docs/concepts/cluster-administration/device-plugins/     /docs/concepts/cluster-administration/network-plugins/ 301
-/docs/concepts/cluster-administration/etcd-upgrade              /docs/tasks/administer-cluster/configure-upgrade-etcd       301
-/docs/concepts/cluster-administration/federation-service-discovery  /docs/tasks/federation/federation-service-discovery     301
-/docs/concepts/cluster-administration/guaranteed-scheduling-critical-addon-pods /docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods        301
-/docs/concepts/cluster-administration/master-node-communication /docs/concepts/architecture/master-node-communication       301
-/docs/concepts/cluster-administration/multiple-clusters         /docs/concepts/cluster-administration/federation        301
-/docs/concepts/cluster-administration/out-of-resource           /docs/tasks/administer-cluster/out-of-resource      301
-/docs/concepts/cluster-administration/resource-usage-monitoring /docs/tasks/debug-application-cluster/resource-usage-monitoring     301
-/docs/concepts/cluster-administration/static-pod                /docs/tasks/administer-cluster/static-pod       301
-/docs/concepts/clusters/logging                                 /docs/concepts/cluster-administration/logging       301
-/docs/concepts/configuration/container-command-arg              /docs/tasks/inject-data-application/define-command-argument-container/docs/concepts/ecosystem/thirdpartyresource        301                     /docs/tasks/access-kubernetes-api/extend-api-third-party-resource
+/docs/admin/resourcequota/limitstorageconsumption/     /docs/tasks/administer-cluster/limit-storage-consumption/ 301
+/docs/admin/resourcequota/walkthrough/     /docs/tasks/administer-cluster/quota-api-object/ 301
+/docs/admin/static-pods/     /docs/tasks/administer-cluster/static-pod/ 301
+/docs/admin/sysctls/     /docs/concepts/cluster-administration/sysctl-cluster/ 301
+/docs/admin/upgrade-1-6/     /docs/tasks/administer-cluster/upgrade-1-6/ 301
+/docs/admin/resource-quota/     /docs/concepts/policy/resource-quotas/     301
+
+/docs/api/     /docs/concepts/overview/kubernetes-api/ 301
+
+/docs/api-reference/apps/v1alpha1/definitions/     https://v1-4.docs.kubernetes.io/docs/api-reference/apps/v1alpha1/definitions/ 301
+/docs/api-reference/apps/v1beta1/operations/     https://v1-4.docs.kubernetes.io/docs/api-reference/apps/v1beta1/operations/ 301
+/docs/api-reference/authorization.k8s.io/v1beta1/definitions/     https://v1-4.docs.kubernetes.io/docs/api-reference/authorization.k8s.io/v1beta1/definitions/ 301
+/docs/api-reference/authorization.k8s.io/v1beta1/operations/     https://v1-4.docs.kubernetes.io/docs/api-reference/authorization.k8s.io/v1beta1/operations/ 301
+/docs/api-reference/autoscaling/v1/operations/     https://v1-4.docs.kubernetes.io/docs/api-reference/autoscaling/v1/operations/ 301
+/docs/api-reference/batch/v1/operations/     https://v1-4.docs.kubernetes.io/docs/api-reference/batch/v1/operations/ 301
+/docs/api-reference/batch/v2alpha1/definitions/     https://v1-4.docs.kubernetes.io/docs/api-reference/batch/v2alpha1/definitions/ 301
+/docs/api-reference/certificates.k8s.io/v1alpha1/definitions/     https://v1-4.docs.kubernetes.io/docs/api-reference/certificates.k8s.io/v1alpha1/definitions/ 301
+/docs/api-reference/certificates/v1alpha1/operations/     https://v1-4.docs.kubernetes.io/docs/api-reference/certificates/v1alpha1/operations/ 301
+/docs/api-reference/extensions/v1beta1/operations/     https://v1-4.docs.kubernetes.io/docs/api-reference/extensions/v1beta1/operations/ 301
+/docs/api-reference/labels-annotations-taints/     /docs/reference/labels-annotations-taints/ 301
+/docs/api-reference/policy/v1alpha1/definitions/     https://v1-4.docs.kubernetes.io/docs/api-reference/policy/v1alpha1/definitions/ 301
+/docs/api-reference/policy/v1beta1/definitions/     https://v1-4.docs.kubernetes.io/docs/api-reference/policy/v1beta1/definitions/ 301
+/docs/api-reference/README/     https://v1-4.docs.kubernetes.io/docs/api-reference/README/ 301
+/docs/api-reference/storage.k8s.io/v1beta1/operations/     https://v1-4.docs.kubernetes.io/docs/api-reference/storage.k8s.io/v1beta1/operations/ 301
+/docs/api-reference/v1.4/*     https://v1-4.docs.kubernetes.io/docs/reference/ 301
+/docs/api-reference/1_5/*     https://v1-5.docs.kubernetes.io/docs/reference/ 301
+/docs/api-reference/v1.5/*     https://v1-5.docs.kubernetes.io/docs/reference/ 301
+/docs/api-reference/v1.6/*     https://v1-6.docs.kubernetes.io/docs/reference/ 301
+/docs/api-reference/v1.7/*     https://v1-7.docs.kubernetes.io/docs/reference/ 301
+/docs/api-reference/v1/definitions/     /docs/api-reference/v1.8/ 301
+/docs/api-reference/v1/operations/     /docs/api-reference/v1.8/ 301
+
+/docs/concepts/abstractions/controllers/garbage-collection/     /docs/concepts/workloads/controllers/garbage-collection/ 301
+/docs/concepts/abstractions/controllers/petsets/     /docs/concepts/workloads/controllers/statefulset/ 301
+/docs/concepts/abstractions/controllers/statefulsets/     /docs/concepts/workloads/controllers/statefulset/ 301
+/docs/concepts/abstractions/init-containers/     /docs/concepts/workloads/pods/init-containers/ 301
+/docs/concepts/abstractions/overview/     /docs/concepts/overview/working-with-objects/kubernetes-objects/ 301
+/docs/concepts/abstractions/pod/     /docs/concepts/workloads/pods/pod-overview/ 301
+/docs/concepts/cluster/     /docs/concepts/cluster-administration/cluster-administration-overview/ 301
+/docs/concepts/cluster-administration/access-cluster/     /docs/tasks/access-application-cluster/access-cluster/ 301
+/docs/concepts/cluster-administration/audit/     /docs/tasks/debug-application-cluster/audit/ 301
+/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig   /docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig/ 301
+/docs/concepts/cluster-administration/cluster-management/     /docs/tasks/administer-cluster/cluster-management/ 301
+/docs/concepts/cluster-administration/configure-etcd/     /docs/tasks/administer-cluster/configure-upgrade-etcd/ 301
+/docs/concepts/cluster-administration/etcd-upgrade/     /docs/tasks/administer-cluster/configure-upgrade-etcd/ 301
+/docs/concepts/cluster-administration/federation-service-discovery/     /docs/tasks/federation/federation-service-discovery/ 301
+/docs/concepts/cluster-administration/guaranteed-scheduling-critical-addon-pods/     /docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/ 301
+/docs/concepts/cluster-administration/master-node-communication/     /docs/concepts/architecture/master-node-communication/ 301
+/docs/concepts/cluster-administration/multiple-clusters/     /docs/concepts/cluster-administration/federation/ 301
+/docs/concepts/cluster-administration/out-of-resource/     /docs/tasks/administer-cluster/out-of-resource/ 301
+/docs/concepts/cluster-administration/resource-usage-monitoring /docs/tasks/debug-application-cluster/resource-usage-monitoring/ 301
+/docs/concepts/cluster-administration/static-pod/     /docs/tasks/administer-cluster/static-pod/ 301
+/docs/concepts/clusters/logging/     /docs/concepts/cluster-administration/logging/ 301
+/docs/concepts/configuration/container-command-arg/     /docs/tasks/inject-data-application/define-command-argument-container/ 301
+/docs/concepts/configuration/container-command-args/     /docs/tasks/inject-data-application/define-command-argument-container/     301
 /docs/concepts/ecosystem/thirdpartyresource/     /docs/tasks/access-kubernetes-api/extend-api-third-party-resource/ 301
-/docs/concepts/jobs/cron-jobs                                   /docs/concepts/workloads/controllers/cron-jobs      301
-/docs/concepts/jobs/run-to-completion-finite-workloads          /docs/concepts/workloads/controllers/jobs-run-to-completion     301
-/docs/concepts/nodes/node                                       /docs/concepts/architecture/nodes       301
-/docs/concepts/object-metadata/annotations                      /docs/concepts/overview/working-with-objects/annotations        301
+/docs/concepts/jobs/cron-jobs/     /docs/concepts/workloads/controllers/cron-jobs/ 301
+/docs/concepts/jobs/run-to-completion-finite-workloads/     /docs/concepts/workloads/controllers/jobs-run-to-completion/ 301
+/docs/concepts/nodes/node/     /docs/concepts/architecture/nodes/ 301
+/docs/concepts/object-metadata/annotations/     /docs/concepts/overview/working-with-objects/annotations/ 301
 /docs/concepts/overview/     /docs/concepts/overview/what-is-kubernetes/ 301
 /docs/concepts/policy/container-capabilities/     /docs/tasks/configure-pod-container/security-context/#set-capabilities-for-a-container/ 301
 /docs/concepts/policy/security-context/     /docs/tasks/configure-pod-container/security-context/ 301
 /docs/concepts/services-networking/networkpolicies/     /docs/concepts/services-networking/network-policies/ 301
-/docs/concepts/storage/etcd-store-api-object                    /docs/tasks/administer-cluster/configure-upgrade-etcd       301
+/docs/concepts/storage/etcd-store-api-object/     /docs/tasks/administer-cluster/configure-upgrade-etcd/ 301
 /docs/concepts/storage/volumes/emptyDirapiVersion/     /docs/concepts/storage/volumes/#emptydir/ 301
-/docs/concepts/tools/kubectl/object-management-overview         /docs/tutorials/object-management-kubectl/object-management     301
+/docs/concepts/tools/kubectl/object-management-overview/     /docs/tutorials/object-management-kubectl/object-management/ 301
 /docs/concepts/tools/kubectl/object-management-using-commands/     /docs/tutorials/object-management-kubectl/imperative-object-management-command/ 301
-/docs/concepts/tools/kubectl/object-management-using-declarative-config /docs/tutorials/object-management-kubectl/declarative-object-management-configuration       301
-/docs/concepts/tools/kubectl/object-management-using-imperative-commands    /docs/tutorials/object-management-kubectl/imperative-object-management-command      301
-/docs/concepts/tools/kubectl/object-management-using-imperative-config  /docs/tutorials/object-management-kubectl/imperative-object-management-configuration        301
-/docs/concepts/workload/pods/pod-overview/     /docs/concepts/workloads/pods/pod-overview 301
+/docs/concepts/tools/kubectl/object-management-using-declarative-config/     /docs/tutorials/object-management-kubectl/declarative-object-management-configuration/ 301
+/docs/concepts/tools/kubectl/object-management-using-imperative-commands/     /docs/tutorials/object-management-kubectl/imperative-object-management-command/ 301
+/docs/concepts/tools/kubectl/object-management-using-imperative-config/     /docs/tutorials/object-management-kubectl/imperative-object-management-configuration/ 301
 /docs/concepts/workloads/controllers/cron-jobs/deployment/     /docs/concepts/workloads/controllers/cron-jobs/ 301
-/docs/concepts/workloads/controllers/daemonset/docs/concepts/workloads/pods/pod         /docs/concepts/workloads/pods/pod       301
-/docs/concepts/workloads/controllers/deployment/docs/concepts/workloads/pods/pod        /docs/concepts/workloads/pods/pod       301
-/docs/concepts/workloads/controllers/petsets                    /docs/concepts/workloads/controllers/statefulset        301
+/docs/concepts/workloads/controllers/daemonset/docs/concepts/workloads/pods/pod/     /docs/concepts/workloads/pods/pod/ 301
+/docs/concepts/workloads/controllers/deployment/docs/concepts/workloads/pods/pod/     /docs/concepts/workloads/pods/pod/ 301
+/docs/concepts/workloads/controllers/deployment.md     /docs/concepts/workloads/controllers/deployment/ 301
+/docs/concepts/workloads/controllers/job/     /docs/concepts/workloads/controllers/jobs-run-to-completion/ 301
+/docs/concepts/workloads/controllers/petset/     /docs/concepts/workloads/controllers/statefulset/ 301
+/docs/concepts/workloads/controllers/petsets/     /docs/concepts/workloads/controllers/statefulset/ 301
 /docs/concepts/workloads/controllers/statefulsets/     /docs/concepts/workloads/controllers/statefulset/ 301
-/docs/concepts/workloads/pods/init-containers/Kubernetes     /docs/concepts/workloads/pods/init-containers/ 301
+/docs/concepts/workloads/controllers/statefulset.md     /docs/concepts/workloads/controllers/statefulset/ 301
+/docs/concepts/workloads/pods/init-containers/Kubernetes/     /docs/concepts/workloads/pods/init-containers/ 301
+
 /docs/consumer-guideline/pod-security-coverage/     /docs/concepts/policy/pod-security-policy/ 301
-/docs/contribute/create-pull-request/     /docs/home/contribute/create-pull-request 301
-/docs/contribute/page-templates/     /docs/home/contribute/page-templates 301
-/docs/contribute/review-issues/     /docs/home/contribute/review-issues 301
+
+/docs/contribute/create-pull-request/     /docs/home/contribute/create-pull-request/ 301
+/docs/contribute/page-templates/     /docs/home/contribute/page-templates/ 301
+/docs/contribute/review-issues/     /docs/home/contribute/review-issues/ 301
 /docs/contribute/stage-documentation-changes/     /docs/home/contribute/stage-documentation-changes/ 301
-/docs/contribute/style-guide/     /docs/home/contribute/style-guide 301
-/docs/contribute/write-new-topic        /docs/home/contribute/write-new-topic       301
-/docs/deprecate/     /ddocs/reference/deprecation-policy/ 301
+/docs/contribute/style-guide/     /docs/home/contribute/style-guide/ 301
+
+/docs/contribute/write-new-topic/        /docs/home/contribute/write-new-topic/ 301
+/docs/deprecate/     /docs/reference/deprecation-policy/ 301
+/docs/deprecated/     /docs/reference/deprecation-policy/ 301
 /docs/deprecation-policy/     /docs/reference/deprecation-policy/ 301
+
 /docs/federation/api-reference/     /docs/reference/federation/v1/operations/ 301
-/docs/federation/api-reference/extensions/v1beta1/definitions   /docs/reference/federation/extensions/v1beta1/definitions       301
-/docs/federation/api-reference/extensions/v1beta1/operations     /docs/reference/federation/extensions/v1beta1/operations/ 301
-/docs/federation/api-reference/federation/v1beta1/definitions   /docs/reference/federation/extensions/v1beta1/definitions       301
-/docs/federation/api-reference/federation/v1beta1/operations     /docs/reference/federation/extensions/v1beta1/operations/ 301
-/docs/federation/api-reference/README                           /docs/reference/federation      301
-/docs/federation/api-reference/v1/definitions                   /docs/reference/federation/v1/definitions       301
+/docs/federation/api-reference/v1/definitions.html     /docs/federation/api-reference/v1/definitions/ 301
+/docs/federation/api-reference/v1/operations.html     /docs/federation/api-reference/v1/operations/ 301
+/docs/federation/api-reference/extensions/v1beta1/definitions/     /docs/reference/federation/extensions/v1beta1/definitions/ 301
+/docs/federation/api-reference/extensions/v1beta1/definitions.html     /docs/federation/api-reference/extensions/v1beta1/definitions/ 301
+/docs/federation/api-reference/extensions/v1beta1/operations/     /docs/reference/federation/extensions/v1beta1/operations/ 301
+/docs/federation/api-reference/federation/v1beta1/definitions/     /docs/reference/federation/extensions/v1beta1/definitions/ 301
+/docs/federation/api-reference/federation/v1beta1/definitions.html     /docs/federation/api-reference/federation/v1beta1/definitions/ 301
+/docs/federation/api-reference/federation/v1beta1/operations/     /docs/reference/federation/extensions/v1beta1/operations/ 301
+/docs/federation/api-reference/extensions/v1beta1/operations.html     /docs/federation/api-reference/extensions/v1beta1/operations/ 301
+/docs/federation/api-reference/federation/v1beta1/operations.html     /docs/federation/api-reference/federation/v1beta1/operations/ 301
+/docs/federation/api-reference/README/     /docs/reference/federation/ 301
+/docs/federation/api-reference/v1/definitions/     /docs/reference/federation/v1/definitions/ 301
 /docs/federation/api-reference/v1/operations/     /docs/reference/federation/v1/operations/ 301
+
 /docs/getting-started-guide/*     /docs/setup/ 301
-/docs/getting-started-guides                                    /docs/setup/pick-right-solution     301
-/docs/getting-started-guides/coreos/azure               /docs/getting-started-guides/coreos     301
-/docs/getting-started-guides/coreos/bare_metal_calico   /docs/getting-started-guides/coreos     301
+/docs/getting-started-guides/     /docs/setup/pick-right-solution/ 301
+/docs/getting-started-guides/coreos/azure/     /docs/getting-started-guides/coreos/ 301
+/docs/getting-started-guides/coreos/bare_metal_calico/     /docs/getting-started-guides/coreos/ 301
 /docs/getting-started-guides/docker-multinode/*     /docs/setup/independent/create-cluster-kubeadm/ 301
-/docs/getting-started-guides/juju                       /docs/getting-started-guides/ubuntu/installation        301
-/docs/getting-started-guides/kargo                      /docs/getting-started-guides/kubespray      301
-/docs/getting-started-guides/kubeadm                            /docs/setup/independent/create-cluster-kubeadm      301
-/docs/getting-started-guides/logging                    /docs/concepts/cluster-administration/logging       301
-/docs/getting-started-guides/logging-elasticsearch      /docs/tasks/debug-application-cluster/logging-elasticsearch-kibana      301
+/docs/getting-started-guides/juju/     /docs/getting-started-guides/ubuntu/installation/ 301
+/docs/getting-started-guides/kargo/     /docs/getting-started-guides/kubespray/ 301
+/docs/getting-started-guides/kubeadm/     /docs/setup/independent/create-cluster-kubeadm/ 301
+/docs/getting-started-guides/kubectl/     /docs/reference/kubectl/overview/ 301
+/docs/getting-started-guides/logging/     /docs/concepts/cluster-administration/logging/ 301
+/docs/getting-started-guides/logging-elasticsearch/     /docs/tasks/debug-application-cluster/logging-elasticsearch-kibana/ 301
 /docs/getting-started-guides/meanstack/     https://medium.com/google-cloud/running-a-mean-stack-on-google-cloud-platform-with-kubernetes-149ca81c2b5d/ 301
-/docs/getting-started-guides/network-policy/calico              /docs/tasks/administer-cluster/calico-network-policy        301
-/docs/getting-started-guides/network-policy/romana              /docs/tasks/administer-cluster/romana-network-policy        301
-/docs/getting-started-guides/network-policy/walkthrough         /docs/tasks/administer-cluster/declare-network-policy       301
-/docs/getting-started-guides/network-policy/weave               /docs/tasks/administer-cluster/weave-network-policy     301
-/docs/getting-started-guides/rackspace                  /docs/setup/pick-right-solution     301
-/docs/getting-started-guides/running-cloud-controller           /docs/tasks/administer-cluster/running-cloud-controller     301
-/docs/getting-started-guides/ubuntu-calico              /docs/getting-started-guides/ubuntu     301
-/docs/getting-started-guides/ubuntu/automated           /docs/getting-started-guides/ubuntu     301
-/docs/getting-started-guides/ubuntu/calico                      /docs/getting-started-guides/ubuntu/        301
-/docs/getting-started-guides/vagrant                    /docs/getting-started-guides/alternatives       301
-/docs/getting-started-guides/windows/While              /docs/getting-started-guides/windows        301
-/docs/hellonode                                                 /docs/tutorials/stateless-application/hello-minikube        301
+/docs/getting-started-guides/network-policy/calico/     /docs/tasks/administer-cluster/calico-network-policy/ 301
+/docs/getting-started-guides/network-policy/romana/     /docs/tasks/administer-cluster/romana-network-policy/ 301
+/docs/getting-started-guides/network-policy/walkthrough/     /docs/tasks/administer-cluster/declare-network-policy/ 301
+/docs/getting-started-guides/network-policy/weave/     /docs/tasks/administer-cluster/weave-network-policy/ 301
+/docs/getting-started-guides/rackspace/     /docs/setup/pick-right-solution/ 301
+/docs/getting-started-guides/running-cloud-controller/     /docs/tasks/administer-cluster/running-cloud-controller/ 301
+/docs/getting-started-guides/ubuntu-calico/     /docs/getting-started-guides/ubuntu/ 301
+/docs/getting-started-guides/ubuntu/automated/     /docs/getting-started-guides/ubuntu/ 301
+/docs/getting-started-guides/ubuntu/calico/     /docs/getting-started-guides/ubuntu/ 301
+/docs/getting-started-guides/vagrant/     /docs/getting-started-guides/alternatives/ 301
+/docs/getting-started-guides/windows/While/     /docs/getting-started-guides/windows/ 301
+
+/docs/hellonode/     /docs/tutorials/stateless-application/hello-minikube/ 301
 /docs/home/coreos/     /docs/getting-started-guides/coreos/ 301
 /docs/home/deprecation-policy/     /docs/reference/deprecation-policy/ 301
-/docs/reference/federation/v1beta1/definitions                  /docs/reference/federation/extensions/v1beta1/definitions       301
-/docs/reference/federation/v1beta1/operations                   /docs/reference/federation/extensions/v1beta1/operations        301
-/docs/reporting-security-issues     /security       301
+
+/docs/reference/federation/v1beta1/definitions/     /docs/reference/federation/extensions/v1beta1/definitions/ 301
+/docs/reference/federation/v1beta1/operations/     /docs/reference/federation/extensions/v1beta1/operations/ 301
+/docs/reporting-security-issues/     /security/ 301
+
 /docs/resources-reference/1_5/*     /docs/resources-reference/v1.5/ 301
 /docs/resources-reference/1_5/*     https://v1-5.docs.kubernetes.io/docs/resources-reference/v1.5/ 301
 /docs/resources-reference/1_6/*     /docs/resources-reference/v1.6/ 301
 /docs/resources-reference/1_7/*     /docs/resources-reference/v1.7/ 301
 /docs/resources-reference/v1.5/node_modules/*     https://v1-5.docs.kubernetes.io/docs/resources-reference/v1.5/ 301
+/docs/resources-reference/v1.8/*     /docs/api-reference/v1.8/:splat 301
+
 /docs/roadmap/     https://github.com/kubernetes/kubernetes/milestones/ 301
-/docs/samples                                                   /docs/tutorials/        301
-/docs/stable/user-guide/labels                                                  /docs/concepts/overview/working-with-objects/labels     301
-/docs/tasks/access-application-cluster/access-cluster.md                        /docs/tasks/access-application-cluster/access-cluster       301
-/docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig  /docs/tasks/access-application-cluster/configure-access-multiple-clusters   301
-/docs/tasks/access-kubernetes-api/access-kubernetes-api/http-proxy-access-api   /docs/tasks/access-kubernetes-api/http-proxy-access-api     301
-/docs/tasks/administer-cluster/apply-resource-quota-limit       /docs/tasks/administer-cluster/quota-api-object     301
-/docs/tasks/administer-cluster/assign-pods-nodes                /docs/tasks/configure-pod-container/assign-pods-nodes       301
+/docs/samples/     /docs/tutorials/ 301
+/docs/stable/user-guide/labels/     /docs/concepts/overview/working-with-objects/labels/ 301
+
+/docs/tasks/access-application-cluster/access-cluster.md     /docs/tasks/access-application-cluster/access-cluster/ 301
+/docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig/     /docs/tasks/access-application-cluster/configure-access-multiple-clusters/ 301
+/docs/tasks/access-kubernetes-api/access-kubernetes-api/http-proxy-access-api/     /docs/tasks/access-kubernetes-api/http-proxy-access-api/ 301
+/docs/tasks/administer-cluster/apply-resource-quota-limit/     /docs/tasks/administer-cluster/quota-api-object/ 301
+/docs/tasks/administer-cluster/assign-pods-nodes/     /docs/tasks/configure-pod-container/assign-pods-nodes/ 301
+/docs/tasks/administer-cluster/certificate-rotation/     /docs/admin/kubelet-tls-bootstrapping/ 301
 /docs/tasks/administer-cluster/configure-namespace-isolation/     /docs/concepts/services-networking/network-policies/ 301
 /docs/tasks/administer-cluster/configure-pod-disruption-budget/     /docs/tasks/run-application/configure-pdb/ 301
-/docs/tasks/administer-cluster/cpu-management-policies/     /docs/concepts/configuration/manage-compute-resources-container/ 301
-/docs/tasks/administer-cluster/cpu-memory-limit                 /docs/tasks/administer-cluster/memory-default-namespace     301
+/docs/tasks/administer-cluster/cpu-memory-limit/     /docs/tasks/administer-cluster/memory-default-namespace/ 301
 /docs/tasks/administer-cluster/default-cpu-request-limit/     /docs/tasks/configure-pod-container/assign-cpu-resource/#specify-a-cpu-request-and-a-cpu-limit/ 301
 /docs/tasks/administer-cluster/default-memory-request-limit/     /docs/tasks/configure-pod-container/assign-memory-resource/#specify-a-memory-request-and-a-memory-limit/ 301
-/docs/tasks/administer-cluster/overview                         /docs/concepts/cluster-administration/cluster-administration-overview       301
-/docs/tasks/administer-cluster/reserve-compute-resources/out-of-resource.md     /docs/tasks/administer-cluster/out-of-resource      301
-/docs/tasks/administer-cluster/share-configuration              /docs/tasks/access-application-cluster/configure-access-multiple-clusters   301
-/docs/tasks/configure-pod-container/apply-resource-quota-limit  /docs/tasks/administer-cluster/apply-resource-quota-limit       301
-/docs/tasks/configure-pod-container/assign-cpu-ram-container    /docs/tasks/configure-pod-container/assign-memory-resource  301 
-/docs/tasks/configure-pod-container/calico-network-policy       /docs/tasks/administer-cluster/calico-network-policy        301
+/docs/tasks/administer-cluster/developing-cloud-controller-manager.md     /docs/tasks/administer-cluster/developing-cloud-controller-manager/ 301
+/docs/tasks/administer-cluster/out-of-resource/memory-available.sh     /docs/concepts/cluster-administration/out-of-resource/memory-available.sh 301
+/docs/tasks/administer-cluster/overview/     /docs/concepts/cluster-administration/cluster-administration-overview/ 301
+/docs/tasks/administer-cluster/reserve-compute-resources/out-of-resource.md     /docs/tasks/administer-cluster/out-of-resource/ 301
+/docs/tasks/administer-cluster/running-cloud-controller.md     /docs/tasks/administer-cluster/running-cloud-controller/ 301
+/docs/tasks/administer-cluster/share-configuration/     /docs/tasks/access-application-cluster/configure-access-multiple-clusters/ 301
+/docs/tasks/configure-pod-container/apply-resource-quota-limit/     /docs/tasks/administer-cluster/apply-resource-quota-limit/ 301
+/docs/tasks/configure-pod-container/assign-cpu-ram-container/     /docs/tasks/configure-pod-container/assign-memory-resource/ 301
+/docs/tasks/configure-pod-container/calico-network-policy/     /docs/tasks/administer-cluster/calico-network-policy/ 301
 /docs/tasks/configure-pod-container/cilium-network-policy/     /docs/tasks/administer-cluster/cilium-network-policy/ 301
-/docs/tasks/configure-pod-container/communicate-containers-same-pod /docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume        301
-/docs/tasks/configure-pod-container/configure-pod-disruption-budget             /docs/tasks/run-application/configure-pdb       301
-/docs/tasks/configure-pod-container/declare-network-policy      /docs/tasks/administer-cluster/declare-network-policy       301
-/docs/tasks/configure-pod-container/define-command-argument-container           /docs/tasks/inject-data-application/define-command-argument-container       301
-/docs/tasks/configure-pod-container/define-environment-variable-container   /docs/tasks/inject-data-application/define-environment-variable-container       301
-/docs/tasks/configure-pod-container/distribute-credentials-secure   /docs/tasks/inject-data-application/distribute-credentials-secure       301
-/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information  /docs/tasks/inject-data-application/downward-api-volume-expose-pod-information      301
-/docs/tasks/configure-pod-container/environment-variable-expose-pod-information /docs/tasks/inject-data-application/environment-variable-expose-pod-information     301
-/docs/tasks/configure-pod-container/limit-range                 /docs/tasks/administer-cluster/cpu-memory-limit     301
+/docs/tasks/configure-pod-container/communicate-containers-same-pod/     /docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume/ 301
+/docs/tasks/configure-pod-container/configure-pod-disruption-budget/     /docs/tasks/run-application/configure-pdb/ 301
+/docs/tasks/configure-pod-container/declare-network-policy/     /docs/tasks/administer-cluster/declare-network-policy/ 301
+/docs/tasks/configure-pod-container/define-command-argument-container/     /docs/tasks/inject-data-application/define-command-argument-container/ 301
+/docs/tasks/configure-pod-container/define-environment-variable-container/     /docs/tasks/inject-data-application/define-environment-variable-container/ 301
+/docs/tasks/configure-pod-container/distribute-credentials-secure/     /docs/tasks/inject-data-application/distribute-credentials-secure/ 301
+/docs/tasks/configure-pod-container/downward-api-volume-expose-pod-information/     /docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/ 301
+/docs/tasks/configure-pod-container/environment-variable-expose-pod-information/     /docs/tasks/inject-data-application/environment-variable-expose-pod-information/ 301
+/docs/tasks/configure-pod-container/limit-range/     /docs/tasks/administer-cluster/cpu-memory-limit/ 301
+/docs/tasks/configure-pod-container/opaque-integer-resource/    /docs/concepts/configuration/manage-compute-resources-container/#opaque-integer-resources-alpha-feature 301
 /docs/tasks/configure-pod-container/projected-volume/     /docs/tasks/configure-pod-container/configure-projected-volume-storage/ 301
-/docs/tasks/configure-pod-container/romana-network-policy       /docs/tasks/administer-cluster/romana-network-policy        301
-/docs/tasks/configure-pod-container/weave-network-policy        /docs/tasks/administer-cluster/weave-network-policy         301
-/docs/tasks/debug-application-cluster/sematext-logging-monitoring               https://sematext.com/kubernetes/        301
+/docs/tasks/configure-pod-container/romana-network-policy/     /docs/tasks/administer-cluster/romana-network-policy/ 301
+/docs/tasks/configure-pod-container/weave-network-policy/     /docs/tasks/administer-cluster/weave-network-policy/ 301
+/docs/tasks/debug-application-cluster/sematext-logging-monitoring/     https://sematext.com/kubernetes/ 301
 /docs/tasks/federation/set-up-cluster-federation-kubefed.md     /docs/tasks/federation/set-up-cluster-federation-kubefed/ 301
-/docs/tasks/job/work-queue-1                                                    /docs/concepts/workloads/controllers/jobs-run-to-completion     301
-/docs/tasks/kubectl/get-shell-running-container                 /docs/tasks/debug-application-cluster/get-shell-running-container       301
-/docs/tasks/kubectl/install                                     /docs/tasks/tools/install-kubectl       301
-/docs/tasks/kubectl/list-all-running-container-images           /docs/tasks/access-application-cluster/list-all-running-container-images        301
-/docs/tasks/manage-stateful-set/debugging-a-statefulset         /docs/tasks/debug-application-cluster/debug-stateful-set        301
-/docs/tasks/manage-stateful-set/delete-pods                                     /docs/tasks/run-application/delete-stateful-set     301
-/docs/tasks/manage-stateful-set/deleting-a-statefulset          /docs/tasks/run-application/delete-stateful-set     301
-/docs/tasks/manage-stateful-set/scale-stateful-set              /docs/tasks/run-application/scale-stateful-set      301
-/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set /docs/tasks/run-application/upgrade-pet-set-to-stateful-set     301
-/docs/tasks/run-application/podpreset                           /docs/tasks/inject-data-application/podpreset       301
+/docs/tasks/job/work-queue-1/     /docs/concepts/workloads/controllers/jobs-run-to-completion/ 301
+/docs/tasks/kubectl/get-shell-running-container/     /docs/tasks/debug-application-cluster/get-shell-running-container/ 301
+/docs/tasks/kubectl/install/     /docs/tasks/tools/install-kubectl/ 301
+/docs/tasks/kubectl/list-all-running-container-images/     /docs/tasks/access-application-cluster/list-all-running-container-images/ 301
+/docs/tasks/manage-stateful-set/debugging-a-statefulset/     /docs/tasks/debug-application-cluster/debug-stateful-set/ 301
+/docs/tasks/manage-stateful-set/delete-pods/     /docs/tasks/run-application/delete-stateful-set/ 301
+/docs/tasks/manage-stateful-set/deleting-a-statefulset/     /docs/tasks/run-application/delete-stateful-set/ 301
+/docs/tasks/manage-stateful-set/scale-stateful-set/     /docs/tasks/run-application/scale-stateful-set/ 301
+/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/     /docs/tasks/run-application/upgrade-pet-set-to-stateful-set/ 301
+/docs/tasks/run-application/podpreset/     /docs/tasks/inject-data-application/podpreset/ 301
 /docs/tasks/stateful-sets/deleting-pods/     /docs/tasks/run-application/force-delete-stateful-set-pod/ 301
-/docs/tasks/troubleshoot/debug-init-containers                  /docs/tasks/debug-application-cluster/debug-init-containers     301
-/docs/tasks/web-ui-dashboard                                    /docs/tasks/access-application-cluster/web-ui-dashboard     301
+/docs/tasks/troubleshoot/debug-init-containers/     /docs/tasks/debug-application-cluster/debug-init-containers/ 301
+/docs/tasks/web-ui-dashboard/     /docs/tasks/access-application-cluster/web-ui-dashboard/ 301
+
 /docs/templatedemos/*     /docs/home/contribute/page-templates/ 301
-/docs/tools/kompose                                             /docs/tools/kompose/user-guide      301
+/docs/tools/kompose/     /docs/tools/kompose/user-guide/ 301
 /docs/troubleshooting/     /docs/tasks/debug-application-cluster/troubleshooting/ 301
-/docs/tutorials/clusters/multiple-schedulers                    /docs/tasks/administer-cluster/configure-multiple-schedulers        301
-/docs/tutorials/connecting-apps/connecting-frontend-backend     /docs/tasks/access-application-cluster/connecting-frontend-backend      301
-/docs/tutorials/federation/set-up-cluster-federation-kubefed    /docs/tasks/federation/set-up-cluster-federation-kubefed        301
+
+/docs/tutorials/clusters/multiple-schedulers/     /docs/tasks/administer-cluster/configure-multiple-schedulers/ 301
+/docs/tutorials/connecting-apps/connecting-frontend-backend/     /docs/tasks/access-application-cluster/connecting-frontend-backend/ 301
+/docs/tutorials/federation/set-up-cluster-federation-kubefed/     /docs/tasks/federation/set-up-cluster-federation-kubefed/ 301
 /docs/tutorials/federation/set-up-cluster-federation-kubefed.md     /docs/tasks/federation/set-up-cluster-federation-kubefed/ 301
-/docs/tutorials/federation/set-up-coredns-provider-federation   /docs/tasks/federation/set-up-coredns-provider-federation       301
-/docs/tutorials/federation/set-up-placement-policies-federation /docs/tasks/federation/set-up-placement-policies-federation     301
-/docs/tutorials/getting-started/cluster-intro           /docs/tutorials/kubernetes-basics/cluster-intro     301
-/docs/tutorials/getting-started/create-cluster                  /docs/tutorials/kubernetes-basics/cluster-intro     301
-/docs/tutorials/getting-started/expose-intro            /docs/tutorials/kubernetes-basics/expose-intro      301
-/docs/tutorials/getting-started/scale-app               /docs/tutorials/kubernetes-basics/scale-interactive     301
-/docs/tutorials/getting-started/scale-intro             /docs/tutorials/kubernetes-basics/scale-intro       301
-/docs/tutorials/getting-started/update-interactive      /docs/tutorials/kubernetes-basics/update-interactive        301
-/docs/tutorials/getting-started/update-intro            /docs/tutorials/kubernetes-basics/      301
-/docs/tutorials/stateful-application/run-replicated-stateful-application    /docs/tasks/run-application/run-replicated-stateful-application     301
-/docs/tutorials/stateful-application/run-stateful-application   /docs/tasks/run-application/run-single-instance-stateful-application        301
-/docs/tutorials/stateless-application/expose-external-ip-address-service    /docs/tasks/access-application-cluster/service-access-application-cluster       301
-/docs/tutorials/stateless-application/run-stateless-ap-replication-controller   /docs/tasks/run-application/run-stateless-application-deployment        301
-/docs/tutorials/stateless-application/run-stateless-application-deployment  /docs/tasks/run-application/run-stateless-application-deployment        301
-/docs/user-guide                                                /docs/home/     301
-/docs/user-guide/accessing-the-cluster                          /docs/tasks/access-application-cluster/access-cluster       301
-/docs/user-guide/add-entries-to-pod-etc-hosts-with-host-aliases /docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases       301
-/docs/user-guide/annotations                                    /docs/concepts/overview/working-with-objects/annotations        301
-/docs/user-guide/application-troubleshooting                    /docs/tasks/debug-application-cluster/debug-application     301
-/docs/user-guide/compute-resources                              /docs/concepts/configuration/manage-compute-resources-container     301
-/docs/user-guide/config-best-practices                          /docs/concepts/configuration/overview       301
-/docs/user-guide/configmap                                      /docs/tasks/configure-pod-container/configmap       301
-/docs/user-guide/configuring-containers                         /docs/tasks/        301
-/docs/user-guide/connecting-applications                        /docs/concepts/services-networking/connect-applications-service     301
-/docs/user-guide/connecting-to-applications-port-forward        /docs/tasks/access-application-cluster/port-forward-access-application-cluster      301
-/docs/user-guide/connecting-to-applications-proxy               /docs/tasks/access-kubernetes-api/http-proxy-access-api     301
-/docs/user-guide/container-environment                          /docs/concepts/containers/container-lifecycle-hooks     301
-/docs/user-guide/containers                                 /docs/tasks/inject-data-application/define-command-argument-container       301
-/docs/user-guide/cron-jobs                                      /docs/concepts/workloads/controllers/cron-jobs      301
-/docs/user-guide/debugging-pods-and-replication-controllers/    /docs/tasks/debug-application-cluster/debug-pod-replication-controller/     301
-/docs/user-guide/debugging-services                             /docs/tasks/debug-application-cluster/debug-service     301
-/docs/user-guide/deploying-applications                         /docs/tasks/run-application/run-stateless-application-deployment        301
-/docs/user-guide/deployments                                    /docs/concepts/workloads/controllers/deployment     301
-/docs/user-guide/downward-api                                   /docs/tasks/inject-data-application/downward-api-volume-expose-pod-information      301
-/docs/user-guide/downward-api/volume                            /docs/tasks/inject-data-application/downward-api-volume-expose-pod-information      301
-/docs/user-guide/environment-guide                              /docs/tasks/inject-data-application/environment-variable-expose-pod-information     301
-/docs/user-guide/federation                                     /docs/concepts/cluster-administration/federation        301
-/docs/user-guide/federation/cluster                             /docs/tasks/administer-federation/cluster       301
-/docs/user-guide/federation/configmap                           /docs/tasks/administer-federation/configmap     301
-/docs/user-guide/federation/daemonsets                          /docs/tasks/administer-federation/daemonset     301
-/docs/user-guide/federation/deployment                          /docs/tasks/administer-federation/deployment        301
-/docs/user-guide/federation/events                              /docs/tasks/administer-federation/events        301
-/docs/user-guide/federation/federated-ingress                   /docs/tasks/administer-federation/ingress       301
-/docs/user-guide/federation/federated-services                  /docs/tasks/federation/federation-service-discovery     301
-/docs/user-guide/federation/namespaces                          /docs/tasks/administer-federation/namespaces        301
-/docs/user-guide/federation/replicasets                         /docs/tasks/administer-federation/replicaset        301
-/docs/user-guide/federation/secrets                             /docs/tasks/administer-federation/secret        301
-/docs/user-guide/garbage-collection                             /docs/concepts/workloads/controllers/garbage-collection     301
+/docs/tutorials/federation/set-up-coredns-provider-federation/     /docs/tasks/federation/set-up-coredns-provider-federation/ 301
+/docs/tutorials/federation/set-up-placement-policies-federation/     /docs/tasks/federation/set-up-placement-policies-federation/ 301
+/docs/tutorials/getting-started/cluster-intro/     /docs/tutorials/kubernetes-basics/cluster-intro/ 301
+/docs/tutorials/getting-started/create-cluster/     /docs/tutorials/kubernetes-basics/cluster-intro/ 301
+/docs/tutorials/getting-started/expose-intro/     /docs/tutorials/kubernetes-basics/expose-intro/ 301
+/docs/tutorials/getting-started/scale-app/     /docs/tutorials/kubernetes-basics/scale-interactive/ 301
+/docs/tutorials/getting-started/scale-intro/     /docs/tutorials/kubernetes-basics/scale-intro/ 301
+/docs/tutorials/getting-started/update-interactive/     /docs/tutorials/kubernetes-basics/update-interactive/ 301
+/docs/tutorials/getting-started/update-intro/     /docs/tutorials/kubernetes-basics/ 301
+/docs/tutorials/stateful-application/run-replicated-stateful-application/     /docs/tasks/run-application/run-replicated-stateful-application/ 301
+/docs/tutorials/stateful-application/run-stateful-application/     /docs/tasks/run-application/run-single-instance-stateful-application/ 301
+/docs/tutorials/stateless-application/expose-external-ip-address-service/     /docs/tasks/access-application-cluster/service-access-application-cluster/ 301
+/docs/tutorials/stateless-application/run-stateless-ap-replication-controller/     /docs/tasks/run-application/run-stateless-application-deployment/ 301
+/docs/tutorials/stateless-application/run-stateless-application-deployment/     /docs/tasks/run-application/run-stateless-application-deployment/ 301
+/docs/tutorials/tasks/set-up-cluster-federation-kubefed/     /docs/tasks/federation/set-up-cluster-federation-kubefed/ 301
+
+/docs/user-guide/     /docs/home/ 301
+/docs/user-guide/accessing-the-cluster/     /docs/tasks/access-application-cluster/access-cluster/ 301
+/docs/user-guide/add-entries-to-pod-etc-hosts-with-host-aliases/     /docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ 301
+/docs/user-guide/annotations/     /docs/concepts/overview/working-with-objects/annotations/ 301
+/docs/user-guide/application-troubleshooting/     /docs/tasks/debug-application-cluster/debug-application/ 301
+/docs/user-guide/compute-resources/     /docs/concepts/configuration/manage-compute-resources-container/ 301
+/docs/user-guide/config-best-practices/     /docs/concepts/configuration/overview/ 301
+/docs/user-guide/configmap/     /docs/tasks/configure-pod-container/configmap/ 301
+/docs/user-guide/configmap/README/     /docs/tasks/configure-pod-container/configure-pod-configmap/ 301
+/docs/user-guide/configuring-containers/     /docs/tasks/configure-pod-container/configmap/ 301
+/docs/user-guide/connecting-applications/     /docs/concepts/services-networking/connect-applications-service/ 301
+/docs/user-guide/connecting-to-applications-port-forward/     /docs/tasks/access-application-cluster/port-forward-access-application-cluster/ 301
+/docs/user-guide/connecting-to-applications-proxy/     /docs/tasks/access-kubernetes-api/http-proxy-access-api/ 301
+/docs/user-guide/container-environment/     /docs/concepts/containers/container-lifecycle-hooks/ 301
+/docs/user-guide/containers/     /docs/tasks/inject-data-application/define-command-argument-container/ 301
+/docs/user-guide/cron-jobs/     /docs/concepts/workloads/controllers/cron-jobs/ 301
+/docs/user-guide/debugging-pods-and-replication-controllers/     /docs/tasks/debug-application-cluster/debug-pod-replication-controller/ 301
+/docs/user-guide/debugging-services/     /docs/tasks/debug-application-cluster/debug-service/ 301
+/docs/user-guide/deploying-applications/     /docs/tasks/run-application/run-stateless-application-deployment/ 301
+/docs/user-guide/deployments/     /docs/concepts/workloads/controllers/deployment/ 301
+/docs/user-guide/docker-cli-to-kubectl/     /docs/reference/kubectl/docker-cli-to-kubectl/
+/docs/user-guide/downward-api/     /docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/ 301
+/docs/user-guide/downward-api/README/     /docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/ 301
+/docs/user-guide/downward-api/volume/     /docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/ 301
+/docs/user-guide/environment-guide/     /docs/tasks/inject-data-application/environment-variable-expose-pod-information/ 301
+/docs/user-guide/federation/     /docs/concepts/cluster-administration/federation/ 301
+/docs/user-guide/federation/cluster/     /docs/tasks/administer-federation/cluster/ 301
+/docs/user-guide/federation/configmap/     /docs/tasks/administer-federation/configmap/ 301
+/docs/user-guide/federation/configmap.md     /docs/tasks/administer-federation/configmap/ 301
+/docs/user-guide/federation/daemonsets/     /docs/tasks/administer-federation/daemonset/ 301
+/docs/user-guide/federation/daemonsets.md     /docs/tasks/administer-federation/daemonset/ 301
+/docs/user-guide/federation/deployment/     /docs/tasks/administer-federation/deployment/ 301
+/docs/user-guide/federation/deployment.md     /docs/tasks/administer-federation/deployment/ 301
+/docs/user-guide/federation/events/     /docs/tasks/administer-federation/events/ 301
+/docs/user-guide/federation/federated-ingress/     /docs/tasks/administer-federation/ingress/ 301
+/docs/user-guide/federation/federated-services/     /docs/tasks/federation/federation-service-discovery/ 301
+/docs/user-guide/federation/index.md     /docs/concepts/cluster-administration/federation/ 301
+/docs/user-guide/federation/namespaces/     /docs/tasks/administer-federation/namespaces/ 301
+/docs/user-guide/federation/replicasets/     /docs/tasks/administer-federation/replicaset/ 301
+/docs/user-guide/federation/secrets/     /docs/tasks/administer-federation/secret/ 301
+/docs/user-guide/garbage-collection/     /docs/concepts/workloads/controllers/garbage-collection/ 301
 /docs/user-guide/garbage-collector/*     /docs/concepts/workloads/controllers/garbage-collection/ 301
-/docs/user-guide/getting-into-containers                        /docs/tasks/debug-application-cluster/get-shell-running-container       301
-/docs/user-guide/gpus                                           /docs/tasks/manage-gpus/scheduling-gpus     301
+/docs/user-guide/getting-into-containers/     /docs/tasks/debug-application-cluster/get-shell-running-container/ 301
+/docs/user-guide/gpus/     /docs/tasks/manage-gpus/scheduling-gpus/ 301
 /docs/user-guide/horizontal-pod-autoscaler/*     /docs/tasks/run-application/horizontal-pod-autoscale/ 301
-/docs/user-guide/horizontal-pod-autoscaling                     /docs/tasks/run-application/horizontal-pod-autoscale        301
-/docs/user-guide/horizontal-pod-autoscaling/walkthrough         /docs/tasks/run-application/horizontal-pod-autoscale-walkthrough        301
+/docs/user-guide/horizontal-pod-autoscaling/     /docs/tasks/run-application/horizontal-pod-autoscale/ 301
+/docs/user-guide/horizontal-pod-autoscaling/walkthrough/     /docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/ 301
 /docs/user-guide/horizontal-pod-autoscaling/walkthrough.md     /docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/ 301
-/docs/user-guide/identifiers                                    /docs/concepts/overview/working-with-objects/names      301
-/docs/user-guide/images                                         /docs/concepts/containers/images        301
-/docs/user-guide/ingress                                        /docs/concepts/services-networking/ingress      301
-/docs/user-guide/ingress.md                                 /docs/concepts/services-networking/ingress      301
-/docs/user-guide/introspection-and-debugging                    /docs/tasks/debug-application-cluster/debug-application-introspection       301
-/docs/user-guide/jobs                                           /docs/concepts/workloads/controllers/jobs-run-to-completion     301
-/docs/user-guide/jobs/expansions                                /docs/tasks/job/parallel-processing-expansion       301
-/docs/user-guide/jobs/work-queue-1                              /docs/tasks/job/coarse-parallel-processing-work-queue/      301
-/docs/user-guide/jobs/work-queue-2                              /docs/tasks/job/fine-parallel-processing-work-queue/        301
-/docs/user-guide/kubeconfig-file                                /docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig      301
+/docs/user-guide/identifiers/     /docs/concepts/overview/working-with-objects/names/ 301
+/docs/user-guide/images/     /docs/concepts/containers/images/ 301
+/docs/user-guide/ingress/     /docs/concepts/services-networking/ingress/ 301
+/docs/user-guide/ingress.md     /docs/concepts/services-networking/ingress/ 301
+/docs/user-guide/introspection-and-debugging/     /docs/tasks/debug-application-cluster/debug-application-introspection/ 301
+/docs/user-guide/jsonpath/     /docs/reference/kubectl/jsonpath/
+/docs/user-guide/jobs/     /docs/concepts/workloads/controllers/jobs-run-to-completion/ 301
+/docs/user-guide/jobs/expansions/     /docs/tasks/job/parallel-processing-expansion/ 301
+/docs/user-guide/jobs/work-queue-1/     /docs/tasks/job/coarse-parallel-processing-work-queue/ 301
+/docs/user-guide/jobs/work-queue-2/     /docs/tasks/job/fine-parallel-processing-work-queue/ 301
+/docs/user-guide/kubeconfig-file/     /docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig/ 301
+/docs/user-guide/kubectl-overview/     /docs/reference/kubectl/overview/
+/docs/user-guide/kubectl/     /docs/reference/generated/kubectl/kubectl-options/
+/docs/user-guide/kubectl/v1.8/     /docs/reference/generated/kubectl/kubectl-commands/
+/docs/user-guide/kubectl-conventions/     /docs/reference/kubectl/conventions/
+/docs/user-guide/kubectl-cheatsheet/     /docs/reference/kubectl/cheatsheet/
 /docs/user-guide/kubectl/1_5/*     https://v1-5.docs.kubernetes.io/docs/user-guide/kubectl/v1.5/ 301
-/docs/user-guide/kubectl/kubectl_*/     /docs/user-guide/kubectl/v1.7/#:splat 200
+/docs/user-guide/kubectl/kubectl_*/     /docs/reference/generated/kubectl/kubectl-commands#:splat 301
 /docs/user-guide/kubectl/v1.5/node_modules/*     https://v1-5.docs.kubernetes.io/docs/user-guide/kubectl/v1.5/ 301
 /docs/user-guide/kubectl/v1.6/node_modules/*     https://v1-6.docs.kubernetes.io/docs/user-guide/kubectl/v1.6/ 301
-/docs/user-guide/labels                                         /docs/concepts/overview/working-with-objects/labels     301
-/docs/user-guide/liveness                                       /docs/tasks/configure-pod-container/configure-liveness-readiness-probes     301
-/docs/user-guide/load-balancer                                  /docs/tasks/access-application-cluster/create-external-load-balancer        301
+/docs/user-guide/labels/     /docs/concepts/overview/working-with-objects/labels/ 301
+/docs/user-guide/liveness/     /docs/tasks/configure-pod-container/configure-liveness-readiness-probes/ 301
+/docs/user-guide/load-balancer/     /docs/tasks/access-application-cluster/create-external-load-balancer/ 301
 /docs/user-guide/logging/     /docs/concepts/cluster-administration/logging/ 301
-/docs/user-guide/logging/elasticsearch                          /docs/tasks/debug-application-cluster/logging-elasticsearch-kibana      301
-/docs/user-guide/logging/overview                               /docs/concepts/cluster-administration/logging       301
-/docs/user-guide/logging/stackdriver                            /docs/tasks/debug-application-cluster/logging-stackdriver       301
-/docs/user-guide/managing-deployments                           /docs/concepts/cluster-administration/manage-deployment     301
-/docs/user-guide/monitoring                                     /docs/tasks/debug-application-cluster/resource-usage-monitoring     301
-/docs/user-guide/namespaces                                     /docs/concepts/overview/working-with-objects/namespaces     301
-/docs/user-guide/networkpolicies                                /docs/concepts/services-networking/network-policies     301
-/docs/user-guide/node-selection                                 /docs/concepts/configuration/assign-pod-node        301
+/docs/user-guide/logging/elasticsearch/     /docs/tasks/debug-application-cluster/logging-elasticsearch-kibana/ 301
+/docs/user-guide/logging/overview/     /docs/concepts/cluster-administration/logging/ 301
+/docs/user-guide/logging/stackdriver/     /docs/tasks/debug-application-cluster/logging-stackdriver/ 301
+/docs/user-guide/managing-deployments/     /docs/concepts/cluster-administration/manage-deployment/ 301
+/docs/user-guide/monitoring/     /docs/tasks/debug-application-cluster/resource-usage-monitoring/ 301
+/docs/user-guide/namespaces/     /docs/concepts/overview/working-with-objects/namespaces/ 301
+/docs/user-guide/networkpolicies/     /docs/concepts/services-networking/network-policies/ 301
+/docs/user-guide/node-selection/     /docs/concepts/configuration/assign-pod-node/ 301
+/docs/user-guide/node-selection/README     /docs/concepts/configuration/assign-pod-node/ 301
 /docs/user-guide/overview/     /docs/concepts/overview/what-is-kubernetes/ 301
-/docs/user-guide/persistent-volumes                             /docs/concepts/storage/persistent-volumes       301
+/docs/user-guide/persistent-volumes/     /docs/concepts/storage/persistent-volumes/ 301
 /docs/user-guide/persistent-volumes/index     /docs/concepts/storage/persistent-volumes/ 301
 /docs/user-guide/persistent-volumes/index.md     /docs/concepts/storage/persistent-volumes/ 301
-/docs/user-guide/persistent-volumes/walkthrough                 /docs/tasks/configure-pod-container/configure-persistent-volume-storage     301
-/docs/user-guide/petset                                         /docs/concepts/workloads/controllers/statefulset        301
-/docs/user-guide/petset/bootstrapping                           /docs/concepts/workloads/controllers/statefulset        301
-/docs/user-guide/pod-preset/                                    /docs/tasks/inject-data-application/podpreset       301
-/docs/user-guide/pod-security-policy/                           /docs/concepts/policy/pod-security-policy       301
-/docs/user-guide/pod-states                                     /docs/concepts/workloads/pods/pod-lifecycle     301
-/docs/user-guide/pod-templates                                  /docs/concepts/workloads/pods/pod-overview      301
-/docs/user-guide/pods                                           /docs/concepts/workloads/pods/pod       301
-/docs/user-guide/pods/init-container                            /docs/concepts/workloads/pods/init-containers       301
-/docs/user-guide/pods/multi-container                           /docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume        301
-/docs/user-guide/pods/single-container                          /docs/tasks/run-application/run-stateless-application-deployment        301
-/docs/user-guide/prereqs                                        /docs/tasks/tools/install-kubectl       301
-/docs/user-guide/production-pods                                /docs/tasks/        301
-/docs/user-guide/projected-volume                               /docs/tasks/configure-pod-container/configure-projected-volume-storage      301
-/docs/user-guide/quick-start                                    /docs/tasks/access-application-cluster/service-access-application-cluster       301
-/docs/user-guide/replicasets                                    /docs/concepts/workloads/controllers/replicaset     301
-/docs/user-guide/replication-controller                         /docs/concepts/workloads/controllers/replicationcontroller      301
-/docs/user-guide/replication-controller/operations          /docs/concepts/workloads/controllers/replicationcontroller      301
-/docs/user-guide/resizing-a-replication-controller          /docs/concepts/workloads/controllers/replicationcontroller      301
-/docs/user-guide/rolling-updates                                /docs/tasks/run-application/rolling-update-replication-controller       301
-/docs/user-guide/scheduled-jobs                             /docs/concepts/workloads/controllers/cron-jobs      301
-/docs/user-guide/secrets                                        /docs/concepts/configuration/secret     301
-/docs/user-guide/secrets/walkthrough                            /docs/tasks/inject-data-application/distribute-credentials-secure       301
-/docs/user-guide/security-context                           /docs/tasks/configure-pod-container/security-context        301
-/docs/user-guide/service-accounts                               /docs/tasks/configure-pod-container/configure-service-account       301
+/docs/user-guide/persistent-volumes/walkthrough/     /docs/tasks/configure-pod-container/configure-persistent-volume-storage/ 301
+/docs/user-guide/petset/     /docs/concepts/workloads/controllers/statefulset/ 301
+/docs/user-guide/petset/bootstrapping/     /docs/concepts/workloads/controllers/statefulset/ 301
+/docs/user-guide/pod-preset/     /docs/tasks/inject-data-application/podpreset/ 301
+/docs/user-guide/pod-security-policy/     /docs/concepts/policy/pod-security-policy/ 301
+/docs/user-guide/pod-states/     /docs/concepts/workloads/pods/pod-lifecycle/ 301
+/docs/user-guide/pod-templates/     /docs/concepts/workloads/pods/pod-overview/ 301
+/docs/user-guide/pods/     /docs/concepts/workloads/pods/pod/ 301
+/docs/user-guide/pods/init-container/     /docs/concepts/workloads/pods/init-containers/ 301
+/docs/user-guide/pods/multi-container/     /docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume/ 301
+/docs/user-guide/pods/single-container/     /docs/tasks/run-application/run-stateless-application-deployment/ 301
+/docs/user-guide/prereqs/     /docs/tasks/tools/install-kubectl/ 301
+/docs/user-guide/production-pods/     /docs/tasks/ 301
+/docs/user-guide/projected-volume/     /docs/tasks/configure-pod-container/configure-projected-volume-storage/ 301
+/docs/user-guide/quick-start/     /docs/tasks/access-application-cluster/service-access-application-cluster/ 301
+/docs/user-guide/replicasets/     /docs/concepts/workloads/controllers/replicaset/ 301
+/docs/user-guide/replication-controller/     /docs/concepts/workloads/controllers/replicationcontroller/ 301
+/docs/user-guide/replication-controller/operations/     /docs/concepts/workloads/controllers/replicationcontroller/ 301
+/docs/user-guide/resizing-a-replication-controller/     /docs/concepts/workloads/controllers/replicationcontroller/ 301
+/docs/user-guide/rolling-updates/     /docs/tasks/run-application/rolling-update-replication-controller/ 301
+/docs/user-guide/scheduled-jobs/     /docs/concepts/workloads/controllers/cron-jobs/ 301
+/docs/user-guide/secrets/     /docs/concepts/configuration/secret/ 301
+/docs/user-guide/secrets/walkthrough/     /docs/tasks/inject-data-application/distribute-credentials-secure/ 301
+/docs/user-guide/security-context/     /docs/tasks/configure-pod-container/security-context/ 301
+/docs/user-guide/service-accounts/     /docs/tasks/configure-pod-container/configure-service-account/ 301
 /docs/user-guide/service-accounts/working-with-resources/     /docs/tutorials/object-management-kubectl/object-management/ 301
-/docs/user-guide/services                                       /docs/concepts/services-networking/service      301
-/docs/user-guide/services-firewalls                             /docs/tasks/access-application-cluster/configure-cloud-provider-firewall        301
-/docs/user-guide/services/operations                            /docs/tasks/access-application-cluster/connecting-frontend-backend      301
-/docs/user-guide/sharing-clusters                               /docs/tasks/administer-cluster/share-configuration      301
-/docs/user-guide/simple-nginx                                   /docs/tasks/run-application/run-stateless-application-deployment        301
+/docs/user-guide/services/     /docs/concepts/services-networking/service/ 301
+/docs/user-guide/services-firewalls/     /docs/tasks/access-application-cluster/configure-cloud-provider-firewall/ 301
+/docs/user-guide/services/operations/     /docs/tasks/access-application-cluster/connecting-frontend-backend/ 301
+/docs/user-guide/sharing-clusters/     /docs/tasks/administer-cluster/share-configuration/ 301
+/docs/user-guide/simple-nginx/     /docs/tasks/run-application/run-stateless-application-deployment/ 301
 /docs/user-guide/StatefulSet/     /docs/concepts/workloads/controllers/statefulset/ 301
-/docs/user-guide/thirdpartyresources                            /docs/tasks/access-kubernetes-api/extend-api-third-party-resource       301
-/docs/user-guide/ui                                             /docs/tasks/access-application-cluster/web-ui-dashboard     301
+/docs/user-guide/thirdpartyresources/     /docs/tasks/access-kubernetes-api/extend-api-third-party-resource/ 301
+/docs/user-guide/ui/     /docs/tasks/access-application-cluster/web-ui-dashboard/ 301
 /docs/user-guide/ui-access/     /docs/tasks/access-application-cluster/web-ui-dashboard/ 301
 /docs/user-guide/update-dem/     /docs/tasks/run-application/rolling-update-replication-controller/ 301
-/docs/user-guide/update-demo                                    /docs/tasks/run-application/rolling-update-replication-controller       301
-/docs/user-guide/volumes                                        /docs/concepts/storage/volumes      301
-/docs/user-guide/working-with-resources                         /docs/tutorials/object-management-kubectl/object-management     301
-/docs/whatisk8s                                                 /docs/concepts/overview/what-is-kubernetes      301
+/docs/user-guide/update-demo/     /docs/tasks/run-application/rolling-update-replication-controller/ 301
+/docs/user-guide/volumes/     /docs/concepts/storage/volumes/ 301
+
+/docs/user-guide/working-with-resources/     /docs/tutorials/object-management-kubectl/object-management/ 301
+
+/docs/whatisk8s/     /docs/concepts/overview/what-is-kubernetes/ 301
+/events/     /docs/community     301
 /gettingstarted/     /docs/home/ 301
 /horizontal-pod-autoscaler/     /docs/tasks/run-application/horizontal-pod-autoscale/ 301
-/kubernetes     /docs/ 301
+/kubernetes/     /docs/ 301
 /kubernetes-bootcamp/*     /docs/tutorials/kubernetes-basics/ 301
-/kubernetes/swagger-spec                https://github.com/kubernetes/kubernetes/tree/master/api/swagger-spec       301
+/kubernetes/swagger-spec/     https://github.com/kubernetes/kubernetes/tree/master/api/swagger-spec/ 301
 /kubernetes/third_party/swagger-ui/     /docs/reference/ 301
 /latest/docs/     /docs/home/ 301
+/media/     /docs/community     301
+/news/     /docs/community     301
 /resource-quota/     /docs/concepts/policy/resource-quotas/ 301
-/serviceaccount/token                   /docs/tasks/configure-pod-container/configure-service-account       301
+/serviceaccount/token/     /docs/tasks/configure-pod-container/configure-service-account/ 301
 /swagger-spec/*     https://github.com/kubernetes/kubernetes/tree/master/api/swagger-spec/ 301
 /third_party/swagger-ui/*     /docs/reference/ 301
-/v1.1/docs/admin/networking.html        /docs/concepts/cluster-administration/networking        301
-/v1.1/docs/getting-started-guides       /docs/tutorials/kubernetes-basics/                      301
+/v1.1/docs/admin/networking.html     /docs/concepts/cluster-administration/networking/     301
+/v1.1/docs/getting-started-guides/     /docs/tutorials/kubernetes-basics/ 301
+
+https://kubernetes-io-v1-7.netlify.com/*    https://v1-7.docs.kubernetes.io/:splat 301
+
+/docs/admin/cloud-controller-manager/     /docs/reference/generated/cloud-controller-manager/ 301
+/docs/admin/kube-apiserver/     /docs/reference/generated/kube-apiserver/ 301
+/docs/admin/kube-controller-manager/     /docs/reference/generated/kube-controller-manager/ 301
+/docs/admin/kube-proxy/     /docs/reference/generated/kube-proxy/ 301
+/docs/admin/kube-scheduler/     /docs/reference/generated/kube-scheduler/ 301
+/docs/admin/kube-scheduler/     /docs/reference/generated/kube-scheduler/ 301
+/docs/admin/kubeadm/     /docs/reference/generated/kubeadm/ 301
+/docs/admin/kubelet/      /docs/reference/generated/kubelet/ 301
+/docs/admin/federation-controller-manager/    /docs/reference/generated/federation-controller-manager/ 301
+/docs/admin/federation-apiserver/      /docs/reference/generated/federation-apiserver/ 301
+/docs/admin/kubefed/     /docs/reference/generated/kubefed/ 301
+/docs/admin/kubefed_init/    /docs/reference/generated/kubefed_init/ 301
+/docs/admin/kubefed_join/    /docs/reference/generated/kubefed_join/ 301
+/docs/admin/kubefed_options/    /docs/reference/generated/kubefed_options/ 301
+/docs/admin/kubefed_unjoin/     /docs/reference/generated/kubefed_unjoin/ 301
+/docs/admin/kubefed_version/    /docs/reference/generated/kubefed_version/ 301
@@ -379,12 +379,12 @@ ul.global-nav
 		width: 100%
 		background-color: transparentize(white, 0.9)
 		content: ''
-	
+
 	&.no-sub
-		
+
 		h5
 			display: none
-		
+
 		h1
 			margin-bottom: 20px

@@ -478,12 +478,12 @@ footer
 		display: block
 		height: 0
 		overflow: hidden
-		
+
 	&.button
 		background-image: none
 		width: auto
 		height: auto
-		
+
 		&:hover
 			color: $blue

@@ -572,7 +572,7 @@ section
 			height: 44px
 			line-height: 44px
 			position: relative
-			
+
 			&:before
 				position: absolute
 				width: 15px
@@ -829,7 +829,7 @@ dd

 	h1,h2
 		border-bottom: 1px solid #cccccc
-		
+
 	h1
 		font-size: 32px
 		padding-right: 60px
@@ -1009,7 +1009,7 @@ dd
 	a.button
 		border-radius: 2px
 		text-decoration: none
-		
+
 		&:visited
 			color: white

@@ -1022,6 +1022,9 @@ dd

 #miceType
 	clear: both
+	font-size: 11px
+	line-height: 18px
+	color: #aaa


 html.search #docsContent
@@ -1125,7 +1128,7 @@ $feature-box-div-margin-bottom: 40px
 #video
 	width: 100%
 	position: relative
-	background-image: url(/images/kub_video_banner.jpg)
+	background-image: url(/images/kub_video_banner_box.jpg)
 	background-position: center center
 	background-size: cover

@@ -1135,10 +1138,8 @@ $feature-box-div-margin-bottom: 40px
 		position: absolute
 		top: 50%
 		left: 75%
-		width: 50%
-		max-width: 600px
-		min-width: 500px
-		padding-right: 10%
+		width: 525px
+		padding-right: 80px
 		transform: translate(-50%, -50%)
 		color: white

@@ -1150,6 +1151,14 @@ $feature-box-div-margin-bottom: 40px
 	p
 		margin-bottom: 20px

+	#desktopKCButton
+		position: relative
+		font-size: 18px
+		background-color: $dark-grey
+		border-radius: 8px
+		color: $white
+		padding: 20px 10px 20px 10px
+
 	#desktopShowVideoButton
 		position: relative
 		font-size: 24px
@@ -1157,6 +1166,7 @@ $feature-box-div-margin-bottom: 40px
 		border-radius: 8px
 		color: $blue
 		padding: 15px 30px 15px 80px
+		margin-bottom: 15px

 		&:before
 			content: ""
@@ -1332,7 +1342,7 @@ $feature-box-div-margin-bottom: 40px
 			height: 30vw
 			max-width: 1200px
 			max-height: 450px
-			margin: 20px auto			
+			margin: 20px auto

 		iframe
 			position: absolute
@@ -1414,7 +1424,7 @@ $feature-box-div-margin-bottom: 40px

 	h1,h2
 		border-bottom: 1px solid #cccccc
-		
+
 	h1
 		font-size: 32px
 		padding-right: 60px
@@ -1594,7 +1604,7 @@ $feature-box-div-margin-bottom: 40px
 	a.button
 		border-radius: 2px
 		text-decoration: none
-		
+
 		&:visited
 			color: white

@@ -1696,7 +1706,7 @@ $feature-box-div-margin-bottom: 40px
 	#talkToUs
 		main
 			padding: 30px 0
-		
+
 		h5
 			font-size: 20px

@@ -1705,7 +1715,7 @@ $feature-box-div-margin-bottom: 40px
 		position: relative
 		text-align: center
 		margin-bottom: 30px
-		
+
 		div
 			position: relative
 			display: inline-block
@@ -1728,10 +1738,10 @@ $feature-box-div-margin-bottom: 40px

 		div:nth-child(4)
 			background-image: url(/images/community_logos/wikimedia_foundation_logo.png)
-			
+
 		p
 			font-size: 20px
-			
+
 		a
 			position: absolute
 			bottom: 0
@@ -1740,16 +1750,16 @@ $feature-box-div-margin-bottom: 40px
 			color: $blue
 			font-weight: 400

-	
+
 	//#bigSocial
 	//	text-align: center
-	//	
+	//
 	//	div
 	//		display: inline-block
 	//		float: none
 	//		padding-top: 125px
 	//		width: calc(90%)
-	//		
+	//
 	//		a
 	//			margin-top: 15px
 	//			font-size: 18px
@@ -49,7 +49,7 @@ $video-section-height: 550px

 				#searchBox
 					float: right
-					width: 320px
+					width: 250px

 				#search
 					vertical-align: middle
@@ -97,12 +97,15 @@ $video-section-height: 550px
 	section, header, footer
 		main
 			max-width: $main-max-width
-	
+
 	header, #vendorStrip, #encyclopedia, #hero h1, #hero h5, #docs #hero h1, #docs #hero h5,
 	#community #hero h1, .gridPage #hero h1, #community #hero h5, .gridPage #hero h5
 		padding-left: 100px
 		padding-right: 100px

+	#vendorStrip
+		padding-right: 10px
+
 	#home
 		section, header, footer
 			main
@@ -135,7 +138,7 @@ $video-section-height: 550px
 	#video
 		height: $video-section-height
 		position: relative
-		background-image: url(../images/kub_video_banner.jpg)
+		background-image: url(../images/kub_video_banner_box.jpg)
 		background-position: center center
 		background-size: cover

@@ -296,7 +299,7 @@ $video-section-height: 550px
 			width: auto
 			background-color: $blue
 			padding: 0 20px
-			
+



@@ -309,3 +312,7 @@ $video-section-height: 550px
 		div
 			width: 24%
 			min-height: 260px
+
+@media screen and (min-width: 1300px)
+	#vendorStrip
+		padding-right: 100px
--- a/Show More
+++ b/Show More