fix version navigation in release v1.8 (#9357)

* fix version navigation in release v1.8

- In `release v1.8`, navigating selector to version `v1.10` disappears
- modified `_config.yml` in branch `release-1.8`

Signed-off-by: harshvkarn <harshvkarn54@gmail.com>

* missing `docs` from version 1.9 selector's link

* removing v1.5.7 support

remove v1.5.7 selector, as it is no longer supported

* update _config with version 1.11

- add version 1.11 (latest) support

* Update _config.yml

* update .travis.yml

Signed-off-by: harshvkarn <harshvkarn54@gmail.com>

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Remove 1.6

* Attempting a debug fix based on #9358

.github/ISSUE_TEMPLATE.md

@@ -14,7 +14,7 @@
 
 
 **Page to Update:**
-https://kubernetes.io/...
+http://kubernetes.io/...
 
 <!--Optional Information (remove the comment tags around information you would like to include)-->
 <!--Kubernetes Version:-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,11 @@
->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-> For 1.11 Features: set Milestone to 1.11 and Base Branch to release-1.11
->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-> NOTE: After opening the PR, please *un-check and re-check* the ["Allow edits from maintainers"](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) box so that maintainers can work on your patch and speed up the review process. This is a temporary workaround to address a known issue with GitHub.> 
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> 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)

.travis.yml

@@ -7,14 +7,18 @@ install:
 - export PATH=$GOPATH/bin:$PATH
 - mkdir -p $HOME/gopath/src/k8s.io
 - mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/website
+- cd $HOME/gopath/src/k8s.io/website
 
 # (1) Fetch dependencies for us to run the tests in test/examples_test.go
-- go get -t -v k8s.io/website/test
+- pushd $GOPATH/src/k8s.io && git clone https://github.com/kubernetes/kubernetes && popd
+- pushd $GOPATH/src/k8s.io/kubernetes && git checkout release-1.8 && popd
 
-# Simplified deduplication of dependencies.
+# (2) Simplified deduplication of dependencies.
 - cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/
 - rm -r $GOPATH/src/k8s.io/kubernetes/vendor/
 
+- go get -t -v k8s.io/website/test
+
 script:
 - go test -v k8s.io/website/test
-- ./verify-docs-format.sh
+- ./verify-docs-format.sh

Gemfile

@@ -27,7 +27,7 @@ group :jekyll_plugins do
    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.13"
+   gem "jekyll-redirect-from", "~> 0.11"
    gem "jekyll-relative-links", "~> 0.2"
    gem "jekyll-swiss", "~> 0.4"
    gem "jekyll-theme-architect", "0.0.3"
@@ -44,10 +44,10 @@ group :jekyll_plugins do
    gem "jekyll-theme-tactile", "0.0.3"
    gem "jekyll-theme-time-machine", "0.0.3"
    gem "jekyll-titles-from-headings", "~> 0.1"
-   gem "jekyll-include-cache", "~> 0.1"
-   gem 'jekyll-youtube', '~> 1.0'
 end
 
+gem "jekyll-include-cache", "~> 0.1"
+
 gem "kramdown", "~> 1.11"
 gem "rouge", "~> 2.0"
 gem "pry"

Gemfile.lock

@@ -12,9 +12,9 @@ GEM
     ethon (0.11.0)
       ffi (>= 1.3.0)
     execjs (2.7.0)
-    faraday (0.14.0)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.21)
+    ffi (1.9.18)
     forwardable-extended (2.6.0)
     jekyll (3.6.0)
       addressable (~> 2.4)
@@ -33,11 +33,11 @@ GEM
       coffee-script (~> 2.2)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
-    jekyll-feed (0.9.3)
+    jekyll-feed (0.9.2)
       jekyll (~> 3.3)
-    jekyll-gist (1.5.0)
+    jekyll-gist (1.4.1)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.9.4)
+    jekyll-github-metadata (2.9.3)
       jekyll (~> 3.1)
       octokit (~> 4.0, != 4.4.0)
     jekyll-include-cache (0.1.0)
@@ -47,15 +47,15 @@ GEM
     jekyll-paginate (1.1.0)
     jekyll-readme-index (0.0.3)
       jekyll (~> 3.0)
-    jekyll-redirect-from (0.13.0)
+    jekyll-redirect-from (0.12.1)
       jekyll (~> 3.3)
-    jekyll-relative-links (0.5.2)
+    jekyll-relative-links (0.5.1)
       jekyll (~> 3.3)
-    jekyll-sass-converter (1.5.2)
+    jekyll-sass-converter (1.5.0)
       sass (~> 3.4)
-    jekyll-seo-tag (2.4.0)
+    jekyll-seo-tag (2.3.0)
       jekyll (~> 3.3)
-    jekyll-sitemap (1.2.0)
+    jekyll-sitemap (1.1.1)
       jekyll (~> 3.3)
     jekyll-swiss (0.4.0)
     jekyll-theme-architect (0.0.3)
@@ -86,41 +86,35 @@ GEM
       jekyll (~> 3.3)
     jekyll-theme-time-machine (0.0.3)
       jekyll (~> 3.3)
-    jekyll-titles-from-headings (0.5.1)
+    jekyll-titles-from-headings (0.5.0)
       jekyll (~> 3.3)
-    jekyll-watch (1.5.1)
-      listen (~> 3.0)
-    jekyll-youtube (1.0.0)
-      jekyll
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
     json (1.8.6)
-    kramdown (1.16.2)
+    kramdown (1.15.0)
     liquid (4.0.0)
-    listen (3.1.5)
+    listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
     mercenary (0.3.6)
     method_source (0.9.0)
-    minima (2.3.0)
-      jekyll (~> 3.5)
-      jekyll-feed (~> 0.9)
-      jekyll-seo-tag (~> 2.1)
+    minima (2.1.1)
+      jekyll (~> 3.3)
     multipart-post (2.0.0)
-    octokit (4.8.0)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    pathutil (0.16.1)
+    pathutil (0.16.0)
       forwardable-extended (~> 2.6)
-    pry (0.11.3)
+    pry (0.11.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.2)
+    public_suffix (3.0.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rouge (2.2.1)
-    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.5.5)
+    sass (3.5.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -151,7 +145,7 @@ DEPENDENCIES
   jekyll-optional-front-matter (~> 0.1)
   jekyll-paginate (= 1.1.0)
   jekyll-readme-index (= 0.0.3)
-  jekyll-redirect-from (~> 0.13)
+  jekyll-redirect-from (~> 0.11)
   jekyll-relative-links (~> 0.2)
   jekyll-seo-tag
   jekyll-sitemap
@@ -170,7 +164,6 @@ DEPENDENCIES
   jekyll-theme-tactile (= 0.0.3)
   jekyll-theme-time-machine (= 0.0.3)
   jekyll-titles-from-headings (~> 0.1)
-  jekyll-youtube (~> 1.0)
   json (~> 1.7, >= 1.7.7)
   kramdown (~> 1.11)
   minima (~> 2.0)
@@ -180,4 +173,4 @@ DEPENDENCIES
   unicode-display_width (~> 1.1)
 
 BUNDLED WITH
-   1.16.1
+   1.15.4

Makefile

@@ -9,7 +9,7 @@ build: ## Build site with production settings and put deliverables in _site.
 	bundle exec jekyll build
 
 build-preview: ## Build site with drafts and future posts enabled.
-	bundle exec jekyll build --drafts --future --trace
+	bundle exec jekyll build --drafts --future
 
 serve: ## Boot the development server.
 	bundle exec jekyll serve

OWNERS

@@ -1,12 +1,21 @@
+# Reviewers can /lgtm /approve but not sufficient for auto-merge without an
+# approver
 reviewers:
-- tengqm
-- zhangxiaoyu-zidif
+- rajakavitha1
+- stewart-yu
 - xiangpengzhao
-- bradtopol
+- zhangxiaoyu-zidif
+
+# Approvers have all the ability of reviewers but their /approve makes
+# auto-merge happen if a /lgtm exists, or vice versa, or they can do both
+# No need for approvers to also be listed as reviewers
 approvers:
-- heckj
 - bradamant3
 - bradtopol
-- steveperry-53
-- zacharysarah
 - chenopis
+- kbarnard10
+- mistyhacks
+- steveperry-53
+- tengqm
+- zacharysarah
+- zparnold

OWNERS_ALIASES

@@ -1,204 +0,0 @@
-aliases:
-  sig-api-machinery: #Team: API Server; GH: sig-api-machinery-pr-reviews; e.g. Annotations, Labels
-    - lavalamp
-    - sttts
-    - liggitt
-    - smarterclayton
-    - deads2k
-  sig-apps: #Team: Workloads; GH: sig-apps-pr-reviews; e.g. ConfigMaps, CronJobs, CustomResourceDefinitions, DaemonSets, Deployments, Jobs, Secrets, StatefulSets
-    - enisoc
-    - erictune
-    - foxish
-    - janetkuo
-    - kow3ns
-    - lukaszo
-    - mfojtik
-    - smarterclayton
-    - soltysh
-    - tnozicka
-  sig-architecture: #GH: sig-architecture-pr-reviews
-    - smarterclayton
-    - bgrant0607
-  sig-auth: #GH: sig-auth-pr-reviews
-    - php-coder
-    - liggitt
-    - mikedanese
-    - ericchiang
-    - mattmoyer
-    - enj
-    - deads2k
-    - davidopp
-  sig-autoscaling: #GH: sig-autoscaling-pr-reviews
-    - DirectXMan12
-    - bskiba
-    - aleksandra-malinowska
-    - MaciekPytel
-    - davidopp
-    - mwielgus
-  sig-aws: #Amazon AWS
-    - justinsb
-    - kris-nova
-    - chrislovecnm
-    - mfburnett
-  sig-azure: #Microsoft Azure
-    - slack
-    - colemickens
-    - jdumars
-  sig-big-data: #GH: sig-big-data-pr-reviews
-    - foxish
-  sig-cli: #Team: CLI; GH: sig-cli-pr-reviews; e.g. kubectl
-    - adohe
-    - deads2k
-    - derekwaynecarr
-    - dims
-    - dshulyak
-    - eparis
-    - ericchiang
-    - ghodss
-    - mengqiy
-    - rootfs
-    - shiywang
-    - smarterclayton
-    - soltysh
-    - sttts
-  sig-cluster-lifecycle: #GH: sig-cluster-lifecycle-pr-reviews
-    - jbeda
-    - timothysc
-    - lukemarsden
-    - pipejakob
-    - dmmcquay
-    - mattmoyer
-    - luxas
-    - roberthbailey
-    - medinatiger
-  sig-cluster-ops:
-    - zehicle
-    - jdumars
-  sig-contribex: #aka Contributor Experience; GH: sig-contributor-experience-pr-reviews
-    - rmmh
-    - cblecker
-    - apelisse
-    - grodrigues3
-    - spxtr
-  sig-contributor-experience: #GH: sig-contributor-experience-pr-reviews
-    - rmmh
-    - cblecker
-    - apelisse
-    - grodrigues3
-    - spxtr
-  sig-docs: #Team: documentation; GH: sig-docs-pr-reviews
-    - bradamant3
-    - steveperry-53
-    - zacharysarah
-    - bradtopol
-    - heckj
-  sig-federation: #Team: Federation; e.g. Federated Clusters
-    - csbell
-  sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews
-    - abgworrall
-  sig-instrumentation: #GH: sig-instrumentation-pr-reviews; e.g. metrics, logging, events
-    - DirectXMan12
-    - x13n
-    - kawych
-    - brancz
-    - fabxc
-    - loburm
-    - piosz
-    - fgrzadkowski
-  sig-multicluster: #GH: sig-multicluster-pr-reviews; e.g. resiliency against availability zone outages; hybrid clouds; spanning multiple cloud providers; migration to public clouds
-    - madhusudancs
-    - marun
-    - jianhuiz
-    - shashidharatd
-    - nikhiljindal
-    - quinton-hoole
-    - mwielgus
-    - csbell
-  sig-network: #Team: Network; GH: sig-network-pr-reviews; e.g. Ingress, Network Policies, Services
-    - bowei
-    - caseydavenport
-    - danwinship
-    - dcbw
-    - dnardo
-    - freehan
-    - mrhohn
-    - nicksardo
-    - thockin
-  sig-node: #Team: Node; GH: sig-node-pr-reviews; e.g. Containers, Docker, Images, OS images, Pods, Registries
-    - Random-Liu
-    - dashpole
-    - dchen1107
-    - derekwaynecarr
-    - dims
-    - feiskyer
-    - mtaufen
-    - ncdc
-    - pmorie
-    - resouer
-    - sjpotter
-    - tallclair
-    - tmrts
-    - vishh
-    - yifan-gu
-    - yujuhong
-  sig-onprem: #On-premises; GH: sig-onprem-pr-reviews
-    - zen
-    - idvoretskyi
-    - pigmej
-    - feiskyer
-    - nebril
-  sig-openstack: #GH: sig-openstack-pr-reviews
-    - hogepodge
-    - dklyle
-    - rjmorse
-  sig-pm: #aka Product Management
-    - apsinha
-    - idvoretskyi
-    - calebamiles
-  sig-product-management:
-    - apsinha
-    - idvoretskyi
-    - calebamiles
-  sig-release: #GH: sig-release-pr-reviews
-    - calebamiles
-    - enisoc
-    - pwittrock
-  sig-rktnetes:
-    - calebamiles
-  sig-scalability: #GH: sig-scalability-pr-reviews
-    - jbeda
-    - spiffxp
-    - lavalamp
-    - countspongebob
-  sig-scheduling: #Team: Sharing; GH: sig-scheduling-pr-reviews; e.g. Scheduler
-    - bsalamat
-    - davidopp
-    - jayunit100
-    - k82cn
-    - resouer
-    - timothysc
-    - wojtek-t
-  sig-service-catalog: #GH: sig-service-catalog-pr-reviews; e.g. Service Broker
-    - pmorie
-    - jessfraz
-    - pwittrock
-    - droot
-    - seans3
-  sig-storage: #Team: Storage; GH: sig-storage-pr-reviews; e.g. Volumes
-    - childsb
-    - jsafrane
-    - rootfs
-    - saad-ali
-    - matchstick
-    - msau42
-  sig-testing: #GH: sig-testing-pr-reviews
-    - fejta
-    - ixdy
-    - rmmh
-    - spiffxp
-    - spxtr
-  sig-ui: #User Interface
-    - danielromlein
-    - floreks
-  sig-windows:
-    - michmike

_config.yml

@@ -13,47 +13,42 @@ incremental: true
 safe: false
 lsi: false
 
-latest: "v1.10"
-
-paginate: 7
-paginate_path: "/blog/page:num/"
-
 defaults:
   -
     scope:
       path: ""
     values:
-      fullversion: "v1.10.0"
-      version: "v1.10"
+      fullversion: "v1.8.4"
+      version: "v1.8"
       githubbranch: "master"
       docsbranch: "master"
       versions:
-        - fullversion: "v1.10.0"
+      - fullversion: "v1.11.0"
+          version: "v1.11"
+          githubbranch: "v1.11.0"
+          docsbranch: "release-1.11"
+          url: https://kubernetes.io/docs/
+      - fullversion: "v1.10.0"
           version: "v1.10"
           githubbranch: "v1.10.0"
           docsbranch: "release-1.10"
-          url: https://kubernetes.io
+          url: https://v1-10.docs.kubernetes.io/docs/home/
         - fullversion: "v1.9.0"
           version: "v1.9"
           githubbranch: "v1.9.0"
           docsbranch: "release-1.9"
-          url: https://v1-9.docs.kubernetes.io
+          url: https://v1-9.docs.kubernetes.io/docs/home/
         - fullversion: "v1.8.4"
           version: "v1.8"
           githubbranch: "v1.8.4"
           docsbranch: "release-1.8"
-          url: https://v1-8.docs.kubernetes.io
+          url: https://v1-8.docs.kubernetes.io/docs/home/
         - fullversion: "v1.7.6"
           version: "v1.7"
           githubbranch: "v1.7.6"
           docsbranch: "release-1.7"
-          url: https://v1-7.docs.kubernetes.io
-        - fullversion: "v1.6.8"
-          version: "v1.6"
-          githubbranch: "v1.6.8"
-          docsbranch: "release-1.6"
-          url: https://v1-6.docs.kubernetes.io
-      deprecated: false
+          url: https://v1-7.docs.kubernetes.io/docs/home/
+      deprecated: true
       currentUrl: https://kubernetes.io/docs/home/
       nextUrl: http://kubernetes-io-vnext-staging.netlify.com/
   -
@@ -70,8 +65,6 @@ plugins:
   - jekyll-sitemap
   - jekyll-seo-tag
   - jekyll-include-cache
-  - jekyll-paginate
-  - jekyll-youtube
 # disabled gems
 #  - jekyll-redirect-from
 
@@ -95,5 +88,3 @@ tocs:
   - reference
   - samples
   - search
-  - imported
-  - blog

_data/concepts.yml

@@ -1,15 +1,12 @@
 bigheader: "Concepts"
 abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
-landing_page: /docs/concepts/index/
 toc:
 - docs/concepts/index.md
 
 - title: Overview
-  landing_page: /docs/concepts/overview/what-is-kubernetes/
   section:
   - docs/concepts/overview/what-is-kubernetes.md
   - docs/concepts/overview/components.md
-  - docs/concepts/overview/kubernetes-api.md
   - title: Working with Kubernetes Objects
     section:
     - docs/concepts/overview/working-with-objects/kubernetes-objects.md
@@ -17,22 +14,15 @@ toc:
     - docs/concepts/overview/working-with-objects/namespaces.md
     - docs/concepts/overview/working-with-objects/labels.md
     - docs/concepts/overview/working-with-objects/annotations.md
-  - title: Object Management Using kubectl
-    section:
-    - docs/concepts/overview/object-management-kubectl/overview.md
-    - docs/concepts/overview/object-management-kubectl/imperative-command.md
-    - docs/concepts/overview/object-management-kubectl/imperative-config.md
-    - docs/concepts/overview/object-management-kubectl/declarative-config.md
+  - docs/concepts/overview/kubernetes-api.md
 
 - title: Kubernetes Architecture
-  landing_page: /docs/concepts/architecture/nodes/
   section:
   - docs/concepts/architecture/nodes.md
   - docs/concepts/architecture/master-node-communication.md
   - docs/concepts/architecture/cloud-controller.md
 
 - title: Extending Kubernetes
-  landing_page: /docs/concepts/api-extension/custom-resources/
   section:
   - docs/concepts/overview/extending.md
   - title: Extending the Kubernetes API
@@ -43,17 +33,16 @@ toc:
     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
-  landing_page: /docs/concepts/containers/images/
   section:
   - docs/concepts/containers/images.md
   - docs/concepts/containers/container-environment-variables.md
   - docs/concepts/containers/container-lifecycle-hooks.md
 
 - title: Workloads
-  landing_page: /docs/concepts/workloads/pods/pod-overview/
   section:
   - title: Pods
     section:
@@ -75,7 +64,6 @@ toc:
     - docs/concepts/workloads/controllers/cron-jobs.md
 
 - title: Configuration
-  landing_page: /docs/concepts/configuration/overview/
   section:
   - docs/concepts/configuration/overview.md
   - docs/concepts/configuration/manage-compute-resources-container.md
@@ -86,7 +74,6 @@ toc:
   - docs/concepts/configuration/pod-priority-preemption.md
 
 - title: Services, Load Balancing, and Networking
-  landing_page: /docs/concepts/services-networking/service/
   section:
   - docs/concepts/services-networking/service.md
   - docs/concepts/services-networking/dns-pod-service.md
@@ -96,7 +83,6 @@ toc:
   - docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md
 
 - title: Storage
-  landing_page: /docs/concepts/storage/volumes/
   section:
   - docs/concepts/storage/volumes.md
   - docs/concepts/storage/persistent-volumes.md
@@ -104,7 +90,6 @@ toc:
   - docs/concepts/storage/dynamic-provisioning.md
 
 - title: Cluster Administration
-  landing_page: /docs/concepts/cluster-administration/cluster-administration-overview/
   section:
   - docs/concepts/cluster-administration/cluster-administration-overview.md
   - docs/concepts/cluster-administration/certificates.md
@@ -125,3 +110,5 @@ toc:
     section:
     - docs/concepts/policy/resource-quotas.md
     - docs/concepts/policy/pod-security-policy.md
+
+

_data/docs-home.yml

@@ -1,16 +1,18 @@
-bigheader: "About"
+bigheader: "Documentation Home"
 abstract: "Documentation for using and learning about Kubernetes."
 toc:
 - docs/home/index.md
 
-- title: Supported Doc Versions
-  path: /docs/home/supported-doc-versions/
+- title: Release Notes
+  path: https://git.k8s.io/kubernetes/CHANGELOG.md
+- title: Release Roadmap
+  path: https://github.com/kubernetes/kubernetes/milestones/
+
+- docs/tasks/debug-application-cluster/troubleshooting.md
 
 - title: Contributing to the Kubernetes Docs
-  landing_page: /editdocs/
   section:
   - editdocs.md
-  - docs/home/contribute/participating.md
   - docs/home/contribute/create-pull-request.md
   - docs/home/contribute/write-new-topic.md
   - docs/home/contribute/stage-documentation-changes.md
@@ -18,12 +20,3 @@ toc:
   - docs/home/contribute/review-issues.md
   - docs/home/contribute/style-guide.md
   - docs/home/contribute/includes.md
-  - docs/home/contribute/localization.md
-  - docs/home/contribute/blog-post.md
-
-  - title: Updating Automatically Generated Reference Pages
-    section:
-    - docs/home/contribute/generated-reference/kubernetes-components.md
-    - docs/home/contribute/generated-reference/kubectl.md
-    - docs/home/contribute/generated-reference/kubernetes-api.md
-    - docs/home/contribute/generated-reference/federation-api.md

_data/globals.yml

@@ -8,4 +8,3 @@ tocs:
 - reference
 - samples
 - support
-- imported

_data/glossary/_example.yml

@@ -1,6 +1,6 @@
 id: _example
 name: Example K8s Term
-full-link: /docs/link-to-long-dedicated-docs-page
+full-link: kubernetes.io/docs/link-to-long-dedicated-docs-page
 aka:
 - Slang K8s Term
 - Misnomer

_data/glossary/annotation.yaml

@@ -1,6 +1,6 @@
 id: annotation
 name: Annotation
-full-link: /docs/concepts/overview/working-with-objects/annotations
+full-link: docs/concepts/overview/working-with-objects/annotations
 tags:
 - fundamental
 short-description: >

_data/glossary/certificate.yaml

@@ -1,11 +0,0 @@
-id: certificate
-name: Certificate
-full-link: /docs/tasks/tls/managing-tls-in-a-cluster/
-tags:
-- security
-short-description: >
-  A cryptographically secure file used to validate access to the Kubernetes cluster.
-long-description: >
-  Certificates enable applications within a Kubernetes
-  cluster to access the Kubernetes API securely. Certificates validate that
-  clients are allowed to access the API.

_data/glossary/cloud-controller-manager.yml

@@ -1,13 +0,0 @@
-id: cloud-controller-manager
-name: Cloud Controller Manager
-full-link: https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/
-tags:
-- core-object
-- architecture
-- operation
-short-description: >
-  Cloud Controller Manager is an alpha feature in 1.8. In upcoming releases it will be the preferred way to integrate Kubernetes with any cloud.
-long-description: >
-  Kubernetes v1.6 contains a new binary called cloud-controller-manager. cloud-controller-manager is a daemon that embeds cloud-specific control loops. 
-  These cloud-specific control loops were originally in the kube-controller-manager. Since cloud providers develop and release at a different pace compared to the Kubernetes 
-  project, abstracting the provider-specific code to the cloud-controller-manager binary allows cloud vendors to evolve independently from the core Kubernetes code.

_data/glossary/cloud-provider.yaml

@@ -1,10 +0,0 @@
-id: cloud-provider
-name: Cloud Provider
-full-link: /docs/concepts/cluster-administration/cloud-providers
-tags:
-- community
-short-description: >
-  Cloud provider is a company that offers cloud computing platform that can run Kubernetes clusters.
-long-description: >
-  Cloud providers or sometime called Cloud Service Provider (CSPs) provides cloud computing platforms.  They may offer services such as Infrastructure as a Service (IaaS) or Platform as a Service (PaaS).  Cloud providers host the Kubernetes cluster and also provide services that interact with the cluster, such as Load Balancers, Storage Classes etc. 
-

_data/glossary/code-contributor.yaml

@@ -1,6 +1,5 @@
 id: code-contributor
 name: Code Contributor
-full-link: /docs/imported/community/devel/
 aka:
   - Community Developer
 tags:

_data/glossary/configmap.yaml

@@ -1,6 +1,6 @@
 id: configmap
 name: ConfigMap
-full-link: /docs/tasks/configure-pod-container/configure-pod-configmap/
+full-link: /docs/tasks/configure-pod-container/configmap/
 related:
 - pod
 - secret

_data/glossary/container-env-variables.yaml

@@ -1,9 +0,0 @@
-id: container-env-variables
-name: Container Environment Variables
-full-link: /docs/concepts/containers/container-environment-variables.md
-tags:
-- fundamental
-short-description: >
-  Container environment variables are name/value pairs that provide useful information into containers running in a Pod.
-long-description: >
-  Container environment variables provide information that is required by the running containerized applications along with information about important resources to the [Containers] {% glossary_tooltip text="Containers" term_id="container" %}. For example, file system, information about the container itself and other cluster resources such as service endpoints, etc.

_data/glossary/controller.yaml

@@ -1,12 +0,0 @@
-id: controller
-name: Controller
-full-link: /docs/admin/kube-controller-manager/
-related:
-- controller-manager
-tags:
-- architecture
-- fundamental
-short-description: >
-  A control loop that watches the shared state of the cluster through the {% glossary_tooltip text="apiserver" term_id="kube-apiserver" %} and makes changes attempting to move the current state towards the desired state.
-long-description: >
-  Examples of controllers that ship with Kubernetes today are the replication controller, endpoints controller, namespace controller, and serviceaccounts controller.

_data/glossary/customresourcedefinition.yaml

@@ -1,14 +0,0 @@
-id: CustomResourceDefinition
-name: CustomResourceDefinition
-aka: 
-- CRD
-- Formerly Known as ThirdPartyResources (TPR)
-tags:
-- fundamental
-- operation
-- extension
-full-link: docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/
-short-description: >
-  Custom code that defines a resource to add to your Kubernetes API server without building a complete custom server.
-long-description: >
-  Custom Resource Definitions let you extend the Kubernetes API for your environment if the publicly supported API resources can't meet your needs. 

_data/glossary/daemonset.yaml

@@ -3,9 +3,8 @@ name: DaemonSet
 full-link: /docs/concepts/workloads/controllers/daemonset
 tags:
 - fundamental
-- core-object
 - workload
 short-description: >
-  Ensures a copy of a {% glossary_tooltip text="Pod" term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip text="cluster" term_id="cluster" %}.
+  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" %}.

_data/glossary/docker.yaml

@@ -1,9 +0,0 @@
-id: docker
-name: docker
-full-link: /docs/reference/kubectl/docker-cli-to-kubectl/
-tags:
-- fundamental
-short-description: >
-  Docker is a software technology providing operating-system-level virtualization also known as containers.
-long-description: >
-  Docker uses the resource isolation features of the Linux kernel such as cgroups and kernel namespaces, and a union-capable file system such as OverlayFS and others to allow independent "containers" to run within a single Linux instance, avoiding the overhead of starting and maintaining virtual machines (VMs).

_data/glossary/dynamic-volume-provisioning.yaml

@@ -1,11 +0,0 @@
-id: dynamicvolumeprovisioning
-name: Dynamic Volume Provisioning
-full-link: /docs/concepts/storage/dynamic-provisioning
-tags:
-- core-object
-- storage
-short-description: >
-  Allows users to request automatic creation of storage  {% glossary_tooltip text="Volumes" term_id="volume" %}.
-long-description: >
-  Dynamic provisioning eliminates the need for cluster administrators to pre-provision storage. Instead, it automatically provisions storage by user request.
-  Dynamic volume provisioning is based on an API object, {% glossary_tooltip text="StorageClass" term_id="storage-class" %}, referring to a {% glossary_tooltip text="Volume Plugin" term_id="volume-plugin" %} that provisions a {% glossary_tooltip text="Volume" term_id="volume" %} and the set of parameters to pass to the Volume Plugin.

_data/glossary/etcd.yaml

@@ -1,11 +0,0 @@
-id: etcd
-name: etcd
-full-link: /docs/tasks/administer-cluster/configure-upgrade-etcd/
-tags:
-- architecture
-- storage
-short-description: >
-  Consistent and highly-available key value store used as Kubernetes' backing store for all cluster data.
-long-description: >
-  Always have a backup plan for etcd's data for your Kubernetes cluster.
-  For in-depth information on etcd, see [etcd documentation](https://github.com/coreos/etcd/blob/master/Documentation/docs.md).

_data/glossary/horizontal-pod-autoscaler.yaml

@@ -5,13 +5,11 @@ aka:
 - HPA
 related:
 - pod
-- replication-controller
-- deployment
 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 {% glossary_tooltip text="Replication Controllers" term_id="replication-controller" %}, {% glossary_tooltip text="Deployments" term_id="deployment" %}, or Replica Sets.
-  It cannot be applied to objects that cannot be scaled, for example {% glossary_tooltip text="DaemonSets" term_id="daemonset" %}.
+  HPA is typically used with replication controllers, deployments or replica sets and cannot be
+  applied to objects that cannot be scaled, for example DaemonSets.  

_data/glossary/init-container.yaml

@@ -1,8 +0,0 @@
-id: init-container
-name: Init Container
-tags:
-- fundamental
-short-description: >
-  One or more initialization containers that must run to completion before any app containers run. 
-long-description: >
-  Initialization (init) containers are like regular app containers, with one difference: init containers must run to completion before any app containers can start. Init containers run in series: each init container must run to completion before the next init container begins.  

_data/glossary/job.yaml

@@ -2,9 +2,7 @@ id: job
 name: Job
 full-link: /docs/concepts/workloads/controllers/jobs-run-to-completion
 tags:
-- fundamental
 - core-object
-- workload
 short-description: >
   A finite or batch task that runs to completion.
 long-description: >

_data/glossary/kube-apiserver.yaml

@@ -1,12 +0,0 @@
-id: kube-apiserver
-name: kube-apiserver
-full-link: /docs/reference/generated/kube-apiserver/
-aka:
-- apiserver
-tags:
-- architecture
-- fundamental
-short-description: >
-  Component on the master that exposes the Kubernetes API. It is the front-end for the Kubernetes control plane. 
-long-description: >
-  It is designed to scale horizontally -- that is, it scales by deploying more instances. See [Building High-Availability Clusters](/docs/admin/high-availability/).

_data/glossary/kube-controller-manager.yaml

@@ -1,14 +0,0 @@
-id: kube-controller-manager
-name: kube-controller-manager
-full-link: /docs/reference/generated/kube-controller-manager/
-aka:
-- controller-manager
-related:
-- controller
-tags:
-- architecture
-- fundamental
-short-description: >
-  Component on the master that runs {% glossary_tooltip text="controllers" term_id="controller" %}.
-long-description: >
-  Logically, each {% glossary_tooltip text="controller" term_id="controller" %} is a separate process, but to reduce complexity, they are all compiled into a single binary and run in a single process.

_data/glossary/kube-proxy.yaml

@@ -1,10 +0,0 @@
-id: kube proxy
-name: kube-proxy
-full-link: /docs/reference/generated/kube-proxy
-tags:
-- fundamental
-- core-object
-short-description: >
-  `kube-proxy` is a network proxy that runs on each node in the cluster.
-long-description: >
-  `kube-proxy` is responsible for request forwarding. `kube-proxy` allows TCP and UDP stream forwarding or round robin TCP and UDP forwarding across a set of backend functions.

_data/glossary/kube-scheduler.yaml

@@ -1,13 +0,0 @@
-id: kube-scheduler
-name: kube-scheduler
-full-link: /docs/reference/generated/kube-scheduler/
-aka:
-- scheduler
-tags:
-- architecture
-short-description: >
-  Component on the master that watches newly created pods that have no node assigned, and selects a node for them to run on.
-long-description: >
-  Factors taken into account for scheduling decisions include individual and collective resource requirements, 
-  hardware/software/policy constraints, affinity and anti-affinity specifications, data locality, inter-workload interference
-  and deadlines.

_data/glossary/kubelet.yaml

@@ -1,6 +1,6 @@
 id: kubelet
 name: Kubelet
-full-link: /docs/reference/generated/kubelet
+full-link: docs/reference/generated/kubelet
 tags:
 - fundamental
 - core-object

_data/glossary/label.yaml

@@ -1,10 +0,0 @@
-id: label
-name: Label
-full-link: /docs/concepts/overview/working-with-objects/labels
-tags:
-- fundamental
-short-description: >
-  Tags 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 {% glossary_tooltip text="Pods" term_id="pod" %}.
-  They are used to organize and to select subsets of objects.

_data/glossary/labels.yaml

@@ -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.

_data/glossary/name.yaml

@@ -1,10 +0,0 @@
-id: name
-name: Name
-full-link: /docs/concepts/overview/working-with-objects/names
-tags:
-  - fundamental
-short-description: >
-  A client-provided string that refers to an object in a resource URL, such as `/api/v1/pods/some-name`.
-long-description: >
-  Only one object of a given kind can have a given name at a time.
-  However, if you delete the object, you can make a new object with the same name.

_data/glossary/namespace.yaml

@@ -2,9 +2,8 @@ id: namespace
 name: Namespace
 full-link: /docs/concepts/overview/working-with-objects/namespaces
 tags:
-  - fundamental
+- fundamental
 short-description: >
-  An abstraction used by Kubernetes to support multiple virtual clusters on the same physical {% glossary_tooltip text="cluster" term_id="cluster" %}.
+  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.
+  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.

_data/glossary/persistent-volume-claim.yaml

@@ -1,15 +0,0 @@
-id: persistent-volume-claim
-name: Persistent Volume Claim
-full-link: /docs/concepts/storage/persistent-volumes/
-related:
-- persistent-volume
-- statefulset
-- deployment
-- pod
-tags:
-- core-object
-- storage
-short-description: >
-  Claims storage resources defined in a PersistentVolume so that it can be mounted as a volume in a container.
-long-description: |
-  Specifies the amount of storage, how the storage will be accessed (read-only, read-write and/or exclusive) and how it is reclaimed (retained, recycled or deleted). Details of the storage itself are in the PersistentVolume specification.

_data/glossary/persistent-volume.yaml

@@ -1,17 +0,0 @@
-id: persistent-volume
-name: Persistent Volume
-full-link: /docs/concepts/storage/persistent-volumes/
-related:
-- statefulset
-- deployment
-- persistent-volume-claim
-- pod
-tags:
-- core-object
-- storage
-short-description: >
-  An API object that represents a piece of storage in the cluster. Available as a general, pluggable resource that persists beyond the lifecycle of any individual {% glossary_tooltip text="Pod" term_id="pod" %}.
-long-description: |
-  PersistentVolumes (PVs) provide an API that abstracts details of how storage is provided from how it is consumed.
-  PVs are used directly in scenarios where storage can be created ahead of time (static provisioning).
-  For scenarios that require on-demand storage (dynamic provisioning), PersistentVolumeClaims (PVCs) are used instead.

_data/glossary/podpreset.yaml

@@ -1,12 +0,0 @@
-id: podpreset
-name: PodPreset
-tags:
-- operation
-short-description: >
-  An API object that injects information such as secrets, volume mounts,
-  and environment variables into pods at creation time.
-long-description: >
-  This object chooses the pods to inject information into using
-  standard selectors. This allows the podspec definitions to be
-  nonspecific, decoupling the podspec from environment specific
-  configuration.

_data/glossary/replica-set.yml

@@ -4,9 +4,8 @@ full-link: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
 related:
 - replication-controller
 tags:
-- fundamental
 - core-object
-- workload
+- architecture
 short-description: >
   ReplicaSet is the next-generation Replication Controller.
 long-description: >

_data/glossary/replication-controller.yaml

@@ -1,8 +1,7 @@
 id: replication-controller
 name: Replication Controller
 tags:
-- workload
-- core-object
+- fundamental
 short-description: >
   Kubernetes service that ensures a specific number of instances of a pod are always running.
 long-description: >

_data/glossary/secret.yml

@@ -12,4 +12,4 @@ short-description: >
 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/configure-pod-configmap/) for non-confidential data.
+  Secrets are great for confidential data and [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configmap/) for non-confidential data.

_data/glossary/selector.yaml

@@ -1,13 +0,0 @@
-id: selector
-name: Selector
-full-link: /docs/concepts/overview/working-with-objects/labels/
-related:
-- label
-tags:
-- fundamental
-short-description: >
-  Allows users to filter a list of resources based on labels.
-long-description: >
-  Selectors are applied when querying lists of resources to filter
-  them by {% glossary_tooltip text="Labels" term_id="label"
-  %}.

_data/glossary/service-account.yaml

@@ -5,6 +5,6 @@ tags:
 - fundamental
 - core-object
 short-description: >
-  Provides an identity for processes that run in a {% glossary_tooltip text="Pod" term_id="pod" %}.
+  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" %}.

_data/glossary/service-catalog.yaml

@@ -5,4 +5,4 @@ tags:
 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: >
-  It 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.
+  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.

_data/glossary/statefulset.yml

@@ -1,11 +1,12 @@
 id: statefulset
 name: StatefulSet
 full-link: /docs/concepts/workloads/controllers/statefulset/
+aka:
+- PetSet
 related:
 - deployment
 - pod
 tags:
-- fundamental
 - core-object
 - workload
 - storage

_data/glossary/storage-class.yaml

@@ -1,11 +0,0 @@
-id: storageclass
-name: Storage Class
-full-link: /docs/concepts/storage/storage-classes
-tags:
-- core-object
-- storage
-short-description: >
-  A StorageClass provides a way for administrators to describe different available storage types.
-long-description: >
-  StorageClasses can map to quality-of-service levels, backup policies, or to arbitrary policies determined by cluster administrators.
-  Each StorageClass contains the fields `provisioner`, `parameters`, and `reclaimPolicy`, which are used when a {% glossary_tooltip text="Persistent Volume" term_id="persistent-volume" %} belonging to the class needs to be dynamically provisioned. Users can request a particular class using the name of a StorageClass object.

_data/glossary/uid.yaml

@@ -1,10 +0,0 @@
-id: uid
-name: UID
-full-link: /docs/concepts/overview/working-with-objects/names
-tags:
-  - fundamental
-short-description: >
-  A Kubernetes systems-generated string to uniquely identify objects.
-long-description: >
-  Every object created over the whole lifetime of a Kubernetes cluster has a distinct UID.
-  It is intended to distinguish between historical occurrences of similar entities.

_data/glossary/volume-plugin.yaml

@@ -1,11 +0,0 @@
-id: volumeplugin
-name: Volume Plugin
-tags:
-- core-object
-- storage
-short-description: >
-  A Volume Plugin enables integration of storage within a {% glossary_tooltip text="Pod" term_id="pod" %}.
-long-description: >
-  A Volume Plugin lets you attach and mount storage volumes for use by a {% glossary_tooltip text="Pod" term_id="pod" %}.
-  Volume plugins can be _in tree_ or _out of tree_. _In tree_ plugins are part of the Kubernetes code repository and follow its release cycle. _Out of tree_ plugins are developed independently.
-

_data/imported.yml

@@ -1,11 +0,0 @@
-bigheader: "Imported Docs"
-abstract: "Docs imported from other Kubernetes SIGs and repos."
-toc:
-- docs/imported/index.md
-
-- title: Community
-  section:
-  - docs/imported/community/guide.md
-  - docs/imported/community/devel.md
-  - docs/imported/community/mentoring.md
-  - docs/imported/community/keps.md

_data/reference.yml

@@ -1,14 +1,10 @@
-bigheader: "Reference"
+bigheader: "Reference Documentation"
 abstract: "Design docs, concept definitions, and references for APIs and CLIs."
-landing_page: /docs/reference/index/
 toc:
 - docs/reference/index.md
-
-- title: Standardized Glossary
-  path: /docs/reference/glossary/
+- docs/reference/glossary.md
 
 - title: Using the API
-  landing_page: /docs/reference/api-overview/
   section:
   - docs/reference/api-overview.md
   - docs/reference/client-libraries.md
@@ -27,15 +23,13 @@ toc:
     - docs/admin/authorization/rbac.md
     - docs/admin/authorization/node.md
     - docs/admin/authorization/webhook.md
-  - docs/reference/api-concepts.md
   - docs/reference/deprecation-policy.md
   - docs/reference/workloads-18-19.md
 
 - title: API Reference
-  landing_page: /docs/reference/generated/kubernetes-api/v1.10/
   section:
-  - title: v1.10
-    path: /docs/reference/generated/kubernetes-api/v1.10/
+  - title: v1.8
+    path: /docs/api-reference/v1.8/
   - docs/reference/labels-annotations-taints.md
   - title: OpenAPI and Swagger
     section:
@@ -45,18 +39,18 @@ toc:
       path: https://git.k8s.io/kubernetes/api/swagger-spec/
 
 - title: Federation API
-  landing_page: /docs/reference/federation/v1/operations/
   section:
-    - docs/reference/generated/federation/v1/operations.html
-    - docs/reference/generated/federation/v1/definitions.html
-    - docs/reference/generated/federation/extensions/v1beta1/operations.html
-    - docs/reference/generated/federation/extensions/v1beta1/definitions.html
+    - docs/reference/federation/v1/operations.html
+    - docs/reference/federation/v1/definitions.html
+    - docs/reference/federation/v1beta1/operations.html
+    - docs/reference/federation/v1beta1/definitions.html
+    - docs/reference/federation/extensions/v1beta1/operations.html
+    - docs/reference/federation/extensions/v1beta1/definitions.html
 
 - title: kubectl CLI
-  landing_page: /docs/user-guide/kubectl-overview/
   section:
   - docs/reference/kubectl/overview.md
-  - docs/reference/generated/kubectl/kubectl.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
@@ -65,20 +59,8 @@ toc:
   - docs/reference/kubectl/cheatsheet.md
 
 - title: Setup Tools Reference
-  landing_page: /docs/reference/setup-tools/kubeadm/kubeadm/
   section:
-  - title: Kubeadm
-    section:
-    - docs/reference/setup-tools/kubeadm/kubeadm.md
-    - docs/reference/setup-tools/kubeadm/kubeadm-init.md
-    - docs/reference/setup-tools/kubeadm/kubeadm-join.md
-    - docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md
-    - docs/reference/setup-tools/kubeadm/kubeadm-config.md
-    - docs/reference/setup-tools/kubeadm/kubeadm-reset.md
-    - docs/reference/setup-tools/kubeadm/kubeadm-token.md
-    - docs/reference/setup-tools/kubeadm/kubeadm-version.md
-    - docs/reference/setup-tools/kubeadm/kubeadm-alpha.md 
-    - docs/reference/setup-tools/kubeadm/implementation-details.md 
+  - docs/reference/generated/kubeadm.md
   - title: Kubefed
     section:
     - docs/reference/generated/kubefed.md
@@ -89,9 +71,7 @@ toc:
     - docs/reference/generated/kubefed_version.md
 
 - title: Command-line Tools Reference
-  landing_page: /docs/admin/kubelet/
   section:
-  - docs/reference/feature-gates.md
   - docs/reference/generated/kubelet.md
   - docs/admin/kubelet-authentication-authorization.md
   - docs/reference/generated/kube-apiserver.md
@@ -103,8 +83,21 @@ toc:
   - docs/reference/generated/federation-apiserver.md
   - docs/reference/generated/federation-controller-manager.md
 
+- title: Kubernetes Design Docs
+  section:
+  - title: Kubernetes Architecture
+    path: https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md
+  - title: Kubernetes Design Overview
+    path: https://github.com/kubernetes/kubernetes/tree/release-1.6/docs/design
+  - title: Kubernetes Identity and Access Management
+    path: https://git.k8s.io/community/contributors/design-proposals/auth/access.md
+  - docs/admin/ovs-networking.md
+  - title: Security Contexts
+    path: https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md
+  - title: Security in Kubernetes
+    path: https://git.k8s.io/community/contributors/design-proposals/auth/security.md
+
 - title: Kubernetes Issues and Security
-  landing_page: https://github.com/kubernetes/kubernetes/issues/
   section:
   - title: Kubernetes Issue Tracker on GitHub
     path: https://github.com/kubernetes/kubernetes/issues/

_data/setup.yml

@@ -1,23 +1,10 @@
 bigheader: "Setup"
 abstract: "Instructions for setting up a Kubernetes cluster."
-landing_page: /docs/setup/index/
 toc:
 - docs/setup/index.md
 - docs/setup/pick-right-solution.md
 
-- title: Downloading Kubernetes
-  landing_page: /docs/imported/release/notes/
-  section:
-  - docs/imported/release/notes.md
-  - docs/setup/building-from-source.md
-
-- title: Version 1.10 Troubleshooting
-  landing page: /docs/reference/pvc-finalizer-downgrade-issue/
-  section:
-  - docs/reference/pvc-finalizer-downgrade-issue.md
-
 - title: Independent Solutions
-  landing_page: /docs/getting-started-guides/minikube/
   section:
   - docs/getting-started-guides/minikube.md
 
@@ -26,13 +13,11 @@ toc:
     - docs/setup/independent/install-kubeadm.md
     - docs/setup/independent/create-cluster-kubeadm.md
     - docs/setup/independent/troubleshooting-kubeadm.md
-    - docs/setup/independent/high-availability.md
 
   - docs/getting-started-guides/scratch.md
   - docs/getting-started-guides/alternatives.md
 
 - title: Hosted Solutions
-  landing_page: /docs/setup/pick-right-solution/#hosted-solutions
   section:
   - title: Running Kubernetes on Google Kubernetes Engine
     path: https://cloud.google.com/kubernetes-engine/docs/before-you-begin/
@@ -42,19 +27,18 @@ toc:
     path: https://console.bluemix.net/docs/containers/container_index.html
 
 - title: Turn-key Cloud Solutions
-  landing_page: /docs/getting-started-guides/alibaba-cloud/
   section:
-  - docs/getting-started-guides/alibaba-cloud.md
+  - docs/getting-started-guides/gce.md
   - docs/getting-started-guides/aws.md
   - docs/getting-started-guides/azure.md
+  - docs/getting-started-guides/alibaba-cloud.md
   - docs/getting-started-guides/clc.md
-  - docs/getting-started-guides/gce.md
   - title: Running Kubernetes on IBM Cloud
     path: https://github.com/patrocinio/kubernetes-softlayer
   - docs/getting-started-guides/stackpoint.md
 
 - title: Custom Solutions
-  landing_page: /docs/getting-started-guides/coreos/index/
+
   section:
   - title: Custom Cloud Solutions
     section:
@@ -64,19 +48,32 @@ toc:
     - docs/getting-started-guides/kubespray.md
     - docs/getting-started-guides/running-cloud-controller.md
 
-  - title: On-Premises VMs
+  - title: On-Premise VMs
     section:
     - docs/getting-started-guides/coreos/index.md
     - docs/getting-started-guides/cloudstack.md
-    - title: VMware vSphere
-      path: https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/
+    - docs/getting-started-guides/vsphere.md
+    - docs/getting-started-guides/photon-controller.md
     - docs/getting-started-guides/dcos.md
+    - docs/getting-started-guides/libvirt-coreos.md
     - docs/getting-started-guides/ovirt.md
+    - docs/getting-started-guides/openstack-heat.md
+
+    - title: rkt
+      section:
+      - docs/getting-started-guides/rkt/index.md
+      - docs/getting-started-guides/rkt/notes.md
+
+    - docs/getting-started-guides/mesos/index.md
+    - docs/getting-started-guides/mesos-docker.md
 
     - title: Bare Metal
       section:
+      - docs/getting-started-guides/coreos/bare_metal_offline.md
+      - docs/getting-started-guides/fedora/fedora_ansible_config.md
       - docs/getting-started-guides/fedora/fedora_manual_config.md
       - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
+      - docs/getting-started-guides/centos/centos_manual_config.md
       - docs/getting-started-guides/coreos/index.md
       - docs/getting-started-guides/ubuntu/index.md
 
@@ -98,43 +95,14 @@ toc:
         - docs/getting-started-guides/ubuntu/glossary.md
         - docs/getting-started-guides/ubuntu/local.md
         - docs/getting-started-guides/ubuntu/logging.md
-        - docs/getting-started-guides/ubuntu/rancher.md
+
     - docs/getting-started-guides/windows/index.md
 
   - docs/admin/node-conformance.md
 
-- title: User Journeys
-  landing_page: /docs/home/
-  section:
-
-  - title: Application Developer
-    section:
-    - docs/user-journeys/users/application-developer/foundational.md
-    - docs/user-journeys/users/application-developer/intermediate.md
-    - docs/user-journeys/users/application-developer/advanced.md
-  - title: Cluster Operator
-    section:
-    - docs/user-journeys/users/cluster-operator/foundational.md
-    - docs/user-journeys/users/cluster-operator/intermediate.md
-
-  - title: Docs Contributor
-    path: /docs/home/?path=contributors&persona=docs-contributor&level=foundational
-  - title: Code Contributor
-    path: /docs/home/?path=contributors&persona=code-contributor&level=foundational
-  - title: Community Contributor
-    path: /docs/home/?path=contributors&persona=community-contributor&level=foundational
-
-- title: Installing Addons
-  path: /docs/concepts/cluster-administration/addons/
-
-- title: Configuring Kubernetes with Salt
-  path: /docs/admin/salt/
-
-- title: Building Large Clusters
-  path: /docs/admin/cluster-large/
-
-- title: Running in Multiple Zones
-  path: /docs/admin/multiple-zones/
-
-- title: Building High-Availability Clusters
-  path: /docs/admin/high-availability/building/
+- docs/concepts/cluster-administration/addons.md
+- docs/admin/salt.md
+- docs/admin/cluster-large.md
+- docs/admin/multiple-zones.md
+- docs/admin/high-availability/index.md
+- docs/getting-started-guides/binary_release.md

_data/tasks.yml

@@ -1,18 +1,15 @@
 bigheader: "Tasks"
 abstract: "Step-by-step instructions for performing operations with Kubernetes."
-landing_page: /docs/tasks/index/
 toc:
 - docs/tasks/index.md
 
 - title: Install Tools
-  landing_page: /docs/tasks/tools/install-kubectl/
   section:
   - docs/tasks/tools/install-kubectl.md
   - docs/tasks/tools/install-minikube.md
   - docs/setup/independent/install-kubeadm.md
 
 - title: Configure Pods and Containers
-  landing_page: /docs/tasks/configure-pod-container/configure-pod-initialization/
   section:
   - docs/tasks/configure-pod-container/assign-memory-resource.md
   - docs/tasks/configure-pod-container/assign-cpu-resource.md
@@ -31,12 +28,11 @@ toc:
   - docs/tasks/configure-pod-container/assign-pods-nodes.md
   - docs/tasks/configure-pod-container/configure-pod-initialization.md
   - docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md
+  - docs/tasks/configure-pod-container/configmap.md
   - docs/tasks/configure-pod-container/configure-pod-configmap.md
-  - docs/tasks/configure-pod-container/share-process-namespace.md
   - docs/tools/kompose/user-guide.md
 
 - title: Inject Data Into Applications
-  landing_page: /docs/tasks/inject-data-application/define-environment-variable-container/
   section:
   - docs/tasks/inject-data-application/define-command-argument-container.md
   - docs/tasks/inject-data-application/define-environment-variable-container.md
@@ -46,7 +42,6 @@ toc:
   - docs/tasks/inject-data-application/podpreset.md
 
 - title: Run Applications
-  landing_page: /docs/tasks/run-application/run-stateless-application-deployment/
   section:
   - docs/tasks/run-application/run-stateless-application-deployment.md
   - docs/tasks/run-application/run-single-instance-stateful-application.md
@@ -62,14 +57,12 @@ toc:
   - docs/tasks/run-application/configure-pdb.md
 
 - title: Run Jobs
-  landing_page: /docs/tasks/job/parallel-processing-expansion/
   section:
   - docs/tasks/job/parallel-processing-expansion.md
   - docs/tasks/job/coarse-parallel-processing-work-queue/index.md
   - docs/tasks/job/fine-parallel-processing-work-queue/index.md
 
 - title: Access Applications in a Cluster
-  landing_page: /docs/tasks/access-application-cluster/web-ui-dashboard/
   section:
   - docs/tasks/access-application-cluster/web-ui-dashboard.md
   - docs/tasks/access-application-cluster/access-cluster.md
@@ -86,7 +79,6 @@ toc:
     path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/cluster-dns
 
 - title: Monitor, Log, and Debug
-  landing_page: /docs/tasks/debug-application-cluster/resource-usage-monitoring/
   section:
   - docs/tasks/debug-application-cluster/core-metrics-pipeline.md
   - docs/tasks/debug-application-cluster/resource-usage-monitoring.md
@@ -109,7 +101,6 @@ toc:
     path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer
 
 - title: Extend Kubernetes
-  landing_page: /docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/
   section:
   - docs/tasks/access-kubernetes-api/http-proxy-access-api.md
   - docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions.md
@@ -121,21 +112,12 @@ toc:
   - docs/tasks/service-catalog/install-service-catalog-using-sc.md
 
 - title: TLS
-  landing_page: /docs/tasks/tls/managing-tls-in-a-cluster/
   section:
   - docs/tasks/tls/managing-tls-in-a-cluster.md
   - docs/tasks/tls/certificate-rotation.md
 
 - title: Administer a Cluster
-  landing_page: /docs/tasks/administer-cluster/memory-default-namespace/
   section:
-  - title: Upgrading or downgrading Kubernetes
-    section:
-    - docs/tasks/administer-cluster/upgrade-downgrade/upgrade-1-6.md
-    - docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-7.md
-    - docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-8.md
-    - docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-9.md
-    - docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-ha.md
   - title: Manage Memory, CPU, and API Resources
     section:
     - docs/tasks/administer-cluster/memory-default-namespace.md
@@ -151,22 +133,24 @@ toc:
   - docs/tasks/administer-cluster/access-cluster-api.md
   - docs/tasks/administer-cluster/access-cluster-services.md
   - docs/tasks/administer-cluster/securing-a-cluster.md
-  - docs/tasks/administer-cluster/sysctl-cluster.md
   - docs/tasks/administer-cluster/encrypt-data.md
   - docs/tasks/administer-cluster/configure-upgrade-etcd.md
   - docs/tasks/administer-cluster/static-pod.md
   - docs/tasks/administer-cluster/cluster-management.md
+  - docs/tasks/administer-cluster/upgrade-1-6.md
+  - docs/tasks/administer-cluster/kubeadm-upgrade-1-7.md
+  - docs/tasks/administer-cluster/kubeadm-upgrade-1-8.md
   - docs/tasks/administer-cluster/namespaces.md
   - docs/tasks/administer-cluster/namespaces-walkthrough.md
   - docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
-  - docs/tasks/administer-cluster/coredns.md
   - docs/tasks/administer-cluster/safely-drain-node.md
   - docs/tasks/administer-cluster/cpu-memory-limit.md
   - docs/tasks/administer-cluster/out-of-resource.md
   - docs/tasks/administer-cluster/reserve-compute-resources.md
   - docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md
   - docs/tasks/administer-cluster/declare-network-policy.md
-  - docs/tasks/administer-cluster/kms-provider.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
@@ -174,8 +158,6 @@ toc:
     - docs/tasks/administer-cluster/kube-router-network-policy.md
     - docs/tasks/administer-cluster/romana-network-policy.md
     - docs/tasks/administer-cluster/weave-network-policy.md
-  - docs/tasks/administer-cluster/reconfigure-kubelet.md
-  - docs/tasks/administer-cluster/kubelet-config-file.md
   - docs/tasks/administer-cluster/change-pv-reclaim-policy.md
   - docs/tasks/administer-cluster/configure-pod-disruption-budget.md
   - docs/tasks/administer-cluster/limit-storage-consumption.md
@@ -186,12 +168,8 @@ toc:
   - docs/tasks/administer-cluster/configure-multiple-schedulers.md
   - docs/tasks/administer-cluster/ip-masq-agent.md
   - docs/tasks/administer-cluster/dns-custom-nameservers.md
-  - docs/tasks/administer-cluster/dns-debugging-resolution.md
-  - docs/tasks/administer-cluster/pvc-protection.md
-  - docs/tasks/administer-cluster/storage-object-in-use-protection.md
 
 - title: Federation - Run an App on Multiple Clusters
-  landing_page: /docs/tasks/federation/set-up-cluster-federation-kubefed/
   section:
   - docs/tasks/federation/federation-service-discovery.md
   - docs/tasks/federation/set-up-cluster-federation-kubefed.md
@@ -210,19 +188,18 @@ toc:
   - docs/tasks/administer-federation/secret.md
 
 - title: Manage Cluster Daemons
-  landing_page: /docs/tasks/manage-daemon/update-daemon-set/
   section:
   - docs/tasks/manage-daemon/update-daemon-set.md
   - docs/tasks/manage-daemon/rollback-daemon-set.md
 
 - title: Manage GPUs
-  path: /docs/tasks/manage-gpus/scheduling-gpus/
+  section:
+  - docs/tasks/manage-gpus/scheduling-gpus.md
 
 - title: Manage HugePages
-  path: /docs/tasks/manage-hugepages/scheduling-hugepages/
+  section:
+  - docs/tasks/manage-hugepages/scheduling-hugepages.md
 
 - title: Extend kubectl with plugins
-  path: /docs/tasks/extend-kubectl/kubectl-plugins/
-
-- title: Troubleshooting
-  path: /docs/tasks/debug-application-cluster/troubleshooting/
+  section:
+  - docs/tasks/extend-kubectl/kubectl-plugins.md

_data/tutorials.yml

@@ -1,10 +1,8 @@
 bigheader: "Tutorials"
 abstract: "Detailed walkthroughs of common Kubernetes operations and workflows."
-landing_page: /docs/tutorials/index/
 toc:
 - docs/tutorials/index.md
 - title: Kubernetes Basics
-  landing_page: /docs/tutorials/kubernetes-basics/index/
   section:
   - docs/tutorials/kubernetes-basics/index.html
   - title: 1. Create a Cluster
@@ -32,32 +30,30 @@ toc:
     - docs/tutorials/kubernetes-basics/update-intro.html
     - docs/tutorials/kubernetes-basics/update-interactive.html
 - title: Online Training Courses
-  landing_page: /docs/tutorials/online-training/overview/
   section:
-  - docs/tutorials/online-training/overview.md
   - title: Scalable Microservices with Kubernetes (Udacity)
     path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615
   - title: Introduction to Kubernetes (edX)
     path: https://www.edx.org/course/introduction-kubernetes-linuxfoundationx-lfs158x#
-- title: Hello Minikube
-  path: /docs/tutorials/stateless-application/hello-minikube/
-- title: Kubernetes 101
-  path: /docs/user-guide/walkthrough/
-- title: Kubernetes 201
-  path: /docs/user-guide/walkthrough/k8s201/
+- docs/tutorials/stateless-application/hello-minikube.md
+- docs/user-guide/walkthrough/index.md
+- docs/user-guide/walkthrough/k8s201.md
 - title: Configuration
-  landing_page: /docs/tutorials/configuration/configure-redis-using-configmap/
   section:
   - docs/tutorials/configuration/configure-redis-using-configmap.md
+- title: Object Management Using kubectl
+  section:
+  - docs/tutorials/object-management-kubectl/object-management.md
+  - docs/tutorials/object-management-kubectl/imperative-object-management-command.md
+  - docs/tutorials/object-management-kubectl/imperative-object-management-configuration.md
+  - docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md
 - title: Stateless Applications
-  landing_page: /docs/tutorials/stateless-application/guestbook/
   section:
   - docs/tasks/run-application/run-stateless-application-deployment.md
   - docs/tutorials/stateless-application/guestbook.md
   - docs/tasks/access-application-cluster/service-access-application-cluster.md
   - docs/tutorials/stateless-application/expose-external-ip-address.md
 - title: Stateful Applications
-  landing_page: /docs/tutorials/stateful-application/basic-stateful-set/
   section:
   - docs/tutorials/stateful-application/basic-stateful-set.md
   - docs/tasks/run-application/run-single-instance-stateful-application.md
@@ -66,10 +62,8 @@ toc:
   - docs/tutorials/stateful-application/cassandra.md
   - docs/tutorials/stateful-application/zookeeper.md
 - title: Clusters
-  landing_page: /docs/tutorials/clusters/apparmor/
   section:
   - docs/tutorials/clusters/apparmor.md
 - title: Services
-  landing_page: /docs/tutorials/services/source-ip/
   section:
   - docs/tutorials/services/source-ip.md

_data/user-personas/contributors/code-contributor.yaml

@@ -1,19 +0,0 @@
-id: code-contributor
-name: Code Contributor
-glossary_id: code-contributor
-index: 0
-foundational:
-  - label: "Read the Developer Guide"
-    icon: fa-book
-    url: "/docs/imported/community/devel/"
-intermediate:
-  - label: "Learn about the Kubernetes Enhancement Proposal (KEP) process"
-    icon: fa-upload
-    url: "/docs/imported/community/keps/"
-  - label: "Understand the API conventions"
-    icon: fa-map-o
-    url: "https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md"
-advanced:
-  - label: "Learn about the release process"
-    icon: fa-code-fork
-    url: "https://github.com/kubernetes/release/blob/master/README.md"

_data/user-personas/contributors/community-contributor.yaml

@@ -1,19 +0,0 @@
-id: community-contributor
-name: Community Contributor
-short_desc: A person who works to build the Kubernetes community (e.g. by organizing meetups).
-index: 1
-foundational:
-  - label: "Contribute to the Kubernetes OSS project"
-    icon: fa-users
-    url: "/docs/imported/community/guide/"
-  - label: "Find out about mentoring initiatives"
-    icon: fa-graduation-cap
-    url: "/docs/imported/community/mentoring/"
-intermediate:
-  - label: "Apply for community membership as a member, reviewer, approver, owner, or maintainer"
-    icon: fa-user-plus
-    url: "https://github.com/kubernetes/community/blob/master/community-membership.md"
-advanced:
-  - label: "Learn about Kubernetes community governance"
-    icon: fa-gavel
-    url: "https://github.com/kubernetes/community/blob/master/governance.md"

_data/user-personas/contributors/docs-contributor.yaml

@@ -1,40 +0,0 @@
-id: docs-contributor
-name: Docs Contributor
-short_desc: A person who writes documentation for the Kubernetes project (e.g. this site).
-index: 2
-foundational:
-  - label: "Contribute to the Kubernetes documentation"
-    icon: fa-users
-    url: "/editdocs/"
-  - label: "Learn about documentation style"
-    icon: fa-book
-    url: "/docs/home/contribute/style-guide/"
-  - label: "Review documentation issues"
-    icon: fa-bug
-    url: "/docs/home/contribute/review-issues/"
-  - label: "Create a documentation pull request (PR)"
-    icon: fa-pencil-square-o
-    url: "/docs/home/contribute/create-pull-request/"
-  - label: "Stage documentation changes"
-    icon: fa-eye
-    url: "/docs/home/contribute/stage-documentation-changes/#staging-a-pull-request"
-intermediate:
-  - label: "Write a new topic"
-    icon: fa-plus-circle
-    url: "/docs/home/contribute/write-new-topic/"
-  - label: "Stage documentation changes locally"
-    icon: fa-cloud-download
-    url: "/docs/home/contribute/stage-documentation-changes/#staging-locally-using-docker"
-  - label: "Apply page templates"
-    icon: fa-clone
-    url: "/docs/home/contribute/page-templates/"
-  - label: "Add callout formatting"
-    icon: fa-exclamation-circle
-    url: "/docs/home/contribute/style-guide/#callout-formatting"
-advanced:
-  - label: "Add feature state tags"
-    icon: fa-tag
-    url: "/docs/home/contribute/includes/#feature-state"
-  - label: "Add tabs to display multiple flavors of content"
-    icon: fa-folder-o
-    url: "/docs/home/contribute/includes/#tabs"

_data/user-personas/migrators/docker-compose-swarm.yaml

@@ -1,24 +0,0 @@
-id: docker-compose-swarm
-name: Migrating from Docker Compose and Swarm
-index: 1
-foundational:
-  - label: "b1: foundational stuff"
-    url: "#"
-  - label: "b2: foundational stuff"
-    url: "#"
-  - label: "b3: foundational stuff"
-    url: "#"
-intermediate:
-  - label: "b1: intermediate stuff"
-    url: "#"
-  - label: "b2: intermediate stuff"
-    url: "#"
-  - label: "b3: intermediate stuff"
-    url: "#"
-advanced:
-  - label: "b1: advanced stuff"
-    url: "#"
-  - label: "b2: advanced stuff"
-    url: "#"
-  - label: "b3: advanced stuff"
-    url: "#"

_data/user-personas/migrators/heroku.yaml

@@ -1,24 +0,0 @@
-id: heroku
-name: Migrating from Heroku (PaaS)
-index: 2
-foundational:
-  - label: "c1: foundational stuff"
-    url: "#"
-  - label: "c2: foundational stuff"
-    url: "#"
-  - label: "c3: foundational stuff"
-    url: "#"
-intermediate:
-  - label: "c1: intermediate stuff"
-    url: "#"
-  - label: "c2: intermediate stuff"
-    url: "#"
-  - label: "c3: intermediate stuff"
-    url: "#"
-advanced:
-  - label: "c1: advanced stuff"
-    url: "#"
-  - label: "c2: advanced stuff"
-    url: "#"
-  - label: "c3: advanced stuff"
-    url: "#"

_data/user-personas/migrators/mesos.yaml

@@ -1,24 +0,0 @@
-id: mesos
-name: Migrating from Apache Mesos
-index: 3
-foundational:
-  - label: "d1: foundational stuff"
-    url: "#"
-  - label: "d2: foundational stuff"
-    url: "#"
-  - label: "d3: foundational stuff"
-    url: "#"
-intermediate:
-  - label: "d1: intermediate stuff"
-    url: "#"
-  - label: "d2: intermediate stuff"
-    url: "#"
-  - label: "d3: intermediate stuff"
-    url: "#"
-advanced:
-  - label: "d1: advanced stuff"
-    url: "#"
-  - label: "d2: advanced stuff"
-    url: "#"
-  - label: "d3: advanced stuff"
-    url: "#"

_data/user-personas/migrators/vmware-openstack.yaml

@@ -1,24 +0,0 @@
-id: vmware-openstack
-name: Migrating from VMware and/or OpenStack
-index: 0
-foundational:
-  - label: "a1: foundational stuff"
-    url: "#"
-  - label: "a2: foundational stuff"
-    url: "#"
-  - label: "a3: foundational stuff"
-    url: "#"
-intermediate:
-  - label: "a1: intermediate stuff"
-    url: "#"
-  - label: "a2: intermediate stuff"
-    url: "#"
-  - label: "a3: intermediate stuff"
-    url: "#"
-advanced:
-  - label: "a1: advanced stuff"
-    url: "#"
-  - label: "a2: advanced stuff"
-    url: "#"
-  - label: "a3: advanced stuff"
-    url: "#"

_data/user-personas/users/app-developer.yaml

@@ -1,40 +0,0 @@
-id: app-developer
-name: Application Developer
-glossary_id: application-developer
-index: 0
-foundational:
-  - label: Get started with a cluster
-    icon: fa-television
-    url: /docs/user-journeys/users/application-developer/foundational
-  - label: Deploy an application
-    icon: fa-retweet
-    url: /docs/user-journeys/users/application-developer/foundational#section-2
-  - label: Understand basic Kubernetes architecture
-    icon: fa-cog
-    url: /docs/user-journeys/users/application-developer/foundational#section-3
-  - label: Explore additional resources
-    icon: fa-book
-    url: /docs/user-journeys/users/application-developer/foundational#section-4
-intermediate:
-  - label: Learn additional workload patterns
-    icon: fa-cogs
-    url: /docs/user-journeys/users/application-developer/intermediate
-  - label: Deploy a production-ready workload
-    icon: fa-retweet
-    url: /docs/user-journeys/users/application-developer/intermediate#section-2
-  - label: Improve your dev workflow with tooling
-    icon: fa-scissors
-    url: /docs/user-journeys/users/application-developer/intermediate#section-3
-  - label: Explore additional resources
-    icon: fa-book
-    url: /docs/user-journeys/users/application-developer/intermediate#section-4
-advanced:
-  - label: Deploy an application with advanced features
-    icon: fa-sliders
-    url: /docs/user-journeys/users/application-developer/advanced
-  - label: Extend the Kubernetes API
-    icon: fa-arrows
-    url: /docs/user-journeys/users/application-developer/advanced#section-2
-  - label: Explore additional resources
-    icon: fa-book
-    url: /docs/user-journeys/users/application-developer/advanced#section-3

_data/user-personas/users/cluster-operator.yaml

@@ -1,43 +0,0 @@
-id: cluster-operator
-name: Cluster Operator
-glossary_id: cluster-operator
-index: 1
-foundational:
-  - label: Get an overview of Kubernetes
-    icon: fa-globe
-    url: /docs/user-journeys/users/cluster-operator/foundational
-  - label: Learn about Kubernetes basics
-    icon: fa-cog
-    url: /docs/user-journeys/users/cluster-operator/foundational#section-2
-  - label: Get information about my cluster
-    icon: fa-info-circle
-    url: /docs/user-journeys/users/cluster-operator/foundational#section-3
-  - label: Explore additional resources
-    icon: fa-compass
-    url: /docs/user-journeys/users/cluster-operator/foundational#section-4
-intermediate:
-  - label: "Work with Ingress, Networking, Storage, Workloads"
-    icon: fa-sliders
-    url: /docs/user-journeys/users/cluster-operator/intermediate
-  - label: "Implement security best practices"
-    icon: fa-shield
-    url: /docs/user-journeys/users/cluster-operator/intermediate#section-2
-  - label: "Implement custom logging and monitoring"
-    icon: fa-heartbeat
-    url: /docs/user-journeys/users/cluster-operator/intermediate#section-3
-  - label: "Additional Resources"
-    icon: fa-book
-    url: /docs/user-journeys/users/cluster-operator/intermediate#section-4
-advanced:
-  - label: "Connect to managed services using Service Catalog"
-    icon: fa-puzzle-piece
-    url: "/docs/concepts/service-catalog/"
-  - label: "Extend a Kubernetes cluster"
-    icon: fa-arrows
-    url: "/docs/concepts/overview/extending/"
-  - label: "Create a Pod Security Policy"
-    icon: fa-lock
-    url: "/docs/concepts/policy/pod-security-policy/"
-  - label: "Define a Resource Quota"
-    icon: fa-tachometer
-    url: "/docs/concepts/policy/resource-quotas/"

_includes/CommunityHangout/Apr3.html

@@ -1,227 +0,0 @@
-<div>
-<span style="font-family: Open Sans;"><span style="font-size: 13px; line-height: 17.9400005340576px; white-space: pre-wrap;"><br /></span></span></div>
-<div>
-<span style="font-family: 'Open Sans'; font-size: 13px; line-height: 17.9400005340576px; white-space: pre-wrap;">Every week the Kubernetes contributing community meet virtually over Google Hangouts. We want anyone who's interested to know what's discussed in this forum.</span></div>
-<div>
-<span style="font-family: 'Open Sans'; font-size: 13px; line-height: 17.9400005340576px; white-space: pre-wrap;"><br /></span></div>
-<div>
-<span style="font-family: Open Sans;"><span style="font-size: 13px; line-height: 17.9400005340576px; white-space: pre-wrap;">Agenda:</span></span></div>
-<ul style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Quinton - Cluster federation</span></div>
-</li>
-<ul style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: Arial; font-size: 15px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: #1155cc; font-family: Arial; font-size: 15px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: underline; vertical-align: baseline; white-space: pre-wrap;">doc: </span><a href="http://tinyurl.com/ubernetes" style="text-decoration: none;"><span style="background-color: transparent; color: #1155cc; font-family: Arial; font-size: 15px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: underline; vertical-align: baseline; white-space: pre-wrap;">http://tinyurl.com/ubernetes</span></a></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: Arial; font-size: 15px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<a href="https://docs.google.com/presentation/d/1dWKNzjYM6ZYjFXpPwamikC6_BV3PDe33NAK9zR_M7jg/edit?usp=sharing" style="text-decoration: none;"><span style="background-color: transparent; color: #1155cc; font-family: Arial; font-size: 15px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: underline; vertical-align: baseline; white-space: pre-wrap;">slides</span></a></div>
-</li>
-</ul>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Satnam - Performance benchmarking update</span></div>
-</li>
-</ul>
-<b id="docs-internal-guid-ae742fb5-80cb-c8b0-6fc8-e1dc4853480c" style="font-weight: normal;"><br /></b>
-<div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Notes from meeting:</span></div>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Quinton - Cluster federation</span></div>
-</li>
-<ul style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Ideas floating around after meetup in SF</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Document: </span><span style="background-color: transparent; color: #1155cc; font-family: Arial; font-size: 15px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: underline; vertical-align: baseline; white-space: pre-wrap;">doc: </span><a href="http://tinyurl.com/ubernetes" style="text-decoration: none;"><span style="background-color: transparent; color: #1155cc; font-family: Arial; font-size: 15px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: underline; vertical-align: baseline; white-space: pre-wrap;">http://tinyurl.com/ubernetes</span></a></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Please read and comment</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Not 1.0, but put a doc together to show roadmap</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Can be built outside of Kubernetes</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">API to control things across multiple clusters, include some logic</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Auth(n)(z)</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Scheduling Policies</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">&#8230;</span></div>
-</li>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Different reasons for cluster federation</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Zone (un) availability : Resilient to zone failures</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Hybrid cloud: some in cloud, some on prem. for various reasons</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Avoid cloud provider lock-in. &nbsp;For various reasons</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">&#8220;Cloudbursting&#8221; - automatic overflow into the cloud</span></div>
-</li>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Hard problems</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Location affinity. &nbsp;How close do pods need to be? </span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Workload coupling</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Absolute location (e.g. eu data needs to be in eu)</span></div>
-</li>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Cross cluster service discovery</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">How does service/DNS work across clusters</span></div>
-</li>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Cross cluster workload migration</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">How do you move an application piece by piece across clusters?</span></div>
-</li>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Cross cluster scheduling</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">How do know enough about clusters to know where to schedule</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Possibly use a cost function to achieve affinities with minimal complexity</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Can also use cost to determine where to schedule (under used clusters are cheaper than over-used clusters)</span></div>
-</li>
-</ol>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Implicit requirements</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Cross cluster integration shouldn&#8217;t create cross-cluster failure modes</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Independently usable in a disaster situation where Ubernetes dies.</span></div>
-</li>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Unified visibility</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Want to have unified monitoring, alerting, logging, introspection, ux, etc.</span></div>
-</li>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Unified quota and identity management</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Want to have user database and auth(n)/(z) in a single place</span></div>
-</li>
-</ol>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Important to note, most causes of software failure are not the infrastructure</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Botched software upgrades</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Botched config upgrades</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Botched key distribution</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Overload</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Failed external dependencies</span></div>
-</li>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Discussion:</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Where do you draw the &#8220;ubernetes&#8221; line</span></div>
-</li>
-<ol style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Likely at the availability zone, but could be at the rack, or the region</span></div>
-</li>
-</ol>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: lower-roman; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Important to not pigeon hole and prevent other users</span></div>
-</li>
-</ol>
-</ul>
-</ol>
-<br />
-<ol start="2" style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Satnam - Soak Test</span></div>
-</li>
-<ul style="margin-bottom: 0pt; margin-top: 0pt;">
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Want to measure things that run for a long time to make sure that the cluster is stable over time. &nbsp;Performance doesn&#8217;t degrade, no memory leaks, etc.</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">github.com/GoogleCloudPlatform/kubernetes/test/soak/&#8230;</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Single binary, puts lots of pods on each node, and queries each pod to make sure that it is running.</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Pods are being created much, much more quickly (even in the past week) to make things go more quickly.</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Once the pods are up running, we hit the pods via the proxy. &nbsp;Decision to hit the proxy was deliberate so that we test the kubernetes apiserver.</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Code is already checked in.</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Pin pods to each node, exercise every pod, make sure that you get a response for each node.</span></div>
-</li>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Single binary, run forever.</span></div>
-</li>
-</ul>
-<li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: decimal; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-<span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Brian - v1beta3 is enabled by default, v1beta1 and v1beta2 deprecated, turned off &nbsp;in June. &nbsp;Should still work with upgrading existing clusters, etc.</span></div>
-</li>
-</ol>
-<div style='clear: both;'></div>

_includes/CommunityHangout/Mar27.html

@@ -1,176 +0,0 @@
-<!-- Copied Nested List HTML from blogger site to force appropriate render in jekyll -->
-<!-- See Kramdown Issue for details on existing issue with nested list in kramdown :https://github.com/gettalong/kramdown/issues/368  -->
-
-<div class="nested-list">
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Every week the Kubernetes contributing community meet virtually over Google Hangouts. We want anyone who's interested to know what's discussed in this forum.</span></div>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;"><br /></span></div>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Agenda:</span></div>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">- Andy - demo remote execution and port forwarding</span></div>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">- Quinton - Cluster federation - Postponed</span></div>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">- Clayton - UI code sharing and collaboration around Kubernetes</span></div>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;"><br /></span></div>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Notes from meeting:</span></div>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">1. Andy from RedHat:</span></div>
-      <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Demo remote execution</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: transparent; color: black; font-family: 'Open Sans'; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">kubectl exec -p $POD -- $CMD</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Makes a connection to the master as proxy, figures out which node the pod is on, proxies connection to kubelet, which does the interesting bit. &nbsp;via nsenter.</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Multiplexed streaming over HTTP using SPDY</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Also interactive mode:</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: square; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;"> kubectl exec -p $POD -it -- bash -il</span></div>
-  </li>
-  </ul>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Assumes first container. &nbsp;Can use -c $CONTAINER to pick a particular one.</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">If have gdb pre-installed in container, then can interactively attach it to running process</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: square; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">backtrace, symbol tbles, print, etc. &nbsp;Most things you can do with gdb.</span></div>
-  </li>
-  </ul>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Can also with careful flag crafting run rsync over this or set up sshd inside container.</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Some feedback via chat:</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: square; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">UI feedback: things like kubectl log do not take a -p/-c they just expect it to be there.....</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.3499999999999999; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">right</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.3499999999999999; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">i think we would remove -p eventually</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.3499999999999999; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">we were just trying to be cautious because we knew we needed to support CLI args afterwards</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.3499999999999999; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">and everyone gets that wrong the first time</span></div>
-  </li>
-  </ul>
-  <li dir="ltr" style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: square; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">-- is hard</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.3499999999999999; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">cobra had bugs with it</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.3499999999999999; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">but that's what we support</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.3499999999999999; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #222222; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">also we want to bypass shell args in some cases</span></div>
-  </li>
-  </ul>
-  </ul>
-  </ul>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Andy also demoed port forwarding</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">kubectl port-forward -p $POD $LOCALPORT:$REMOTEPORT &amp;</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">localhost% http :$LOCALPORT</span></div>
-  </li>
-  </ul>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">nsenter vs. docker exec</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">want to inject a binary under control of the host, similar to pre-start hooks</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">socat, nsenter, whatever the pre-start hook needs</span></div>
-  </li>
-  </ul>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">would be nice to blog post on this</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">how to use it. &nbsp;or even a screencast?</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">we have a youtube channel and a blog for kubernetes.io</span></div>
-  </li>
-  </ul>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">version of nginx in wheezy is too old to support needed master-proxy functionality</span></div>
-  </li>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: circle; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">but wheezy-backports seems to have an ok version, so we should pull that in.</span></div>
-  </li>
-  </ul>
-  </ul>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">2. Clayton: where are we wrt a community organization for e.g. kubernetes UI components?</span></div>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">google-containers-ui IRC channel, mailing list.</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Tim: google-containers prefix is historical, should just do &#8220;kubernetes-ui&#8221;</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">also want to put design resources in, and bower expects its own repo.</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">General agreement</span></div>
-  </li>
-  </ul>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">3. Brian Grant:</span></div>
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Testing v1beta3, getting that ready to go in.</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Paul working on changes to commandline stuff.</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Early to mid next week, try to enable v1beta3 by default?</span></div>
-  </li>
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">For any other changes, file issue and CC thockin.</span></div>
-  </li>
-  </ul>
-  <div dir="ltr" style="line-height: 1.38; margin-bottom: 0pt; margin-top: 0pt;">
-  <span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">4. General consensus that 30 minutes is better than 60</span></div>
-  <br />
-  <ul style="margin-bottom: 0pt; margin-top: 0pt;">
-  <li dir="ltr" style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; list-style-type: disc; text-decoration: none; vertical-align: baseline;"><span style="background-color: white; color: #212121; font-family: Arial; font-size: 13px; font-style: normal; font-variant: normal; font-weight: normal; text-decoration: none; vertical-align: baseline; white-space: pre-wrap;">Shouldn&#8217;t artificially try to extend just to fill time.</span></li>
-  </ul>
-</div>

_includes/api-reference-content-moved.md

@@ -0,0 +1,2 @@
+The topics in the `/docs/api-reference/` section of the Kubernetes docs
+are being moved to the [Reference](/docs/reference/) section. The content in this topic has moved to:

_includes/footer-scripts.html

@@ -32,7 +32,6 @@ ga('send', 'pageview');
 
     function hideNav(toc){
         if (!toc) toc = document.querySelector('#docsToc')
-        if (!toc) return
             var container = toc.querySelector('.container')
 
                 // container is built dynamically, so it may not be present on the first runloop

_includes/footer.html

@@ -1,9 +1,9 @@
-<footer col="12">
+<footer>
     <main class="light-text">
         <nav>
             <a href="/docs/tutorials/stateless-application/hello-minikube/">Get Started</a>
             <a href="/docs/home/">Documentation</a>
-            <a href="/blog">Blog</a>
+            <a href="http://blog.kubernetes.io/">Blog</a>
             <a href="/partners/">Partners</a>
             <a href="/community/">Community</a>
             <a href="/case-studies/">Case Studies</a>
@@ -28,7 +28,7 @@
             &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 <a href="https://www.linuxfoundation.org/trademark-usage" class="light-text">Trademark Usage page</a>
+            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>
         </div>
     </main>
 </footer>

_includes/head.html

@@ -2,16 +2,16 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="shortcut icon" type="image/png" href="/images/favicon.png">
-    <link rel="stylesheet" type="text/css" href="/css/base_fonts.css">
+    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic">
+    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto+Mono">
     {% if page.case_study_styles %}<link rel="stylesheet" type="text/css" href="/css/case_study_styles.css"><!-- custom case_study_styles on -->{% else %}<link rel="stylesheet" type="text/css" href="/css/styles.css"><!-- default styles.css on -->{% endif %}
-    <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
-    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
+    <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 %}{% assign csslist = page.css | split: ',' | compact %}{% for cssurl in csslist %}<link rel="stylesheet" type="text/css" href="{{ cssurl | strip }}">
-    {% endfor %}<!-- custom css added -->{% else %}<!-- no custom css detected -->{% endif %}
+    {% if page.css %}<link rel="stylesheet" type="text/css" href="{{ page.css }}"><!-- custom css added -->{% else %}<!-- no custom css detected -->{% endif %}
 
     {% if page.description %}
     <meta name="description" content="{{ page.description }}" />
@@ -19,20 +19,11 @@
     <meta name="description" content="{{ page.title }}" />
     {% endif %}
 
-    <script
-      src="https://code.jquery.com/jquery-3.2.1.min.js"
-      integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
-      crossorigin="anonymous"></script>
-    <script
-      src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"
-      integrity="sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU="
-      crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
+    <script src="/js/jquery-2.2.0.min.js"></script>
+    <script src="/js/jquery-ui.min.js"></script>
     <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>
-    {% if page.js %}{% assign jslist = page.js | split: ',' | compact %}{% for jsurl in jslist %}<script src="{{ jsurl | strip }}"></script>
-    {% endfor %}<!-- custom js added -->{% else %}<!-- no custom js detected -->{% endif %}
     {% seo %}
-    {% feed_meta %}
 </head>

_includes/header.html

@@ -6,7 +6,7 @@
     <div class="nav-buttons" data-auto-burger="primary">
         <ul class="global-nav">
             <li><a href="/docs/home/">Documentation</a></li>
-            <li><a href="/blog">Blog</a></li>
+            <li><a href="http://blog.kubernetes.io/">Blog</a></li>
             <li><a href="/partners/">Partners</a></li>
             <li><a href="/community/">Community</a></li>
             <li><a href="/case-studies/">Case Studies</a></li>
@@ -16,13 +16,10 @@
                 </a>
                 <ul>
                 {% for version in page.versions %}
-                    {% if page.versionedurl contains version.version %}
-                    <li><a href="{{ version.url }}{{ page.versionedurl[version.version] }}">{{ version.version }}</a></li>
-                    {% else  %}
-                    <li><a href="{{ version.url }}{{ page.url }}">{{ version.version }}</a></li>
-                    {% endif %}
+                  <li><a href="{{ version.url }}">{{ version.version }}</a></li>
                 {% endfor %}
                 </ul>
+              </li>
             </li>
         </ul>
         <!-- <a href="/docs/home" class="button" id="viewDocs" data-auto-burger-exclude>View Documentation</a> -->
@@ -45,7 +42,7 @@
             <p>If you need help, you can connect with other Kubernetes users and the Kubernetes authors, attend community events, and watch video presentations from around the web.</p>
         </div>
         <div class="nav-box">
-            <h3><a href="/blog">Blog</a></h3>
+            <h3><a href="http://blog.kubernetes.io">Blog</a></h3>
             <p>Read the latest news for Kubernetes and the containers space in general, and get technical how-tos hot off the presses.</p>
         </div>
         </main>

_includes/partner-script.js

@@ -11,8 +11,8 @@
 			type: 0,
 			name: 'Puppet',
 			logo: 'puppet',
-			link: 'https://puppet.com/blog/announcing-kream-and-new-kubernetes-helm-and-docker-modules',
-			blurb: 'We\'ve developed tools and products to make your adoption of Kubernetes as efficient as possible, covering your full workflow cycle from development to production. And now Puppet Pipelines for Containers is your complete DevOps dashboard for Kubernetes.'
+			link: 'https://puppet.com/blog/managing-kubernetes-configuration-puppet',
+			blurb: 'The Puppet module for Kubernetes makes it easy to manage Pods, Replication Controllers, Services and more in Kubernetes, and to build domain-specific interfaces to one\'s Kubernetes configuration.'
 		},
 		{
 			type: 0,
@@ -43,7 +43,7 @@
 			blurb: 'Powering the GIFEE (Google’s Infrastructure for Everyone Else), to run OpenStack deployments on Kubernetes.'
 		},
 		{
-			type: 3,
+			type: 0,
 			name: 'Platform9',
 			logo: 'platform9',
 			link: 'https://platform9.com/products/kubernetes/',
@@ -131,7 +131,7 @@
 			name: 'Hasura',
 			logo: 'hasura',
 			link: 'https://hasura.io',
-			blurb: 'Hasura is a Kubernetes-based PaaS and a Postgres-based BaaS that accelerates app development with ready-to-use components.'
+			blurb: 'Hasura - Hasura'
 				},
 		{
  			type: 3,
@@ -208,7 +208,7 @@
  			name: 'Spotinst',
  			logo: 'spotinst',
  			link: 'http://blog.spotinst.com/2016/08/04/elastigroup-kubernetes-minions-steroids/',
- 			blurb: 'Your Kubernetes For 80% Less. Run K8s workloads on Spot Instances with 100% availability to save 80% + autoscale your Kubernetes with maximum efficiency in heterogenous environments.'
+ 			blurb: 'Spotinst uses a prediction algorithm in the Amazon EC2 Spot allowing k8s clusters to increase performance and lower the infrastructure costs'
   		},
 		{
  			type: 2,
@@ -217,12 +217,12 @@
  			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: 3,
+	 	name: 'InwinSTACK',
+	 	logo: 'inwinstack',
+	 	link: 'https://github.com/inwinstack/kube-ansible',
+	 	blurb: 'inwinSTACK - kube-ansible'
 	  	},
 		{
  			type: 1,
@@ -281,11 +281,11 @@
  			blurb: 'CloudPlex enables operations teams to visually deploy, orchestrate, manage, and monitor infrastructure, applications, and services in public or private cloud.'
   		},
 		{
- 			type: 2,
+ 			type: 1,
  			name: 'Kumina',
  			logo: 'kumina',
  			link: 'https://www.kumina.nl/managed_kubernetes',
- 			blurb: 'Kumina combines the power of Kubernetes with 10+ years of experience in IT operations. We create, build and support fully managed Kubernetes solutions on your choice of infrastructure. We also provide consulting and training.'
+ 			blurb: 'Kumina creates Kubernetes solutions on your choice of infrastructure with around-the-clock management and unlimited support.'
   		},
 		{
  			type: 0,
@@ -360,7 +360,7 @@
 		{
  			type: 0,
  			name: 'Mashape, Inc.',
- 			logo: 'kong',
+ 			logo: 'mashape',
  			link: 'https://getkong.org/install/kubernetes/',
  			blurb: 'Kong is a scalable open source API layer that runs in front of any RESTful API and can be provisioned to a Kubernetes cluster.'
   		},
@@ -462,13 +462,6 @@
 			link: 'http://kublr.com',
 			blurb: 'Kublr - Accelerate and control the deployment, scaling, monitoring and management of your containerized applications.'
 			},
-		{
-			type: 1,
-			name: 'ControlPlane',
-			logo: 'controlplane',
-			link: 'https://control-plane.io',
-			blurb: 'We are a London-based Kubernetes consultancy with a focus on security and continuous delivery. We offer consulting & training.'
-			},
 		{
 			type: 3,
 			name: 'Nirmata',
@@ -476,13 +469,6 @@
 			link: 'https://www.nirmata.com/',
 			blurb: 'Nirmata - Nirmata Managed Kubernetes'
 				},
-		{
-			type: 2,
-			name: 'Nirmata',
-			logo: 'nirmata',
-			link: 'https://www.nirmata.com/',
-			blurb: 'Nirmata is a software platform that helps DevOps teams deliver enterprise-grade and cloud-provider agnostic Kubernetes based container management solutions.'
-				},
 		{
 			type: 3,
 			name: 'TenxCloud',
@@ -491,18 +477,11 @@
 			blurb: 'TenxCloud - TenxCloud Container Engine (TCE)'
 				},
 		{
-			type: 2,
-			name: 'TenxCloud',
-			logo: 'tenxcloud',
-			link: 'https://www.tenxcloud.com/',
-			blurb: 'Founded in October 2014, TenxCloud is a leading enterprise container cloud computing service provider in China, covering the areas such as container PaaS cloud platform, micro-service management, DevOps, development test, AIOps and so on. Provide private cloud PaaS products and solutions for financial, energy, operator, manufacturing, education and other industry customers.'
-				},
-		{
-			type: 0,
+			type: 3,
 			name: 'Twistlock',
 			logo: 'twistlock',
 			link: 'https://www.twistlock.com/',
-			blurb: 'Security at Kubernetes Scale: Twistlock allows you to deploy fearlessly with assurance that your images and containers are free of vulnerabilities and protected at runtime.'
+			blurb: 'Twistlock - Twistlock'
 				},
 		{
 			type: 0,
@@ -540,7 +519,7 @@
 			blurb: 'CloudKite.io helps companies build and maintain highly automated, resilient, and impressively performing software on Kubernetes.'
 			},
 		{
-			type: 2,
+			type: 1,
 			name: 'CloudOps',
 			logo: 'CloudOps',
 			link: 'https://www.cloudops.com/services/docker-and-kubernetes-workshops/',
@@ -553,13 +532,6 @@
 			link: 'https://www.ghostcloud.cn/ecos-kubernetes',
 			blurb: 'EcOS is an enterprise-grade PaaS / CaaS based on Docker and Kubernetes, which makes it easier to configure, deploy and manage containerized applications.'
 			},
-		{
-			type: 3,
-			name: 'Ghostcloud',
-			logo: 'ghostcloud',
-			link: 'https://www.ghostcloud.cn/ecos-kubernetes',
-			blurb: 'EcOS is an enterprise-grade PaaS / CaaS based on Docker and Kubernetes, which makes it easier to configure, deploy and manage containerized applications.'
-			},
 		{
 			type: 2,
 			name: 'Contino',
@@ -589,7 +561,7 @@
 			blurb: 'Container security solution for small-to-medium size enterprises who plan to run Kubernetes on shared infrastructure.'
 				},
 		{
-			type: 2,
+			type: 1,
 			name: 'Creationline, Inc.',
 			logo: 'creationline',
 			link: 'https://www.creationline.com/ci',
@@ -712,7 +684,7 @@
 			name: 'Codefresh',
 			logo: 'codefresh',
 			link: 'https://codefresh.io/kubernetes-deploy/',
-			blurb: 'Codefresh is a complete DevOps platform built for containers and Kubernetes. With CI/CD pipelines, image management, and deep integrations into Kubernetes and Helm.'
+			blurb: 'Codefresh is a complete tool chain for delivering containers to Kubernetes.'
 				},
 		{
 			type: 0,
@@ -731,17 +703,10 @@
 		{
 			type: 3,
 			name: 'Google Kubernetes Engine',
-			logo: 'google',
+			logo: 'gcp',
 			link: 'https://cloud.google.com/kubernetes-engine/',
 			blurb: 'Google - Google Kubernetes Engine'
 				},
-		{
-			type: 1,
-			name: 'Superorbital',
-			logo: 'superorbital',
-			link: 'https://superorbit.al/workshops/kubernetes/',
-			blurb: 'Helping companies navigate the Cloud Native waters through Kubernetes consulting and training.'
-				},
 		{
 			type: 3,
 			name: 'Apprenda',
@@ -899,7 +864,7 @@
 		{
 			type: 3,
 			name: 'Google',
-			logo: 'google',
+			logo: 'gcp',
 			link: 'https://github.com/kubernetes/kubernetes/tree/master/cluster',
 			blurb: 'Google - kube-up.sh on Google Compute Engine'
 				},
@@ -917,13 +882,6 @@
 			link: 'https://www.163yun.com/product/container-service-dedicated',
 			blurb: 'Netease - Netease Container Service Dedicated'
 				},
-		{
-			type: 2,
-			name: 'Loodse',
-			logo: 'loodse',
-			link: 'https://loodse.com',
-			blurb: 'Loodse provides Kubernetes training & consulting, and host related events regularly across Europe.'
-				},
 		{
 			type: 3,
 			name: 'Loodse',
@@ -931,13 +889,6 @@
 			link: 'https://loodse.com',
 			blurb: 'Loodse - Kubermatic Container Engine'
 				},
-		{
-			type: 1,
-			name: 'LTI',
-			logo: 'lti',
-			link: 'https://www.lntinfotech.com/',
-			blurb: 'LTI helps enterprises architect, develop and support scalable cloud native apps using Docker and Kubernetes for private or public cloud.'
-				},
 		{
 			type: 3,
 			name: 'Microsoft',
@@ -951,7 +902,7 @@
 			logo: 'microsoft',
 			link: 'https://docs.microsoft.com/en-us/azure/aks/',
 			blurb: 'Microsoft - Azure Container Service AKS'
-			  },
+						},
 		{
 			type: 3,
 			name: 'Oracle',
@@ -1015,13 +966,6 @@
 			link: 'https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/',
 			blurb: 'Weaveworks - kubeadm'
 				},
-		{
-			type: 3,
-			name: 'Joyent',
-			logo: 'joyent',
-			link: 'https://github.com/joyent/triton-kubernetes',
-			blurb: 'Joyent - Triton Kubernetes'
-				},
 		{
 			type: 3,
 			name: 'Wise2c',
@@ -1050,13 +994,6 @@
 			link: 'http://www.daocloud.io/dce',
 			blurb: 'DaoCloud - DaoCloud Enterprise'
 				},
-		{
-			type: 2,
-			name: 'Daocloud',
-			logo: 'daocloud',
-			link: 'http://www.daocloud.io/dce',
-			blurb: 'We provide enterprise-level cloud native application platform that supports both Kubernetes and Docker Swarm.'
-				},
 		{
 			type: 3,
 			name: 'SUSE',
@@ -1085,13 +1022,6 @@
 			link: 'http://www.alauda.cn/product/detail/id/68.html',
 			blurb: 'Alauda - Alauda EE'
 				},
-		{
-			type: 2,
-			name: 'Alauda',
-			logo: 'alauda',
-			link: 'www.alauda.io',
-			blurb: 'Alauda provides Kubernetes-Centric Enterprise Platform-as-a-Service offerings with a razor focus on delivering Cloud Native capabilities and DevOps best practices to enterprise customers across industries in China.'
-				},
 		{
 			type: 3,
 			name: 'EasyStack',
@@ -1146,7 +1076,7 @@
 			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 Kubernetes.'
+			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,
@@ -1159,7 +1089,7 @@
 			type: 0,
 			name: 'Portworx',
 			logo: 'portworx',
-			link: 'https://portworx.com/use-case/kubernetes-storage/',
+			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.'
 				},
 		{
@@ -1197,265 +1127,6 @@
 			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: 1,
-			name: 'CloudBourne',
-			logo: 'cloudbourne',
-			link: 'https://cloudbourne.com/kubernetes-enterprise-hybrid-cloud/',
-			blurb: 'Want to achieve maximum build, deploy and monitoring automation using Kubernetes? We can help.'
-				},
-		{
-			type: 0,
-			name: 'CloudBourne',
-			logo: 'cloudbourne',
-			link: 'https://cloudbourne.com/',
-			blurb: 'Our AppZ Hybrid Cloud Platform can help you achieve your digital transformation goals using the powerful Kubernetes.'
-				},
-		{
-			type: 3,
-			name: 'BoCloud',
-			logo: 'bocloud',
-			link: 'http://www.bocloud.com.cn/en/index.html',
-			blurb: 'BoCloud - BeyondcentContainer'
-				},
-		{
-			type: 2,
-			name: 'Naitways',
-			logo: 'naitways',
-			link: 'https://www.naitways.com/',
-			blurb: 'Naitways is an Operator (AS57119), Integrator and Cloud Services Provider (our own !). We aim to provide value-added services through our mastering of the whole value chain (Infrastructure, Network, Human skills). Private and Public Cloud is available through Kubernetes managed or unmanaged.'
-				},
-		{
-			type: 2,
-			name: 'Kinvolk',
-			logo: 'kinvolk',
-			link: 'https://kinvolk.io/kubernetes/',
-			blurb: 'Kinvolk offers Kubernetes engineering & operations support from cluster to kernel. Leading cloud-native organizations turn to Kinvolk for deep-stack Linux expertise.'
-				},
-		{
-			type: 1,
-			name: 'Cascadeo Corporation',
-			logo: 'cascadeo',
-			link: 'http://www.cascadeo.com/',
-			blurb: 'Cascadeo designs, implements, and manages containerized workloads with Kubernetes, for both existing applications and greenfield development projects.'
-				},
-		{
-			type: 1,
-			name: 'Elastisys AB',
-			logo: 'elastisys',
-			link: 'https://elastisys.com/services/#kubernetes',
-			blurb: 'We design, build, and operate Kubernetes clusters. We are experts in highly available and self-optimizing Kubernetes infrastructures'
-				},
-		{
-			type: 1,
-			name: 'Greenfield Guild',
-			logo: 'greenfield',
-			link: 'http://greenfieldguild.com/',
-			blurb: 'The Greenfield Guild builds quality open source solutions on, and offers training and support for, Kubernetes in any environment.'
-				},
-		{
-			type: 1,
-			name: 'PolarSeven',
-			logo: 'polarseven',
-			link: 'https://polarseven.com/what-we-do/kubernetes/',
-			blurb: 'To get started up and running with Kubernetes (K8s) our PolarSeven consultants can help you with creating a fully functional dockerized environment to run and deploy your applications.'
-				},
-		{
-			type: 1,
-			name: 'Kloia',
-			logo: 'kloia',
-			link: 'https://kloia.com/kubernetes/',
-			blurb: 'Kloia is DevOps and Microservices Consultancy company that helps its customers to migrate their environment to cloud platforms for enabling more scalable and secure environments. We use Kubernetes to provide our customers all-in-one solutions in an cloud-agnostic way.'
-				},
-		{
-			type: 0,
-			name: 'Bluefyre',
-			logo: 'bluefyre',
-			link: 'https://www.bluefyre.io',
-			blurb: 'Bluefyre offers a developer-first security platform that is native to Kubernetes. Bluefyre helps your development team ship secure code on Kubernetes faster!'
-				},
-		{
-			type: 0,
-			name: 'Harness',
-			logo: 'harness',
-			link: 'https://harness.io/harness-continuous-delivery/secret-sauce/smart-automation/',
-			blurb: 'Harness offers Continuous Delivery As-A-Service will full support for containerized apps and Kubernetes clusters.'
-				},
-		{
-			type: 0,
-			name: 'VMware - Wavefront',
-			logo: 'wavefront',
-			link: 'https://www.wavefront.com/solutions/container-monitoring/',
-			blurb: 'The Wavefront platform provides metrics-driven analytics and monitoring for  Kubernetes and container dashboards for DevOps and developer teams delivering visibility into high-level services as well as granular container metrics.'
-				},
-		{
-			type: 0,
-			name: 'Bloombase, Inc.',
-			logo: 'bloombase',
-			link: 'https://www.bloombase.com/go/kubernetes',
-			blurb: 'Bloombase provides high bandwidth, defense-in-depth data-at-rest encryption to lock down Kubernetes crown-jewels at scale.'
-				},
-		{
-			type: 0,
-			name: 'Kasten',
-			logo: 'kasten',
-			link: 'https://kasten.io/product/',
-			blurb: 'Kasten provides enterprise solutions specifically built to address the operational complexity of data management in cloud-native environments.'
-				},
-		{
-			type: 0,
-			name: 'Humio',
-			logo: 'humio',
-			link: 'https://humio.com',
-			blurb: 'Humio is a log aggregation database. We offer a Kubernetes integration that will give you insights to your logs across apps and instances.'
-				},
-		{
-			type: 0,
-			name: 'Outcold Solutions LLC',
-			logo: 'outcold',
-			link: 'https://www.outcoldsolutions.com/#monitoring-kubernetes',
-			blurb: 'Powerful Certified Splunk applications for Monitoring OpenShift, Kubernetes and Docker.'
-				},
-		{
-			type: 0,
-			name: 'SysEleven GmbH',
-			logo: 'syseleven',
-			link: 'http://www.syseleven.de/',
-			blurb: 'Enterprise Customers who are in need of bulletproof operations (High Performance E-Commerce and Enterprise Portals)'
-				},
-		{
-			type: 0,
-			name: 'Landoop',
-			logo: 'landoop',
-			link: 'http://lenses.stream',
-			blurb: 'Lenses for Apache Kafka, to deploy, manage and operate with confidence data streaming pipelines and topologies at scale with confidence and native Kubernetes integration.'
-				},
-		{
-			type: 0,
-			name: 'Redis Labs',
-			logo: 'redis',
-			link: 'https://redislabs.com/blog/getting-started-with-kubernetes-and-redis-using-redis-enterprise/',
-			blurb: 'Redis Enterprise extends open source Redis and delivers stable high performance and linear scaling required for building microservices on the Kubernetes platform.'
-				},
-		{
-			type: 3,
-			name: 'Diamanti',
-			logo: 'diamanti',
-			link: 'https://diamanti.com/',
-			blurb: 'Diamanti - Diamanti-D10'
-				},
-		{
-			type: 3,
-			name: 'Eking',
-			logo: 'eking',
-			link: 'http://www.eking-tech.com/',
-			blurb: 'Hainan eKing Technology Co. - eKing Cloud Container Platform'
-				},
-		{
-			type: 3,
-			name: 'Harmony Cloud',
-			logo: 'harmony',
-			link: 'http://harmonycloud.cn/products/rongqiyun/',
-			blurb: 'Harmonycloud - Harmonycloud Container Platform'
-				},
-		{
-			type: 3,
-			name: 'Woqutech',
-			logo: 'woqutech',
-			link: 'http://woqutech.com/product_qfusion.html',
-			blurb: 'Woqutech - QFusion'
-				},
-		{
-			type: 3,
-			name: 'Baidu',
-			logo: 'baidu',
-			link: 'https://cloud.baidu.com/product/cce.html',
-			blurb: 'Baidu Cloud - Baidu Cloud Container Engine'
-				},
-		{
-			type: 3,
-			name: 'ZTE',
-			logo: 'zte',
-			link: 'https://sdnfv.zte.com.cn/en/home',
-			blurb: 'ZTE - TECS OpenPalette'
-				},
-		{
-			type: 1,
-			name: 'Automatic Server AG',
-			logo: 'asag',
-			link: 'http://www.automatic-server.com/paas.html',
-			blurb: 'We install and operate Kubernetes in big enterprises, create deployment workflows and help to migrate.'
-				},
-		{
-			type: 1,
-			name: 'Circulo Siete',
-			logo: 'circulo',
-			link: 'https://circulosiete.com/consultoria/kubernetes/',
-			blurb: 'We are a Mexico based company offering training, consulting and support to migrate your workloads to Kubernetes, Cloud Native Microservices & Devops.'
-				},
-		{
-			type: 1,
-			name: 'DevOpsGuru',
-			logo: 'devopsguru',
-			link: 'http://devopsguru.ca/workshop',
-			blurb: 'DevOpsGuru work with small business to transform from physical to virtual to containerization.'
-				},
-		{
-			type: 1,
-			name: 'EIN Intelligence Co., Ltd',
-			logo: 'ein',
-			link: 'https://ein.io',
-			blurb: 'Startups and agile enterprises in South Korea.'
-				},
-		{
-			type: 0,
-			name: 'GuardiCore',
-			logo: 'guardicore',
-			link: 'https://www.guardicore.com/',
-			blurb: 'GuardiCore provided process level visibility and network policy enforcement on containerized assets on the Kubernetes platform.'
-				},
-		{
-			type: 0,
-			name: 'Hedvig',
-			logo: 'hedvig',
-			link: 'https://www.hedviginc.com/blog/provisioning-hedvig-storage-with-kubernetes',
-			blurb: 'Hedvig is software-defined storage that uses NFS or iSCSI for persistent volumes for provisioning shared storage for pods and containers.'
-				},
-		{
-			type: 0,
-			name: 'Hewlett Packard Enterprise',
-			logo: 'hpe',
-			link: ' https://www.hpe.com/us/en/storage/containers.html',
-			blurb: 'Persistent Storage that makes data as easy to manage as containers: dynamic provisioning, policy-based performance & protection, QoS, & more.'
-				},
-		{
-			type: 0,
-			name: 'JetBrains',
-			logo: 'jetbrains',
-			link: 'https://blog.jetbrains.com/teamcity/2017/10/teamcity-kubernetes-support-plugin/',
-			blurb: 'Run TeamCity cloud build agents in a Kubernetes cluster. Provides Helm support as a build step.'
-				},
-		{
-			type: 2,
-			name: 'Opensense',
-			logo: 'opensense',
-			link: 'http://www.opensense.fr/en/kubernetes-en/',
-			blurb: 'We provide Kubernetes services (integration, operation, training) as well as development of banking microservices based on our extended experience with cloud of containers, microservices, data management and financial sector.'
-				},
-		{
-			type: 2,
-			name: 'SAP SE',
-			logo: 'sap',
-			link: 'https://cloudplatform.sap.com',
-			blurb: 'The SAP Cloud Platform provides in-memory capabilities and unique business services for building and extending applications. With open sourced Project Gardener, SAP utilizes the power of Kubernetes to enable an open, robust, multi-cloud experience for our customers. You can use simple, modern cloud native design principles and leverage skills your organization already has to deliver agile and transformative applications, while integrating with the latest SAP Leonardo business features.'
-				},
-		{
-			type: 1,
-			name: 'Mobilise Cloud Services Limited',
-			logo: 'mobilise',
-			link: 'http://www.mobilise.cloud/services/serverless-application-delivery',
-			blurb: 'Mobilise helps organisations adopt Kubernetes and integrate with their CI/CD tooling.'
-				},
 		{
 			type: 0,
 			name: 'Logdna',

_includes/templates/glossary/README.md

@@ -6,8 +6,6 @@ To write a glossary snippet, start with a copy of the template, [`/_data/glossar
   * This field must match the name of the glossary file itself (without the `*.yml` extension). It is *not* intended to be displayed to users, and is only used programmatically.
 * (Required) `name`
   * The name of the term.
-* (Optional) `full-link`
-  * The link to any specific long-form documentation, starting with `https://` if not within the website repo, and `/docs/...` if within the repo.
 * (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`
@@ -59,7 +57,7 @@ Every snippet must include at least the short description. The long description
 
 * **Think of the short description as it would appear in a tooltip.** Is it sufficient to get the reader started? Is it short enough to be read inside a small UI element?
 
-  *Tip*: look at the API reference doc content (for example, https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/). Note, however, that this content should be used with care. The concept docs for Pod, for example, are clearer than the reference docs.
+  *Tip*: look at the API reference doc content (for example, https://kubernetes.io/docs/api-reference/v1.7/). Note, however, that this content should be used with care. The concept docs for Pod, for example, are clearer than the reference docs.
 
 * **The long description should follow the short description to make a complete introduction to a topic.** (This is the content that appears at the top of the content, before any generated TOC.) Does it provide information that's not already clear from the short description? Does it provide information that readers should have a general sense of before they dive into the details of the topic it helps introduce?
 

_includes/templates/user-journey-content.md

@@ -1,26 +0,0 @@
-<div class="track">{{ page.track }}</div>
-<div class="topheader">
-   Introduction
-</div>
-<div class="sections">sections in this doc</div>
-<div id="user-journeys-toc" class="tablebar">
-<!-- This TOC section is populated with Javascript, see js/user-journeys-toc.js -->
-</div>
-
-<div class="docsection1">
-
-{% if overview %}
-{{ overview | liquify | markdownify }}
-{% else %}
-{% include templates/_errorthrower.md missing_block='overview' purpose='provides an introduction of this level.' %}
-{% endif %}
-
-{% if body %}
-{{ body | liquify | markdownify | replace: '<h2', '</div><h2' | replace: '</h2>', '</h2><div class="docsection1">'}}
-{% else %}
-{% include templates/_errorthrower.md missing_block='body' purpose='contains content for this level.' %}
-{% endif %}
-
-</div>
-
-<script src="/js/user-journeys/toc.js"></script>

_includes/tocsearch.html

@@ -6,12 +6,7 @@
     {% if item.section %}
       {% include tocsearch.html tree=item.section toc=include.toc %}
     {% else %}
-      {% if item.path %}
-        {% assign filename = item.path | replace: '/', ' ' | strip | replace: ' ', '/' | append: '.md' %}
-      {% else %}
-        {% assign filename = item %}
-      {% endif %}
-      {% if filename == page.path %}
+      {% if item == page.path %}
         {% assign found_toc = include.toc %}
         {% break %}
       {% endif %}

_includes/youtubePlayer.html

@@ -1 +0,0 @@
-<iframe width="560" height="315" src="https://www.youtube.com/embed/{{ include.id }}" frameborder="0" allowfullscreen></iframe>

_layouts/blog.html

@@ -1,192 +0,0 @@
----
-#empty front matter
----
-<!DOCTYPE html>
-<html id="blog">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="shortcut icon" type="image/png" href="/images/favicon.png">
-  <link rel="stylesheet" type="text/css" href="/css/base_fonts.css">
-  <link rel="stylesheet" type="text/css" href="/css/jquery-ui.min.css">
-  <link rel='stylesheet' type='text/css' href='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css'>
-  <!-- <link rel="stylesheet" type="text/css" href="/css/case_study_styles.css"> -->
-  <link rel="stylesheet" type="text/css" href="/css/blog.css">
-  <link rel="stylesheet" type="text/css" href="/css/styles.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 %}
-  <link rel="stylesheet" type="text/css" href="/css/gridpage.css">
-  <link rel="stylesheet" type="text/css" href="/css/blog.css">
-
-  {% if page.description %}
-  <meta name="description" content="{{ page.description }}" />
-  {% else %}
-  <meta name="description" content="{{ page.title }}" />
-  {% endif %}
-
-  <script src="/js/jquery-2.2.0.min.js"></script>
-  <script src="/js/jquery-ui.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
-  <script src="/js/script.js"></script>
-  <script src="/js/sweetalert.min.js"></script>
-  <script src="/js/custom-jekyll/tags.js"></script>
-  <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
-
-  {% feed_meta %}
-
-  {% seo %}
-</head>
-
-
-
-<body>
-  <div id="cellophane" onclick="kub.toggleMenu()"></div>
-  <header>
-    <nav  class="nav-buttons" data-auto-burger="primary">
-      <ul class="global-nav">
-        <li><a href="/docs/home/">Documentation</a></li>
-        <li><a href="/blog">Blog</a></li>
-        <li><a href="/partners/">Partners</a></li>
-        <li><a href="/community/">Community</a></li>
-        <li><a href="/case-studies/">Case Studies</a></li>
-        <li>
-          <a href="#">
-            {{page.version}} <span class="ui-icon ui-icon-carat-1-s"></span>
-          </a>
-          <ul>
-            {% for version in page.versions %}
-            {% if page.versionedurl contains version.version %}
-            <li><a href="{{ version.url }}{{ page.versionedurl[version.version] }}">{{ version.version }}</a></li>
-            {% else  %}
-            <li><a href="{{ version.url }}{{ page.url }}">{{ version.version }}</a></li>
-            {% endif %}
-            {% endfor %}
-          </ul>
-        </li>
-      </li>
-    </ul>
-    <a href="/docs/home" class="button" id="viewDocs" data-auto-burger-exclude>View Documentation</a>
-    <a href="/docs/tutorials/kubernetes-basics/" class="button" id="tryKubernetes" data-auto-burger-exclude>Try Kubernetes</a>
-    <button id="hamburger" onclick="kub.toggleMenu()" data-auto-burger-exclude><div></div></button>
-  </nav>
-</div>
-</header>
-
-<div class="container-fluid">
-  <div id="blog-hero" class="light-text">
-      <a class= 'logo' href='http://kubernetes.io/'></a>
-  <div class='blog-title'>
-      <h1> Kubernetes Blog </h1>
-    </div>
-
-  <div class="clear" style="clear: both"></div>
-  </div>
-
-
-  <div class="row blog-content" >
-   <div class="col-xs-10 col-sm-9 col-lg-9 text">
-
-       <h4 class="date-header">{{ page.date | date: ' %A, %B %-d, %Y' }} </h4>
-      <h3 class="post-title entry-title">  {{page.title}} </h3>
-      {{ content }}
-
-        <div class="PageNavigation">
-          <div class="pagerButton left">
-            {% if page.next.url %}
-              <h4><a class=" button" href="{{page.next.url}}"> &laquo; Next </a></h4>
-            {% endif %}
-          </div>
-
-          <div class="pagerButton right">
-            {% if page.previous.url %}
-              <h4><a class=" button" href="{{page.previous.url}}"> Prev &raquo;</a></h4>
-            {% endif %}
-          </div>
-
-
-
-
-        </div>
-    </div>
-
-
-    <div class="col-xs-1 col-sm-1 col-sm-3 col-lg-3 text">
-      <div ="widget-content">
-        <link href='http://kubernetes.io/feed.xml' rel='alternate' type='application/atom+xml'>
-        <a class="widget-link" href="https://kubernetes.io/feed.xml"> <i class="fas fa-rss fab-icon"> </i> </a>
-        <a class="widget-link" href="https://twitter.com/kubernetesio"> <i class="fab fa-twitter-square fab-icon"> </i> @Kubernetesio</a>
-        <a class="widget-link" href="https://github.com/kubernetes/kubernetes"> <i class="fab fa-github-square fab-icon"></i> View on Github </a>
-        <a class="widget-link" href="http://slack.k8s.io"><i class="fab fa-slack fab-icon"> </i> #kubernetes-users </a>
-        <a class="widget-link" href="http://stackoverflow.com/questions/tagged/kubernetes"><i class="fab fa-stack-overflow fab-icon"></i>Stack Overflow</a>
-        <a class="widget-link" href="http://get.k8s.io/"><i class="fab fa-stack-overflow fab-icon"></i>Download Kubernetes</a>
-      </div>
-
-<!-- Begin Sidebar  Loop -->
-    {% for post in site.posts  %}
-    {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
-    {% capture this_month %}{{ post.date | date: "%B" }}{% endcapture %}
-    {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %}
-    {% capture next_month %}{{ post.previous.date | date: "%B" }}{% endcapture %}
-    {% if forloop.first %}
-    <div class="sidebar-current-year">
-    <h4 id="{{ this_year }}-ref">{{this_year}}</h4>
-    <!-- Here we open a div and ul that are conditionally closed in the lower blocks -->
-    <div>
-      <h4 id="{{ this_year }}-{{ this_month }}-ref">{{ this_month }}</h4>
-      <ul>
-        {% endif %}
-        <li><a href="{{ post.url }}">{{ post.title }}</a></li>
-      {% if forloop.last %}  <!-- This section closes the entire div and ul at the final iteration-->
-      </ul>
-    </div>
-  </div>     <!-- end of final conditional -->
-    {% else %}
-        {% if this_year != next_year %}
-          </ul>
-          <!-- this closes the collapsible year body -->
-        </div>
-        <!-- this closes the sidebar-previous-year opened below -->
-      </div>
-      <div class="sidebar-previous-year">
-        <input type="checkbox" id="{{ next_year }}-ref-checkbox" class="heading-year-toggle-checkbox"/>
-        <label class="collapsible-year-heading-label" for="{{ next_year }}-ref-checkbox">
-          <span class="collapsible-year-body-caret">►&nbsp;</span>
-          <h4 class="collapsible-year-header" id="{{ next_year }}-ref">{{next_year}}</h4>
-        </label>
-        <div class="collapsible-year-body">
-          <input type="checkbox" id="{{ next_year }}-{{ next_month }}-ref-checkbox" class="heading-month-toggle-checkbox"/>
-          <label class="collapsible-month-heading-label" for="{{ next_year }}-{{ next_month }}-ref-checkbox">
-            <span class="collapsible-posts-list-caret">►&nbsp;</span>
-            <h5 class="collapsible-month-header" id="{{ next_year }}-{{ next_month }}-ref">{{ next_month }}</h5>
-          </label>
-          <ul class="collapsible-posts-list">
-            {% else %}
-              {% if this_month != next_month %}
-              </ul>
-
-
-              <input type="checkbox" id="{{ this_year }}-{{ next_month }}-ref-checkbox" class="heading-month-toggle-checkbox"/>
-              <label class="collapsible-month-heading-label" for="{{ this_year }}-{{ next_month }}-ref-checkbox">
-                <span class="collapsible-posts-list-caret">►&nbsp;</span>
-                <h5 class="collapsible-month-header" id="{{ this_year }}-{{ next_month }}-ref">{{ next_month }}</h5>
-              </label>
-
-              <ul class="collapsible-posts-list">
-            {% endif %}
-        {% endif %}
-    {% endif %}
-{% endfor %}
-
-</div>
-
-
-</div>
-
-</div>
-</body>
-{% include footer.html %}
-{% include footer-scripts.html %}
-</html>

_layouts/docsportal.html

@@ -1,66 +0,0 @@
-<!Doctype html>
-<html id="docs" class="{{ toc.bigheader }}">
-
-{% include head.html %}
-
-<body>
-
-{% include header.html %}
-
-<!--  HERO  -->
-<section id="hero" class="light-text">
-  <h1>{{ toc.bigheader }}</h1>
-  <h5>{{ toc.abstract }}</h5>
-  <div id="vendorStrip" class="light-text">
-    <ul>
-      <li><a href="/docs/home/" {% if toc.bigheader == nil %}class="YAH"{% endif %}>HOME</a></li>
-      <li><a href="/docs/setup/" {% if toc.bigheader == "Setup" %}class="YAH"{% endif %}>SETUP</a></li>
-      <li><a href="/docs/concepts/" {% if toc.bigheader == "Concepts" %}class="YAH"{% endif %}>CONCEPTS</a></li>
-      <li><a href="/docs/tasks/" {% if toc.bigheader == "Tasks" %}class="YAH"{% endif %}>TASKS</a></li>
-      <li><a href="/docs/tutorials/" {% if toc.bigheader == "Tutorials" %}class="YAH"{% endif %}>TUTORIALS</a></li>
-      <li><a href="/docs/reference/" {% if toc.bigheader == "Reference" %}class="YAH"{% endif %}>REFERENCE</a></li>
-    </ul>
-    <div id="searchBox">
-      <input type="text" id="search" placeholder="Search" onkeydown="if (event.keyCode==13) window.location.replace('/docs/search/?q=' + this.value)" autofocus="autofocus">
-    </div>
-  </div>
-</section>
-
-{% include deprecation-warning.html %}
-
-<section id="encyclopedia">
-  <div id="docsToc" style="display:none;"></div>
-
-  <div id="content">
-
-    {{ content }}
-
-    <div class="issue-button-container">
-      <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/" %}
-        {% unless page.no_issue %}
-          <script type="text/javascript">
-              PDRTJS_settings_8345992 = {
-                  "id" : "8345992",
-                  "unique_id" : "{{ page.url }}",
-                  "title" : "{{ page.title }}",
-                  "permalink" : "https://kubernetes.io{{ page.url }}"
-              };
-              (function(d,c,j){if(!document.getElementById(j)){var pd=d.createElement(c),s;pd.id=j;pd.src=('https:'==document.location.protocol)?'https://polldaddy.com/js/rating/rating.js':'http://i0.poll.fm/js/rating/rating.js';s=document.getElementsByTagName(c)[0];s.parentNode.insertBefore(pd,s);}}(document,'script','pd-rating-js'));
-          </script>
-          <a href="" onclick="window.open('https://github.com/kubernetes/website/issues/new?title=Issue%20with%20' +
-          'k8s.io'+window.location.pathname)" class="button issue">Create an Issue</a>
-        {% endunless %}
-        {% unless page.noedit %}
-            <a href="/editdocs#{{ page.path }}" class="button issue">Edit this Page</a>
-        {% endunless %}
-      {% endif %}
-    </div>
-  </div>
-</section>
-
-{% include_cached footer.html %}
-{% include footer-scripts.html %}
-
-</body>
-</html>

_layouts/docwithnav.html

@@ -22,12 +22,12 @@
   <h5>{{ toc.abstract }}</h5>
   <div id="vendorStrip" class="light-text">
     <ul>
-      <li><a href="/docs/home/" {% if toc.bigheader == nil %}class="YAH"{% endif %}>HOME</a></li>
+      <li><a href="/docs/home/" {% if toc.bigheader == "Kubernetes Documentation" %}class="YAH"{% endif %}>HOME</a></li>
       <li><a href="/docs/setup/" {% if toc.bigheader == "Setup" %}class="YAH"{% endif %}>SETUP</a></li>
       <li><a href="/docs/concepts/" {% if toc.bigheader == "Concepts" %}class="YAH"{% endif %}>CONCEPTS</a></li>
       <li><a href="/docs/tasks/" {% if toc.bigheader == "Tasks" %}class="YAH"{% endif %}>TASKS</a></li>
       <li><a href="/docs/tutorials/" {% if toc.bigheader == "Tutorials" %}class="YAH"{% endif %}>TUTORIALS</a></li>
-      <li><a href="/docs/reference/" {% if toc.bigheader == "Reference" %}class="YAH"{% endif %}>REFERENCE</a></li>
+      <li><a href="/docs/reference/" {% if toc.bigheader == "Reference Documentation" %}class="YAH"{% endif %}>REFERENCE</a></li>
     </ul>
     <div id="searchBox">
       <input type="text" id="search" placeholder="Search" onkeydown="if (event.keyCode==13) window.location.replace('/docs/search/?q=' + this.value)" autofocus="autofocus">
@@ -56,19 +56,19 @@
 
         <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/"%}
-        {% unless page.no_issue %}
+	{% unless page.no_issue %}
         <script type="text/javascript">
             PDRTJS_settings_8345992 = {
                 "id" : "8345992",
                 "unique_id" : "{{ page.url }}",
                 "title" : "{{ page.title }}",
-                "permalink" : "https://kubernetes.io{{ page.url }}"
+                "permalink" : "http://kubernetes.github.io{{ page.url }}"
             };
             (function(d,c,j){if(!document.getElementById(j)){var pd=d.createElement(c),s;pd.id=j;pd.src=('https:'==document.location.protocol)?'https://polldaddy.com/js/rating/rating.js':'http://i0.poll.fm/js/rating/rating.js';s=document.getElementsByTagName(c)[0];s.parentNode.insertBefore(pd,s);}}(document,'script','pd-rating-js'));
         </script>
-        <a href="" onclick="window.open('https://github.com/kubernetes/website/issues/new?title=Issue%20with%20' +
+        <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>
-        {% endunless %}
+	{% endunless %}
         {% unless page.noedit %}
           <a href="/editdocs#{{ page.path }}" class="button issue">Edit this Page</a>
         {% endunless %}

_plugins/README.md

@@ -1,12 +1,10 @@
 # Custom Jekyll Plugins
 
-This directory contains `*.rb` files that extend the original Jekyll
-classes and provide custom formatting for the docs site:
+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).
+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.*
 
@@ -25,9 +23,8 @@ This renders the definition of the glossary term inside a `<div>`, preserving Ma
 
 | Name | Default | Description |
 | --- | --- | --- |
-| `term_id` | Not Applicable (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-description`, "long" for `long-description`, "all" when both should be included). |
-| `prepend` | "Service Catalog is" | A prefix which can be attached in front of a term's short description (which is one or more sentence fragments). |
+| `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
 
@@ -48,8 +45,8 @@ This renders the following:
 
 | 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-description.** |
-| `term_id` | Not Applicable (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`.) |
+| `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
 
@@ -73,6 +70,6 @@ This renders the following:
 | 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` | Not Applicable (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` | Not Applicable (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-description`, "long" for `long-description`, "all" when both should be included). |
+| `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). |

_plugins/glossary_tags.rb

@@ -1,4 +1,3 @@
-require 'pry'
 # See /_plugins/README.md for full documentation of these custom Jekyll tags
 module Jekyll
   module GlossaryTags
@@ -56,17 +55,11 @@ module Jekyll
     class Definition < Base
       VALID_PARAM_NAMES = [
         :term_id,
-        :length,
-        :prepend,
+        :length
       ].freeze
 
       def render(context)
-        text = include_snippet(context)
-        if @args[:prepend]
-          text.sub(/<p>(.)/) { "<p>#{@args[:prepend]} #{$1.downcase}" }
-        else
-          text
-        end
+        include_snippet(context)
       end
     end
 
@@ -90,7 +83,7 @@ module Jekyll
           gsub(NESTED_MARKDOWN_LINKS, '\2').
           strip
 
-        "<a class='glossary-tooltip' href='#{external_link}' target='_blank'>" \
+        "<a class='glossary-tooltip' href='#{external_link}'>" \
         "#{@args[:text] || term_info["name"]}" \
         "<span class='tooltip-text'>" \
         "#{tooltip}" \

_redirects

@@ -7,8 +7,7 @@
 /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
-
-/blog/2018/03/kubernetes-1.10-stabilizing-storage-security-networking/     /blog/2018/03/27/kubernetes-1.10-stabilizing-storage-security-networking/     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
@@ -30,8 +29,7 @@
 /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/high-availability/      /docs/admin/high-availability/building/ 301
-/docs/admin/kubeadm-upgrade-1-7/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-7/ 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
@@ -52,22 +50,37 @@
 /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/tasks/administer-cluster/sysctl-cluster/ 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/admin/upgrade-1-6/     /docs/tasks/administer-cluster/upgrade-downgrade/upgrade-1-6/ 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.8/*     https://v1-8.docs.kubernetes.io/docs/api-reference/v1.8/:splat 301
-/docs/api-reference/v1.9/      https://v1-9.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.9/ 301
-/docs/api-reference/v1/definitions/    /docs/reference/generated/kubernetes-api/v1.10/ 301
-/docs/api-reference/v1/definitions.html /docs/reference/generated/kubernetes-api/v1.10/ 301
-/docs/api-reference/v1/operations/     /docs/reference/generated/kubernetes-api/v1.10/ 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
@@ -85,7 +98,6 @@
 /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/sysctl-cluster/ /docs/tasks/administer-cluster/sysctl-cluster/ 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
@@ -101,15 +113,18 @@
 /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/volumes/emptyDirapiVersion/     /docs/concepts/storage/volumes/#emptydir/ 301
-/docs/concepts/tools/kubectl/object-management-overview/     /docs/concepts/overview/object-management-kubectl/overview/ 301
-/docs/concepts/tools/kubectl/object-management-using-commands/     /docs/concepts/overview/object-management-kubectl/imperative-command/ 301
-/docs/concepts/tools/kubectl/object-management-using-declarative-config/     /docs/concepts/overview/object-management-kubectl/declarative-config/ 301
-/docs/concepts/tools/kubectl/object-management-using-imperative-commands/     /docs/concepts/overview/object-management-kubectl/imperative-command/ 301
-/docs/concepts/tools/kubectl/object-management-using-imperative-config/     /docs/concepts/overview/object-management-kubectl/imperative-config/ 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/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/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/controllers/statefulset.md     /docs/concepts/workloads/controllers/statefulset/ 301
 /docs/concepts/workloads/pods/init-containers/Kubernetes/     /docs/concepts/workloads/pods/init-containers/ 301
@@ -128,21 +143,22 @@
 /docs/deprecation-policy/     /docs/reference/deprecation-policy/ 301
 
 /docs/federation/api-reference/     /docs/reference/federation/v1/operations/ 301
-/docs/federation/api-reference/v1/definitions.html    /docs/reference/generated/federation/v1/definitions/ 301
-/docs/federation/api-reference/v1/operations.html     /docs/reference/generated/federation/v1/operations/ 301
-/docs/federation/api-reference/extensions/v1beta1/definitions/       /docs/reference/generated/federation/extensions/v1beta1/definitions/ 301
-/docs/federation/api-reference/extensions/v1beta1/definitions.html   /docs/reference/generated/federation/extensions/v1beta1/definitions/ 301
-/docs/federation/api-reference/extensions/v1beta1/operations/      /docs/reference/generated/federation/extensions/v1beta1/operations/ 301
-/docs/federation/api-reference/extensions/v1beta1/operations.html  /docs/reference/generated/federation/extensions/v1beta1/operations/ 301
-/docs/federation/api-reference/federation/v1beta1/definitions/      /docs/reference/generated/federation/extensions/v1beta1/definitions/ 301
-/docs/federation/api-reference/federation/v1beta1/definitions.html  /docs/reference/generated/federation/extensions/v1beta1/definitions/ 301
-/docs/federation/api-reference/federation/v1beta1/operations/      /docs/reference/generated/federation/extensions/v1beta1/operations/ 301
-/docs/federation/api-reference/federation/v1beta1/operations.html  /docs/reference/generated/federation/extensions/v1beta1/operations/ 301
-/docs/federation/api-reference/README/     /docs/reference/generated/federation/ 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/binary_release/    /docs/setup/building-from-source/ 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
@@ -163,26 +179,21 @@
 /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/vsphere/     https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/ 301
 /docs/getting-started-guides/windows/While/     /docs/getting-started-guides/windows/ 301
-/docs/getting-started-guides/centos/* /docs/setup/independent/create-cluster-kubeadm/ 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/extensions/v1beta1/definitions/     /docs/reference/generated/federation/extensions/v1beta1/definitions/ 301
-/docs/reference/federation/extensions/v1beta1/operations/     /docs/reference/generated/federation/extensions/v1beta1/operations/ 301
-/docs/reference/federation/v1/definitions/     /docs/reference/generated/federation/v1/definitions/ 301
-/docs/reference/federation/v1/operations/     /docs/reference/generated/federation/v1/operations/ 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/reference/generated/kubectl/kubectl-options/     /docs/reference/generated/kubectl/kubectl/ 301
-/docs/reference/generated/kubectl/kubectl/kubectl_*.md    /docs/reference/generated/kubectl/kubectl-commands#:splat 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
@@ -201,16 +212,11 @@
 /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/developing-cloud-controller-manager.md     /docs/tasks/administer-cluster/developing-cloud-controller-manager/ 301
-/docs/tasks/administer-cluster/kubeadm-upgrade-1-7/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-7/ 301
-/docs/tasks/administer-cluster/kubeadm-upgrade-1-8/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-8/ 301
-/docs/tasks/administer-cluster/kubeadm-upgrade-1-9/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-1-9/ 301
-/docs/tasks/administer-cluster/kubeadm-upgrade-ha/     /docs/tasks/administer-cluster/upgrade-downgrade/kubeadm-upgrade-ha/ 301
-/docs/tasks/administer-cluster/out-of-resource/memory-available.sh     /docs/tasks/administer-cluster/memory-available.sh 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/administer-cluster/upgrade-1-6/      /docs/tasks/administer-cluster/upgrade-downgrade/upgrade-1-6/ 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
@@ -261,10 +267,6 @@
 /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/object-management-kubectl/declarative-object-management-configuration/      /docs/concepts/overview/object-management-kubectl/declarative-config/ 301
-/docs/tutorials/object-management-kubectl/imperative-object-management-command/      /docs/concepts/overview/object-management-kubectl/imperative-command/ 301
-/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/      /docs/concepts/overview/object-management-kubectl/imperative-config/ 301
-/docs/tutorials/object-management-kubectl/object-management/      /docs/concepts/overview/object-management-kubectl/overview/ 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
@@ -279,9 +281,9 @@
 /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/configure-pod-configmap/ 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/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
@@ -333,12 +335,12 @@
 /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/*     https://v1-8.docs.kubernetes.io/docs/reference/generated/kubectl/kubectl-commands/:splat 301
-/docs/user-guide/kubectl/v1.9/*     https://v1-9.docs.kubernetes.io/docs/reference/generated/kubectl/kubectl-commands/:splat 301
-/docs/user-guide/kubectl/v1.10/*     /docs/reference/generated/kubectl/kubectl-commands/:splat 301
+/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/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
@@ -358,6 +360,8 @@
 /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
@@ -380,7 +384,7 @@
 /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/concepts/overview/object-management-kubectl/overview/ 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
@@ -394,7 +398,7 @@
 /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/concepts/overview/object-management-kubectl/overview/ 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
@@ -432,5 +436,3 @@ https://kubernetes-io-v1-7.netlify.com/*    https://v1-7.docs.kubernetes.io/:spl
 /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
-
-/docs/reference/generated/kubeadm/     /docs/reference/setup-tools/kubeadm/kubeadm/ 301

_sass/_base.sass

@@ -554,7 +554,7 @@ section
 		font-weight: bold
 
 	li + li
-		margin-left: 0
+		margin-left: 20px
 
 
 #docs

_sass/_desktop.sass

@@ -316,8 +316,3 @@ $video-section-height: 550px
 @media screen and (min-width: 1300px)
 	#vendorStrip
 		padding-right: 100px
-
-@media screen and (min-width: 456px)
-	#vendorStrip
-		li + li
-			margin-left: 20px

blog/OWNERS

@@ -1,10 +0,0 @@
-# Owned by Kubernetes blog reviewers.
-options:
-  no_parent_owners: true
-# reviewers: // List any reviewers here
-approvers:
-  - bobsky
-  - kbarnard10
-  - natekartchner
-  - sarahkconway
-  - zacharysarah

blog/_posts/2015-03-00-Kubernetes-Gathering-Videos.md

@@ -1,12 +0,0 @@
----
-
-permalink: /blog/:year/:month/:title
-layout: blog
-title: " Kubernetes Gathering Videos "
-date:  Tuesday, March 23, 2015
-pagination:
-  enabled: true
----
-If you missed the Kubernetes Gathering in SF last month, fear not! Here are the videos from the evening presentations organized into a playlist on YouTube
-
-[![Kubernetes Gathering](https://img.youtube.com/vi/q8lGZCKktYo/0.jpg)](https://www.youtube.com/playlist?list=PL69nYSiGNLP2FBVvSLHpJE8_6hRHW8Kxe)

blog/_posts/2015-03-00-Paricipate-In-Kubernetes-User.md

@@ -1,23 +0,0 @@
----
-permalink: /blog/:year/:month/:title
-layout: blog
-title: " Paricipate in a Kubernetes User Experience Study "
-date:  Wednesday, March 31, 2015
-pagination:
-  enabled: true
----
-We need your help in shaping the future of Kubernetes and Google Container Engine, and we'd love to have you participate in a remote UX research study to help us learn about your experiences!  If you're interested in participating, we invite you to take [this brief survey](http://goo.gl/AXFFMs) to see if you qualify. If you’re selected to participate, we’ll follow up with you directly.
-
-
-- Length: 60 minute interview
-- Date: April 7th-15th
-- Location: Remote
-- Your gift: $100 Perks gift code\*
-- Study format: Interview with our researcher
-
-
-Interested in participating? Take [this brief survey](http://goo.gl/AXFFMs).
-
-
-
-\* Perks gift codes can be redeemed for gift certificates from VISA and used at a number of online retailers ([http://www.google.com/forms/perks/index1.html](http://www.google.com/forms/perks/index1.html)). Gift codes are only for participants who successfully complete the study session. You’ll be emailed the gift code after you complete the study session.