Update release-1.6 for version changes in 1.9 (#6521)

* Update release-1.6 for version changes in 1.9

🛑 DO NOT MERGE 🛑

Update config files to use 1.9 as version number.

* Update _config.yml

* Update _config.yml

.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,7 @@
->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-> 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.7 Features: set Milestone to `1.7` and Base Branch to `release-1.7`
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >
+> NOTE: Please check the “Allow edits from maintainers” box below to allow 
+> reviewers fix problems on your patch and speed up the review process.
 > Please delete this note before submitting the pull request.
-
-![Allow edits from maintainers checkbox](https://help.github.com/assets/images/help/pull_requests/allow-maintainers-to-make-edits-sidebar-checkbox.png)

.gitignore

@@ -1,11 +1,11 @@
 **/.DS_Store
 **/desktop.ini
+.jekyll-metadata
 _site/**
 .sass-cache/**
 CNAME
 .travis.yml
 .idea/
-.vscode/
 
 # Vim ignore
 # source: https://github.com/github/gitignore/blob/master/Global/Vim.gitignore
@@ -24,8 +24,3 @@ Session.vim
 tags
 
 kubernetes.github.io.iml
-
-nohup.out
-
-# Hugo output
-public/

.travis.yml

@@ -1,22 +1,29 @@
 language: go
 go:
-  - 1.9.3
+  - 1.8.1
 
 # Don't want default ./... here:
 install:
 - export PATH=$GOPATH/bin:$PATH
 - mkdir -p $HOME/gopath/src/k8s.io
-- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/website && cd $HOME/gopath/src/k8s.io/website
-# Fetch dependencies for us to run the tests in test/examples_test.go
-- go get -t -v k8s.io/website/test
-# Make sure we are testing against the correct branch
-- pushd $GOPATH/src/k8s.io/kubernetes && git checkout release-1.10 && popd
+- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/kubernetes.github.io
+
+# (1) Fetch dependencies for us to run the tests in test/examples_test.go
+- go get -t -v k8s.io/kubernetes.github.io/test
 
 # Simplified deduplication of dependencies.
 - cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/
 - rm -r $GOPATH/src/k8s.io/kubernetes/vendor/
 
+# (2) Fetch md-check along with all its dependencies.
+- git clone --depth=50 --branch=master https://github.com/kubernetes/md-check $HOME/gopath/src/k8s.io/md-check
+- go get -t -v k8s.io/md-check
+
+# (3) Fetch mungedocs
+- go get -v k8s.io/kubernetes/cmd/mungedocs
+
 script:
-# TODO(bep)
-- go test -v k8s.io/website/test #fixed by https://github.com/kubernetes/website/pull/8388
-#- ./verify-docs-format.sh
+- go test -v k8s.io/kubernetes.github.io/test
+- $GOPATH/bin/md-check --root-dir=$HOME/gopath/src/k8s.io/kubernetes.github.io
+- ./verify-docs-format.sh
+- $GOPATH/bin/mungedocs --verbose --verify --upstream=origin --root-dir=$HOME/gopath/src/k8s.io/kubernetes.github.io/docs/ --repo-root=$HOME/gopath/src/k8s.io/kubernetes.github.io --skip-munges=remove-whitespace,blank-lines-surround-preformatted,header-lines,sync-examples,analytics,analytics,kubectl-dash-f,table-of-contents,md-links,kubectl-dash-f

404.md

@@ -0,0 +1,11 @@
+---
+layout: docwithnav
+title: 404 Error!
+permalink: /404.html
+no_canonical: true
+sitemap: false
+---
+
+<script src="/js/redirects.js"></script>
+
+Sorry, this page was not found. :(

CNAME

@@ -0,0 +1 @@
+kubernetes.io

CONTRIBUTING.md

@@ -9,7 +9,7 @@ These are just guidelines, not rules. Use your best judgment, and feel free to p
 
 ### Code of Conduct
 
-Kubernetes follows the [Cloud Native Computing Foundation (CNCF) Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to Sarah Novotny [sarahnovotny@google.com](mailto:sarahnovotny@google.com) and/or Dan Kohn [dan@linuxfoundation.org](mailto:dan@linuxfoundation.org).
+Kubernetes follows the [Cloud Native Computing Foundation (CNCF) Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to Sarah Novotny [sarahnovotny@google.com](mailto:sarahnovotny@google.com) and/or Dan Kohn [dan@linuxfoundation.org](mailto:dan@linuxfoundation.org). 
 
 ### Documentation and Site Decisions
 
@@ -17,7 +17,7 @@ The [Kubernetes SIG Docs Discussion Group](https://groups.google.com/forum/#!for
 
 ### Style Guides and Templates
 
-Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/home/contribute/style-guide/) and follow the [instructions for using page templates](http://kubernetes.io/docs/home/contribute/page-templates/).
+Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/home/contribute/style-guide/) and follow the [instructions for using page templates](http://kubernetes.io/docs/home/contribute/page-templates/). 
 
 
 ## Contributing to Documentation
@@ -26,10 +26,10 @@ Before submitting a pull request to create new content, please review the [Kuber
 
 Kubernetes.io uses github issues to track documentation issues and requests. If you see a documentation issue, submit an issue using the following steps:
 
-1. Check the [kubernetes.io issues list](https://github.com/kubernetes/website/issues) as you might find out the issue is a duplicate.
-2. Use the [included template for every new issue](https://github.com/kubernetes/website/issues/new).  When you create a bug report, include as many details as possible and include suggested fixes to the issue.
+1. Check the [kubernetes.io issues list](https://github.com/kubernetes/kubernetes.github.io/issues) as you might find out the issue is a duplicate. 
+2. Use the [included template for every new issue](https://github.com/kubernetes/kubernetes.github.io/issues/new).  When you create a bug report, include as many details as possible and include suggested fixes to the issue. 
 
-Note that code issues should be filed against the main kubernetes repository, while documentation issues should go in the kubernetes.io repository.
+Note that code issues should be filed against the main kubernetes repository, while documentation issues should go in the kubernetes.io repository. 
 
 ### Submitting Documentation Pull Requests
 

Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "github-pages", group: :jekyll_plugins
+gem "jekyll-include-cache", "~> 0.1"

Gemfile.lock

@@ -0,0 +1,203 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.7)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    colorator (1.1.0)
+    ethon (0.10.1)
+      ffi (>= 1.3.0)
+    execjs (2.7.0)
+    faraday (0.10.0)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.14)
+    forwardable-extended (2.6.0)
+    gemoji (2.1.0)
+    github-pages (112)
+      activesupport (= 4.2.7)
+      github-pages-health-check (= 1.3.0)
+      jekyll (= 3.3.1)
+      jekyll-avatar (= 0.4.2)
+      jekyll-coffeescript (= 1.0.1)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.8.0)
+      jekyll-gist (= 1.4.0)
+      jekyll-github-metadata (= 2.2.0)
+      jekyll-mentions (= 1.2.0)
+      jekyll-optional-front-matter (= 0.1.2)
+      jekyll-paginate (= 1.1.0)
+      jekyll-readme-index (= 0.0.3)
+      jekyll-redirect-from (= 0.11.0)
+      jekyll-relative-links (= 0.2.1)
+      jekyll-sass-converter (= 1.3.0)
+      jekyll-seo-tag (= 2.1.0)
+      jekyll-sitemap (= 0.12.0)
+      jekyll-swiss (= 0.4.0)
+      jekyll-theme-architect (= 0.0.3)
+      jekyll-theme-cayman (= 0.0.3)
+      jekyll-theme-dinky (= 0.0.3)
+      jekyll-theme-hacker (= 0.0.3)
+      jekyll-theme-leap-day (= 0.0.3)
+      jekyll-theme-merlot (= 0.0.3)
+      jekyll-theme-midnight (= 0.0.3)
+      jekyll-theme-minimal (= 0.0.3)
+      jekyll-theme-modernist (= 0.0.3)
+      jekyll-theme-primer (= 0.1.5)
+      jekyll-theme-slate (= 0.0.3)
+      jekyll-theme-tactile (= 0.0.3)
+      jekyll-theme-time-machine (= 0.0.3)
+      jekyll-titles-from-headings (= 0.1.3)
+      jemoji (= 0.7.0)
+      kramdown (= 1.11.1)
+      liquid (= 3.0.6)
+      listen (= 3.0.6)
+      mercenary (~> 0.3)
+      minima (= 2.0.0)
+      rouge (= 1.11.1)
+      terminal-table (~> 1.4)
+    github-pages-health-check (1.3.0)
+      addressable (~> 2.3)
+      net-dns (~> 0.8)
+      octokit (~> 4.0)
+      public_suffix (~> 2.0)
+      typhoeus (~> 0.7)
+    html-pipeline (2.4.2)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
+    i18n (0.7.0)
+    jekyll (3.3.1)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-avatar (0.4.2)
+      jekyll (~> 3.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.8.0)
+      jekyll (~> 3.3)
+    jekyll-gist (1.4.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.2.0)
+      jekyll (~> 3.1)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-include-cache (0.1.0)
+      jekyll (~> 3.3)
+    jekyll-mentions (1.2.0)
+      activesupport (~> 4.0)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
+    jekyll-optional-front-matter (0.1.2)
+      jekyll (~> 3.0)
+    jekyll-paginate (1.1.0)
+    jekyll-readme-index (0.0.3)
+      jekyll (~> 3.0)
+    jekyll-redirect-from (0.11.0)
+      jekyll (>= 2.0)
+    jekyll-relative-links (0.2.1)
+      jekyll (~> 3.3)
+    jekyll-sass-converter (1.3.0)
+      sass (~> 3.2)
+    jekyll-seo-tag (2.1.0)
+      jekyll (~> 3.3)
+    jekyll-sitemap (0.12.0)
+      jekyll (~> 3.3)
+    jekyll-swiss (0.4.0)
+    jekyll-theme-architect (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-cayman (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-dinky (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-hacker (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-leap-day (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-merlot (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-midnight (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-minimal (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-modernist (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-primer (0.1.5)
+      jekyll (~> 3.3)
+    jekyll-theme-slate (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-tactile (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-theme-time-machine (0.0.3)
+      jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.1.3)
+      jekyll (~> 3.3)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    jemoji (0.7.0)
+      activesupport (~> 4.0)
+      gemoji (~> 2.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0)
+    json (1.8.3)
+    kramdown (1.11.1)
+    liquid (3.0.6)
+    listen (3.0.6)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9.7)
+    mercenary (0.3.6)
+    mini_portile2 (2.1.0)
+    minima (2.0.0)
+    minitest (5.10.1)
+    multipart-post (2.0.0)
+    net-dns (0.8.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    octokit (4.6.2)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    public_suffix (2.0.4)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.4.23)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    terminal-table (1.7.3)
+      unicode-display_width (~> 1.1.1)
+    thread_safe (0.3.5)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  github-pages
+  jekyll-include-cache (~> 0.1)
+
+BUNDLED WITH
+   1.13.6

Makefile

@@ -1,22 +1,15 @@
-.PHONY: all build sass build-preview help serve
+.PHONY: all build build-preview help serve
 
 help: ## Show this help.
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
 all: build ## Build site with production settings and put deliverables in _site.
 
-sass: # Rebuild the SASS source into CSS
-	node-sass --output-style compact ./src/sass/styles.sass ./static/css/styles.css
-	node-sass --output-style compact ./src/sass/case_study_styles.sass ./static/css/case_study_styles.css
-
 build: ## Build site with production settings and put deliverables in _site.
-	hugo
+	jekyll build
 
 build-preview: ## Build site with drafts and future posts enabled.
-	hugo -D -F
+	jekyll build --drafts --future
 
 serve: ## Boot the development server.
-	hugo server
-
-stage: ## This needs to be updated for Hugo
-	#docker run -ti --rm -v "${PWD}":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.1
+	jekyll serve

OWNERS

@@ -1,17 +1,6 @@
-# Reviewers can /lgtm /approve but not sufficient for auto-merge without an
-# approver
-reviewers:
-- zhangxiaoyu-zidif
-- xiangpengzhao
-# 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
-- mistyhacks
-- tengqm
+assignees:
+- smarterclayton
+- janetkuo
+- pwittrock
+- kelseyhightower
+- jaredbhatti

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

README.md

@@ -4,14 +4,11 @@ Welcome! We are very pleased you want to contribute to the Kubernetes documentat
 
 You can click the **Fork** button in the upper-right area of the screen to create a copy of this repository in your GitHub account called a *fork*. Make any changes you want in your fork, and when you are ready to send those changes to us, go to your fork and create a new pull request to let us know about it.
 
-Once your pull request is created, a Kubernetes reviewer will take responsibility for providing clear, actionable feedback.  As the owner of the pull request, **it is your responsibility to modify your pull request to address the feedback that has been provided to you by the Kubernetes reviewer.**  Also note that you may end up having more than one Kubernetes reviewer provide you feedback or you may end up getting feedback from a Kubernetes reviewer that is different than the one originally assigned to provide you feedback. Furthermore, in some cases, one of your reviewers might ask for a technical review from a [Kubernetes tech reviewer](https://github.com/kubernetes/website/wiki/Tech-reviewers) when needed.  Reviewers will do their best to provide feedback in a timely fashion but response time can vary based on circumstances.
-
 For more information about contributing to the Kubernetes documentation, see:
 
 * [Contributing to the Kubernetes Documentation](http://kubernetes.io/editdocs/)
 * [Creating a Documentation Pull Request](http://kubernetes.io/docs/home/contribute/create-pull-request/)
 * [Writing a New Topic](http://kubernetes.io/docs/home/contribute/write-new-topic/)
-* [Review Issues](http://kubernetes.io/docs/home/contribute/review-issues/)
 * [Staging Your Documentation Changes](http://kubernetes.io/docs/home/contribute/stage-documentation-changes/)
 * [Using Page Templates](http://kubernetes.io/docs/home/contribute/page-templates/)
 * [Documentation Style Guide](http://kubernetes.io/docs/home/contribute/style-guide/)

_config.yml

@@ -0,0 +1,89 @@
+name: Kubernetes
+title: Kubernetes
+url: https://kubernetes.io
+description: Production-Grade Container Orchestration
+markdown: kramdown
+kramdown:
+  input: GFM
+  html_to_native: true
+  hard_wrap: false
+  syntax_highlighter: rouge
+incremental: true
+
+safe: false
+lsi: false
+
+defaults:
+  -
+    scope:
+      path: ""
+    values:
+      fullversion: "v1.6.8"
+      version: "v1.6"
+      githubbranch: "v1.6.8"
+      docsbranch: "release-1.6"
+      versions:
+        - fullversion: "v1.9.0"
+          version: "v1.9"
+          githubbranch: "v1.9.0"
+          docsbranch: "release-1.9"
+          url: https://kubernetes.io/docs/home/
+        - fullversion: "v1.8.4"
+          version: "v1.8"
+          githubbranch: "v1.8.4"
+          docsbranch: "release-1.8"
+          url: https://v1-8.docs.kubernetes.io/docs/home/
+        - fullversion: "v1.7.3"
+          version: "v1.7"
+          githubbranch: "v1.7.3"
+          docsbranch: "release-1.7"
+          url: https://v1-7.docs.kubernetes.io/docs/home/
+        - fullversion: "v1.6.8"
+          version: "v1.6"
+          githubbranch: "v1.6.8"
+          docsbranch: "release-1.6"
+          url: https://v1-6.docs.kubernetes.io/docs/home/
+        - fullversion: "v1.5.7"
+          version: "v1.5"
+          githubbranch: "v1.5.7"
+          docsbranch: "release-1.5"
+          url: https://v1-5.docs.kubernetes.io/docs/
+      deprecated: true
+      currentUrl: https://kubernetes.io/docs/home/
+      nextUrl: http://kubernetes-io-vnext-staging.netlify.com/
+  -
+    scope:
+      path: "docs"
+    values:
+      layout: docwithnav
+      showedit: true
+
+permalink: pretty
+
+gems:
+  - jekyll-redirect-from
+  - jekyll-feed
+  - jekyll-sitemap
+  - jekyll-seo-tag
+  - jekyll-include-cache
+
+include: [_headers]
+
+# SEO
+logo: /images/favicon.png
+twitter:
+  username: kubernetesio
+
+# empty array for tabs
+emptyArray: []
+
+# Tables of contents, stored in the _data folder, that control the sidebar nav
+tocs:
+  - docs-home
+  - setup
+  - tasks
+  - tutorials
+  - concepts
+  - reference
+  - samples
+  - search

_data/concepts.yml

@@ -0,0 +1,90 @@
+bigheader: "Concepts"
+abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
+toc:
+- docs/concepts/index.md
+
+- title: Overview
+  section:
+  - docs/concepts/overview/what-is-kubernetes.md
+  - docs/concepts/overview/components.md
+  - title: Working with Kubernetes Objects
+    section:
+    - docs/concepts/overview/working-with-objects/kubernetes-objects.md
+    - docs/concepts/overview/working-with-objects/names.md
+    - docs/concepts/overview/working-with-objects/namespaces.md
+    - docs/concepts/overview/working-with-objects/labels.md
+    - docs/concepts/overview/working-with-objects/annotations.md
+  - docs/concepts/overview/kubernetes-api.md
+
+- title: Kubernetes Architecture
+  section:
+  - docs/concepts/architecture/nodes.md
+  - docs/concepts/architecture/master-node-communication.md
+
+- title: Containers
+  section:
+  - docs/concepts/containers/images.md
+  - docs/concepts/containers/container-environment-variables.md
+  - docs/concepts/containers/container-lifecycle-hooks.md
+
+- title: Workloads
+  section:
+  - title: Pods
+    section:
+    - docs/concepts/workloads/pods/pod-overview.md
+    - docs/concepts/workloads/pods/pod.md
+    - docs/concepts/workloads/pods/pod-lifecycle.md
+    - docs/concepts/workloads/pods/init-containers.md
+  - title: Controllers
+    section:
+    - docs/concepts/workloads/controllers/replicaset.md
+    - docs/concepts/workloads/controllers/replicationcontroller.md
+    - docs/concepts/workloads/controllers/deployment.md
+    - docs/concepts/workloads/controllers/statefulset.md
+    - docs/concepts/workloads/controllers/petset.md
+    - docs/concepts/workloads/controllers/daemonset.md
+    - docs/concepts/workloads/controllers/garbage-collection.md
+    - docs/concepts/workloads/controllers/jobs-run-to-completion.md
+    - docs/concepts/workloads/controllers/cron-jobs.md
+
+- title: Configuration
+  section:
+  - docs/concepts/configuration/overview.md
+  - docs/concepts/configuration/manage-compute-resources-container.md
+  - docs/concepts/configuration/assign-pod-node.md
+  - docs/concepts/configuration/secret.md
+
+- title: Services, Load Balancing, and Networking
+  section:
+  - docs/concepts/services-networking/service.md
+  - docs/concepts/services-networking/dns-pod-service.md
+  - docs/concepts/services-networking/connect-applications-service.md
+  - docs/concepts/services-networking/ingress.md
+  - docs/concepts/services-networking/network-policies.md
+
+- title: Storage
+  section:
+  - docs/concepts/storage/volumes.md
+  - docs/concepts/storage/persistent-volumes.md
+  - title: Dynamic Provisioning
+    path: http://blog.kubernetes.io/2016/10/dynamic-provisioning-and-storage-in-kubernetes.html
+
+- title: Cluster Administration
+  section:
+  - docs/concepts/cluster-administration/cluster-administration-overview.md
+  - docs/concepts/cluster-administration/manage-deployment.md
+  - docs/concepts/cluster-administration/networking.md
+  - docs/concepts/cluster-administration/network-plugins.md
+  - docs/concepts/cluster-administration/logging.md
+  - docs/concepts/cluster-administration/kubelet-garbage-collection.md
+  - docs/concepts/cluster-administration/federation.md
+  - docs/concepts/cluster-administration/sysctl-cluster.md
+  - docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig.md
+  - docs/concepts/cluster-administration/master-node-communication.md
+  - docs/concepts/cluster-administration/proxies.md
+  - title: Policies
+    section:
+    - docs/concepts/policy/resource-quotas.md
+    - docs/concepts/policy/pod-security-policy.md
+
+

_data/docs-home.yml

@@ -0,0 +1,23 @@
+bigheader: "Documentation Home"
+abstract: "Documentation for using and learning about Kubernetes."
+toc:
+- docs/home/index.md
+
+- docs/home/index.md
+
+- title: Release Notes
+  path: https://git.k8s.io/kubernetes/CHANGELOG.md
+- title: Release Roadmap
+  path: https://github.com/kubernetes/kubernetes/milestones/
+
+- docs/tasks/debug-application-cluster/troubleshooting.md
+
+- title: Contributing to the Kubernetes Docs
+  section:
+  - editdocs.md
+  - docs/home/contribute/create-pull-request.md
+  - docs/home/contribute/write-new-topic.md
+  - docs/home/contribute/stage-documentation-changes.md
+  - docs/home/contribute/page-templates.md
+  - docs/home/contribute/review-issues.md
+  - docs/home/contribute/style-guide.md

_data/globals.yml

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

_data/overrides.yml

@@ -1,5 +1,4 @@
 overrides:
-- path: docs/admin/cloud-controller-manager.md
 - path: docs/admin/federation-apiserver.md
 - path: docs/admin/federation-controller-manager.md
 - path: docs/admin/kube-apiserver.md
@@ -8,3 +7,4 @@ overrides:
 - path: docs/admin/kube-scheduler.md
 - path: docs/admin/kubelet.md
 - copypath: k8s/federation/docs/api-reference/ docs/federation/
+- copypath: k8s/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml docs/getting-started-guides/fluentd-gcp.yaml

_data/reference.yml

@@ -0,0 +1,89 @@
+bigheader: "Reference Documentation"
+abstract: "Design docs, concept definitions, and references for APIs and CLIs."
+toc:
+- docs/reference/index.md
+
+- title: Using the API
+  section:
+  - docs/reference/api-overview.md
+  - title: Accessing the API
+    section:
+    - docs/admin/accessing-the-api.md
+    - docs/admin/authentication.md
+    - docs/admin/bootstrap-tokens.md
+    - docs/admin/admission-controllers.md
+    - docs/admin/service-accounts-admin.md
+  - title: Authorization
+    section:
+    - docs/admin/authorization/index.md
+    - docs/admin/authorization/abac.md
+    - docs/admin/authorization/rbac.md
+    - docs/admin/authorization/webhook.md
+  - docs/reference/deprecation-policy.md
+
+- title: API Reference
+  section:
+  - title: v1.6
+    path: /docs/api-reference/v1.6/
+  - docs/reference/labels-annotations-taints.md
+  - title: OpenAPI and Swagger
+    section:
+    - title: OpenAPI Spec
+      path: https://git.k8s.io/kubernetes/api/openapi-spec/
+    - title: Swagger Spec
+      path: https://git.k8s.io/kubernetes/api/swagger-spec/
+
+- title: Federation API
+  section:
+    - docs/reference/federation/v1/operations.html
+    - docs/reference/federation/v1/definitions.html
+    - docs/reference/federation/v1beta1/operations.html
+    - docs/reference/federation/v1beta1/definitions.html
+    - docs/reference/federation/extensions/v1beta1/operations.html
+    - docs/reference/federation/extensions/v1beta1/definitions.html
+
+- title: kubectl CLI
+  section:
+  - docs/user-guide/kubectl-overview.md
+  - title: v1.6 Commands
+    path: /docs/user-guide/kubectl/v1.6/
+  - title: v1.5 Commands
+    path: /docs/user-guide/kubectl/v1.5/
+  - docs/user-guide/docker-cli-to-kubectl.md
+  - docs/user-guide/kubectl-conventions.md
+  - docs/user-guide/jsonpath.md
+  - docs/user-guide/kubectl-cheatsheet.md
+
+- docs/admin/kubeadm.md
+
+- title: Config Reference
+  section:
+  - docs/admin/kubelet.md
+  - docs/admin/kube-apiserver.md
+  - docs/admin/kube-controller-manager.md
+  - docs/admin/kube-proxy.md
+  - docs/admin/kube-scheduler.md
+  - docs/admin/federation-apiserver.md
+  - docs/admin/federation-controller-manager.md
+
+- title: Kubernetes Design Docs
+  section:
+  - title: Kubernetes Architecture
+    path: https://git.k8s.io/community/contributors/design-proposals/architecture.md
+  - title: Kubernetes Design Overview
+    path: https://github.com/kubernetes/kubernetes/tree/release-1.6/docs/design
+  - title: Kubernetes Identity and Access Management
+    path: https://git.k8s.io/community/contributors/design-proposals/access.md
+  - docs/admin/ovs-networking.md
+  - title: Security Contexts
+    path: https://git.k8s.io/community/contributors/design-proposals/security_context.md
+  - title: Security in Kubernetes
+    path: https://git.k8s.io/community/contributors/design-proposals/security.md
+
+- title: Kubernetes Issues and Security
+  section:
+  - title: Kubernetes Issue Tracker on GitHub
+    path: https://github.com/kubernetes/kubernetes/issues/
+  - docs/reference/security.md
+
+

_data/setup.yml

@@ -0,0 +1,107 @@
+bigheader: "Setup"
+abstract: "Instructions for setting up a Kubernetes cluster."
+toc:
+- docs/setup/index.md
+- docs/setup/pick-right-solution.md
+
+- title: Independent Solutions
+  section:
+  - docs/getting-started-guides/minikube.md
+
+  - title: Bootstrapping Clusters with kubeadm
+    section:
+    - docs/setup/independent/install-kubeadm.md
+    - docs/setup/independent/create-cluster-kubeadm.md
+
+  - docs/getting-started-guides/scratch.md
+  - docs/getting-started-guides/alternatives.md
+
+- title: Hosted Solutions
+  section:
+  - title: Running Kubernetes on Google Container Engine
+    path: https://cloud.google.com/container-engine/docs/before-you-begin/
+  - title: Running Kubernetes on Azure Container Service
+    path: https://docs.microsoft.com/en-us/azure/container-service/container-service-kubernetes-walkthrough
+  - title: Running Kubernetes on IBM Bluemix Container Service
+    path: https://console.ng.bluemix.net/docs/containers/container_index.html
+
+- title: Turn-key Cloud Solutions
+  section:
+  - docs/getting-started-guides/gce.md
+  - docs/getting-started-guides/aws.md
+  - docs/getting-started-guides/azure.md
+  - docs/getting-started-guides/clc.md
+  - title: Running Kubernetes on IBM Bluemix
+    path: https://github.com/patrocinio/kubernetes-softlayer
+  - docs/getting-started-guides/stackpoint.md
+
+- title: Custom Solutions
+
+  section:
+  - title: Custom Cloud Solutions
+    section:
+    - docs/getting-started-guides/coreos/index.md
+    - docs/getting-started-guides/ubuntu/index.md
+    - docs/getting-started-guides/kops.md
+    - docs/getting-started-guides/kubespray.md
+    - docs/getting-started-guides/running-cloud-controller.md
+
+  - title: On-Premise VMs
+    section:
+    - docs/getting-started-guides/coreos/index.md
+    - docs/getting-started-guides/cloudstack.md
+    - docs/getting-started-guides/vsphere.md
+    - docs/getting-started-guides/photon-controller.md
+    - docs/getting-started-guides/dcos.md
+    - docs/getting-started-guides/libvirt-coreos.md
+    - docs/getting-started-guides/ovirt.md
+    - docs/getting-started-guides/openstack-heat.md
+
+    - title: rkt
+      section:
+      - docs/getting-started-guides/rkt/index.md
+      - docs/getting-started-guides/rkt/notes.md
+
+    - docs/getting-started-guides/mesos/index.md
+    - docs/getting-started-guides/mesos-docker.md
+
+    - title: Bare Metal
+      section:
+      - docs/getting-started-guides/coreos/bare_metal_offline.md
+      - docs/getting-started-guides/fedora/fedora_ansible_config.md
+      - docs/getting-started-guides/fedora/fedora_manual_config.md
+      - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
+      - docs/getting-started-guides/centos/centos_manual_config.md
+      - docs/getting-started-guides/coreos/index.md
+      - docs/getting-started-guides/ubuntu/index.md
+
+      - title: Ubuntu
+        section:
+        - docs/getting-started-guides/ubuntu/index.md
+        - docs/getting-started-guides/ubuntu/validation.md
+        - docs/getting-started-guides/ubuntu/backups.md
+        - docs/getting-started-guides/ubuntu/upgrades.md
+        - docs/getting-started-guides/ubuntu/scaling.md
+        - docs/getting-started-guides/ubuntu/installation.md
+        - docs/getting-started-guides/ubuntu/monitoring.md
+        - docs/getting-started-guides/ubuntu/networking.md
+        - docs/getting-started-guides/ubuntu/security.md
+        - docs/getting-started-guides/ubuntu/storage.md
+        - docs/getting-started-guides/ubuntu/troubleshooting.md
+        - docs/getting-started-guides/ubuntu/decommissioning.md
+        - docs/getting-started-guides/ubuntu/operational-considerations.md
+        - docs/getting-started-guides/ubuntu/glossary.md
+        - docs/getting-started-guides/ubuntu/local.md
+        - docs/getting-started-guides/ubuntu/logging.md
+        - docs/getting-started-guides/ubuntu/manual.md
+
+    - docs/getting-started-guides/windows/index.md
+
+  - docs/admin/node-conformance.md
+
+- docs/concepts/cluster-administration/addons.md
+- docs/admin/salt.md
+- docs/admin/cluster-large.md
+- docs/admin/multiple-zones.md
+- docs/admin/high-availability/index.md
+- docs/getting-started-guides/binary_release.md

_data/tasks.yml

@@ -0,0 +1,159 @@
+bigheader: "Tasks"
+abstract: "Step-by-step instructions for performing operations with Kubernetes."
+toc:
+- docs/tasks/index.md
+
+- title: Install Tools
+  section:
+  - docs/tasks/tools/install-kubectl.md
+  - docs/tasks/tools/install-minikube.md
+  - docs/setup/independent/install-kubeadm.md
+
+- title: Configure Pods and Containers
+  section:
+  - docs/tasks/configure-pod-container/assign-cpu-ram-container.md
+  - docs/tasks/configure-pod-container/configure-volume-storage.md
+  - docs/tasks/configure-pod-container/configure-persistent-volume-storage.md
+  - docs/tasks/configure-pod-container/configure-projected-volume-storage.md
+  - docs/tasks/configure-pod-container/projected-volume.md
+  - docs/tasks/configure-pod-container/security-context.md
+  - docs/tasks/configure-pod-container/environment-variable-expose-pod-information.md
+  - docs/tasks/configure-pod-container/configure-service-account.md
+  - docs/tasks/configure-pod-container/pull-image-private-registry.md
+  - docs/tasks/configure-pod-container/configure-liveness-readiness-probes.md
+  - docs/tasks/configure-pod-container/assign-pods-nodes.md
+  - docs/tasks/configure-pod-container/configure-pod-initialization.md
+  - docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md
+  - docs/tasks/configure-pod-container/configmap.md
+  - docs/tasks/configure-pod-container/configure-pod-configmap.md
+  - docs/tools/kompose/user-guide.md
+
+- title: Inject Data Into Applications
+  section:
+  - docs/tasks/inject-data-application/define-command-argument-container.md
+  - docs/tasks/inject-data-application/define-environment-variable-container.md
+  - docs/tasks/inject-data-application/environment-variable-expose-pod-information.md
+  - docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md
+  - docs/tasks/inject-data-application/distribute-credentials-secure.md
+  - docs/tasks/inject-data-application/podpreset.md
+
+- title: Run Applications
+  section:
+  - docs/tasks/run-application/run-stateless-application-deployment.md
+  - docs/tasks/run-application/run-single-instance-stateful-application.md
+  - docs/tasks/run-application/run-replicated-stateful-application.md
+  - docs/tasks/run-application/upgrade-pet-set-to-stateful-set.md
+  - docs/tasks/run-application/scale-stateful-set.md
+  - docs/tasks/run-application/delete-stateful-set.md
+  - docs/tasks/run-application/force-delete-stateful-set-pod.md
+  - docs/tasks/run-application/rolling-update-replication-controller.md
+  - docs/tasks/run-application/horizontal-pod-autoscale.md
+  - docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md
+
+- title: Run Jobs
+  section:
+  - docs/tasks/job/parallel-processing-expansion.md
+  - docs/tasks/job/coarse-parallel-processing-work-queue/index.md
+  - docs/tasks/job/fine-parallel-processing-work-queue/index.md
+
+- title: Access Applications in a Cluster
+  section:
+  - docs/tasks/access-application-cluster/web-ui-dashboard.md
+  - docs/tasks/access-application-cluster/access-cluster.md
+  - docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig.md
+  - docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
+  - docs/tasks/access-application-cluster/load-balance-access-application-cluster.md
+  - docs/tasks/access-application-cluster/service-access-application-cluster.md
+  - docs/tasks/access-application-cluster/connecting-frontend-backend.md
+  - docs/tasks/access-application-cluster/create-external-load-balancer.md
+  - docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md
+  - docs/tasks/access-application-cluster/list-all-running-container-images.md
+  - docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume.md
+  - title: Configuring DNS for a Cluster
+    path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/cluster-dns
+
+- title: Monitor, Log, and Debug
+  section:
+  - docs/tasks/debug-application-cluster/resource-usage-monitoring.md
+  - docs/tasks/debug-application-cluster/get-shell-running-container.md
+  - docs/tasks/debug-application-cluster/monitor-node-health.md
+  - docs/tasks/debug-application-cluster/logging-stackdriver.md
+  - docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md
+  - docs/tasks/debug-application-cluster/determine-reason-pod-failure.md
+  - docs/tasks/debug-application-cluster/debug-init-containers.md
+  - docs/tasks/debug-application-cluster/debug-pod-replication-controller.md
+  - docs/tasks/debug-application-cluster/debug-service.md
+  - docs/tasks/debug-application-cluster/debug-cluster.md
+  - docs/tasks/debug-application-cluster/debug-application.md
+  - docs/tasks/debug-application-cluster/debug-stateful-set.md
+  - docs/tasks/debug-application-cluster/debug-application-introspection.md
+  - docs/tasks/debug-application-cluster/audit.md
+  - title: Use Explorer to Examine the Runtime Environment
+    path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer
+
+- title: Access and Extend the Kubernetes API
+  section:
+  - docs/tasks/access-kubernetes-api/http-proxy-access-api.md
+  - docs/tasks/access-kubernetes-api/extend-api-third-party-resource.md
+
+- title: TLS
+  section:
+  - docs/tasks/tls/managing-tls-in-a-cluster.md
+
+- title: Administer a Cluster
+  section:
+  - docs/tasks/administer-cluster/access-cluster-api.md
+  - docs/tasks/administer-cluster/access-cluster-services.md
+  - docs/tasks/administer-cluster/configure-upgrade-etcd.md
+  - docs/tasks/administer-cluster/apply-resource-quota-limit.md
+  - docs/tasks/administer-cluster/out-of-resource.md
+  - docs/tasks/administer-cluster/cpu-memory-limit.md
+  - docs/tasks/administer-cluster/reserve-compute-resources.md
+  - docs/tasks/administer-cluster/static-pod.md
+  - docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md
+  - docs/tasks/administer-cluster/cluster-management.md
+  - docs/tasks/administer-cluster/upgrade-1-6.md
+  - docs/tasks/administer-cluster/namespaces.md
+  - docs/tasks/administer-cluster/namespaces-walkthrough.md
+  - docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
+  - docs/tasks/administer-cluster/safely-drain-node.md
+  - docs/tasks/administer-cluster/declare-network-policy.md
+  - docs/tasks/administer-cluster/calico-network-policy.md
+  - docs/tasks/administer-cluster/romana-network-policy.md
+  - docs/tasks/administer-cluster/weave-network-policy.md
+  - docs/tasks/administer-cluster/change-pv-reclaim-policy.md
+  - docs/tasks/administer-cluster/configure-pod-disruption-budget.md
+  - docs/tasks/administer-cluster/limit-storage-consumption.md
+  - docs/tasks/administer-cluster/change-default-storage-class.md
+  - docs/tasks/administer-cluster/share-configuration.md
+  - docs/tasks/administer-cluster/running-cloud-controller.md
+  - docs/tasks/administer-cluster/highly-available-master.md
+  - docs/tasks/administer-cluster/configure-multiple-schedulers.md
+  - docs/tasks/administer-cluster/ip-masq-agent.md
+  - title: Change Cluster Size
+    path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ#how-do-i-change-the-size-of-my-cluster/
+
+- title: Federation - Run an App on Multiple Clusters
+  section:
+  - docs/tasks/federation/federation-service-discovery.md
+  - docs/tasks/federation/set-up-cluster-federation-kubefed.md
+  - docs/tasks/federation/set-up-coredns-provider-federation.md
+  - docs/tasks/administer-federation/cluster.md
+  - docs/tasks/administer-federation/configmap.md
+  - docs/tasks/administer-federation/daemonset.md
+  - docs/tasks/administer-federation/deployment.md
+  - docs/tasks/administer-federation/events.md
+  - docs/tasks/administer-federation/ingress.md
+  - docs/tasks/administer-federation/namespaces.md
+  - docs/tasks/administer-federation/replicaset.md
+  - docs/tasks/administer-federation/secret.md
+
+- title: Manage Cluster Daemons
+  section:
+  - docs/tasks/manage-daemon/update-daemon-set.md
+
+- title: Manage GPUs
+  section:
+  - docs/tasks/manage-gpus/scheduling-gpus.md
+
+

_data/tools.yml

@@ -6,7 +6,7 @@ toc:
 - title: Native Tools
   section:
   - title: Kubectl
-    path: /docs/reference/kubectl/overview/
+    path: /docs/user-guide/kubectl/
   - title: Kubeadm
     path: /docs/getting-started-guides/kubeadm
   - title: Kubefed

_data/tutorials.yml

@@ -0,0 +1,64 @@
+bigheader: "Tutorials"
+abstract: "Detailed walkthroughs of common Kubernetes operations and workflows."
+toc:
+- docs/tutorials/index.md
+- title: Kubernetes Basics
+  section:
+  - docs/tutorials/kubernetes-basics/index.html
+  - title: 1. Create a Cluster
+    section:
+    - docs/tutorials/kubernetes-basics/cluster-intro.html
+    - docs/tutorials/kubernetes-basics/cluster-interactive.html
+  - title: 2. Deploy an App
+    section:
+    - docs/tutorials/kubernetes-basics/deploy-intro.html
+    - docs/tutorials/kubernetes-basics/deploy-interactive.html
+  - title: 3. Explore Your App
+    section:
+    - docs/tutorials/kubernetes-basics/explore-intro.html
+    - docs/tutorials/kubernetes-basics/explore-interactive.html
+  - title: 4. Expose Your App Publicly
+    section:
+    - docs/tutorials/kubernetes-basics/expose-intro.html
+    - docs/tutorials/kubernetes-basics/expose-interactive.html
+  - title: 5. Scale Your App
+    section:
+    - docs/tutorials/kubernetes-basics/scale-intro.html
+    - docs/tutorials/kubernetes-basics/scale-interactive.html
+  - title: 6. Update Your App
+    section:
+    - docs/tutorials/kubernetes-basics/update-intro.html
+    - docs/tutorials/kubernetes-basics/update-interactive.html
+- title: Online Training Course
+  path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615
+- docs/tutorials/stateless-application/hello-minikube.md
+- title: Configuration
+  section:
+  - docs/tutorials/configuration/configure-redis-using-configmap.md
+- title: Object Management Using kubectl
+  section:
+  - docs/tutorials/object-management-kubectl/object-management.md
+  - docs/tutorials/object-management-kubectl/imperative-object-management-command.md
+  - docs/tutorials/object-management-kubectl/imperative-object-management-configuration.md
+  - docs/tutorials/object-management-kubectl/declarative-object-management-configuration.md
+- title: Stateless Applications
+  section:
+  - docs/tasks/run-application/run-stateless-application-deployment.md
+  - docs/tutorials/stateless-application/guestbook.md
+  - docs/tasks/access-application-cluster/service-access-application-cluster.md
+  - docs/tutorials/stateless-application/expose-external-ip-address.md
+- title: Stateful Applications
+  section:
+  - docs/tutorials/stateful-application/basic-stateful-set.md
+  - docs/tasks/run-application/run-single-instance-stateful-application.md
+  - docs/tasks/run-application/run-replicated-stateful-application.md
+  - docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md
+  - docs/tutorials/stateful-application/cassandra.md
+  - docs/tutorials/stateful-application/zookeeper.md
+- title: Clusters
+  section:
+  - docs/tutorials/clusters/apparmor.md
+- title: Services
+  section:
+  - docs/tutorials/services/source-ip.md
+

_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/code.html

@@ -0,0 +1,26 @@
+{% capture samplecode %}{% include_relative {{include.file}} %}{% endcapture %}
+{% if include.k8slink %}{% capture ghlink %}https://raw.githubusercontent.com/kubernetes/kubernetes/blob/{{page.githubbranch}}{{include.k8slink}}{% endcapture %}{% endif %}
+{% if include.ghlink %}{% capture ghlink %}https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/{{page.docsbranch}}{{include.ghlink}}{% endcapture %}{% endif %}
+{% capture mysample %}
+```{{include.language}}
+{{ samplecode | raw | strip }}
+```
+{: id="{{include.file | handleize}}"}
+{% endcapture %}
+<table class="includecode">
+    <thead>
+        <tr>
+            <th>
+                {% if ghlink %}<a href="{{ghlink}}" download="{{include.file}}">{% endif %}
+                    <code>{{include.file}}</code>
+                {% if ghlink %}</a>{% endif %}
+                <img src="/images/copycode.svg" style="max-height:24px" onclick="copyCode('{{include.file | handleize}}')" title="Copy {{include.file}} to clipboard">
+            </th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{ mysample | markdownify }}</td>
+        </tr>
+    </tbody>
+</table>

_includes/default-storage-class-prereqs.md

@@ -0,0 +1,6 @@
+You need to either have a dynamic PersistentVolume provisioner with a default
+[StorageClass](/docs/user-guide/persistent-volumes/#storageclasses),
+or [statically provision PersistentVolumes](/docs/user-guide/persistent-volumes/#provisioning)
+yourself to satisfy the [PersistentVolumeClaims](/docs/user-guide/persistent-volumes/#persistentvolumeclaims)
+used here.
+

_includes/deprecation-warning.html

@@ -0,0 +1,12 @@
+{% if page.deprecated %}
+<section id="deprecationWarning">
+  <main>
+    <div class="content deprecation-warning">
+      <h3>
+        Documentation for Kubernetes {{ page.version}} is no longer actively maintained. The version you are currently viewing is a static snapshot.
+        For up-to-date documentation, see the <a href="{{ page.currentUrl }}">latest</a> version.
+      </h3>
+    </div>
+  </main>
+</section>
+{% endif %}

_includes/feature-dialog.md

@@ -0,0 +1,28 @@
+<a href="#" id="feature-state-dialog-link" class="ui-state-default ui-corner-all"><span class="ui-icon ui-icon-newwin"></span>{{ dialog_title }}</a>
+<div id="feature-state-dialog" class="ui-dialog-content" title="{{ dialog_title }}">
+{{ dialog_content | markdownify }}
+</div>
+{% raw %}<script>
+$(function(){
+    
+    $( "#feature-state-dialog" ).dialog({
+        autoOpen: false,
+        width: {% endraw %}{{ dialog_width | default: "600" }}{% raw %},
+        buttons: [
+            {
+                text: "Ok",
+                click: function() {
+                    $( this ).dialog( "close" );
+                }
+            }
+        ]
+    });
+
+    // Link to open the dialog
+    $( "#feature-state-dialog-link" ).click(function( event ) {
+        $( "#feature-state-dialog" ).dialog( "open" );
+        event.preventDefault();
+    });
+
+});
+</script>{% endraw %}

_includes/feature-state-alpha.md

@@ -0,0 +1,13 @@
+{% assign dialog_title = "alpha" %}
+{% capture dialog_content %}
+This feature is currently in a *alpha* state, meaning:
+
+* The version names contain alpha (e.g. v1alpha1).
+* Might be buggy. Enabling the feature may expose bugs. Disabled by default.
+* Support for feature may be dropped at any time without notice.
+* The API may change in incompatible ways in a later software release without notice.
+* Recommended for use only in short-lived testing clusters, due to increased risk of bugs and lack of long-term support.
+
+{% endcapture %}
+
+**FEATURE STATE:** `Kubernetes {{ for_k8s_version | default: page.version }}` {% include feature-dialog.md %}

_includes/feature-state-beta.md

@@ -0,0 +1,14 @@
+{% assign dialog_title = "beta" %}
+{% capture dialog_content %}
+This feature is currently in a *beta* state, meaning:
+
+* The version names contain beta (e.g. v2beta3).
+* Code is well tested. Enabling the feature is considered safe. Enabled by default.
+* Support for the overall feature will not be dropped, though details may change.
+* The schema and/or semantics of objects may change in incompatible ways in a subsequent beta or stable release. When this happens, we will provide instructions for migrating to the next version. This may require deleting, editing, and re-creating API objects. The editing process may require some thought. This may require downtime for applications that rely on the feature.
+* Recommended for only non-business-critical uses because of potential for incompatible changes in subsequent releases. If you have multiple clusters that can be upgraded independently, you may be able to relax this restriction.
+* **Please do try our beta features and give feedback on them! After they exit beta, it may not be practical for us to make more changes.**
+
+{% endcapture %}
+
+**FEATURE STATE:** `Kubernetes {{ for_k8s_version | default: page.version }}` {% include feature-dialog.md %}

_includes/feature-state-deprecated.md

@@ -0,0 +1,6 @@
+{% assign dialog_title = "deprecated" %}
+{% capture dialog_content %}
+This feature is *deprecated*. For more information on this state, see the [Kubernetes Deprecation Policy](/docs/reference/deprecation-policy/).
+{% endcapture %}
+
+**DEPRECATION NOTICE:** As of `Kubernetes {{ for_k8s_version | default: page.version }}`, this has been {% include feature-dialog.md %}

_includes/feature-state-stable.md

@@ -0,0 +1,10 @@
+{% assign dialog_title = "stable" %}
+{% capture dialog_content %}
+This feature is *stable*, meaning:
+
+* The version name is vX where X is an integer.
+* Stable versions of features will appear in released software for many subsequent versions.
+
+{% endcapture %}
+
+**FEATURE STATE:** `Kubernetes {{ for_k8s_version | default: page.version }}` {% include feature-dialog.md %}

_includes/footer-scripts.html

@@ -1,5 +1,17 @@
 <button class="flyout-button" onclick="kub.toggleToc()"></button>
 
+<style>
+.cse .gsc-control-cse, .gsc-control-cse, {
+    padding: 0;
+}
+  .gsc-control-cse table, .gsc-control-cse-en table {
+      margin:0px !important;
+  }
+  .gsc-above-wrapper-area {
+      border-bottom: 0;
+  }
+</style>
+
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -20,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

@@ -0,0 +1,34 @@
+<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="http://blog.kubernetes.io/">Blog</a>
+            <a href="/partners/">Partners</a>
+            <a href="/community/">Community</a>
+            <a href="/case-studies/">Case Studies</a>
+        </nav>
+        <div class="social">
+            <div>
+                <a href="https://twitter.com/kubernetesio" class="twitter"><span>twitter</span></a>
+                <a href="https://github.com/kubernetes/kubernetes" class="github"><span>Github</span></a>
+                <a href="http://slack.k8s.io/" class="slack"><span>Slack</span></a>
+            </div>
+            <div>
+                <a href="http://stackoverflow.com/questions/tagged/kubernetes" class="stack-overflow"><span>Stack Overflow</span></a>
+                <a href="https://groups.google.com/forum/#!forum/kubernetes-users" class="mailing-list"><span>Mailing List</span></a>
+                <a href="https://calendar.google.com/calendar/embed?src=nt2tcnbtbied3l6gi2h29slvc0%40group.calendar.google.com" class="calendar"><span>Events Calendar</span></a>
+            </div>
+            <div>
+                <a href="/docs/setup/pick-right-solution/" class="button">Get Kubernetes</a>
+                <a href="https://github.com/kubernetes/kubernetes" class="button">Contribute</a>
+            </div>
+        </div>
+        <div id="miceType" class="center">
+            &copy; {{ 'now' | date: "%Y" }} The Kubernetes Authors | Documentation Distributed under <a href="https://git.k8s.io/kubernetes.github.io/LICENSE" class="light-text">CC BY 4.0</a>
+        </div>
+        <div id="miceType" class="center">
+            Copyright &copy; {{ 'now' | date: "%Y" }} The Linux Foundation&reg;. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page: <a href="https://www.linuxfoundation.org/trademark-usage" class="light-text">https://www.linuxfoundation.org/trademark-usage</a>
+        </div>
+    </main>
+</footer>

_includes/head.html

@@ -0,0 +1,25 @@
+<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="https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic">
+    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto+Mono">
+    <link rel="stylesheet" type="text/css" href="/css/styles.css">
+    <link rel="stylesheet" type="text/css" href="/css/jquery-ui.min.css">
+    <link rel="stylesheet" type="text/css" href="/css/sweetalert.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.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="/js/script.js"></script>
+    <script src="/js/sweetalert.min.js"></script>
+    <script src="/js/bootstrap.min.js"></script>
+    {% seo %}
+</head>

_includes/header.html

@@ -5,31 +5,21 @@
 
     <div class="nav-buttons" data-auto-burger="primary">
         <ul class="global-nav">
-            {{ $sections := slice "docs/home" "blog" "partners" "community" "case-studies" }}
-            {{ range $sections }}
-            {{ with $.Site.GetPage "section" . }}<li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>{{ end }}
-            {{ end }}
-            {{ $home := .Site.Home }}
-             <li>
-                <a href="#">
-                    {{ $home.Language.LanguageName }} <span class="ui-icon ui-icon-carat-1-s"></span>
-                </a>
-                <ul>
-                {{ range $home.Translations }}
-                    <li><a href="{{  .RelPermalink }}">{{ .Language.LanguageName }}</a></li>
-                {{ end }}
-                </ul>
-            </li>
-         
+            <li><a href="/docs/home/">Documentation</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>
             <li>
                 <a href="#">
-                    {{ .Site.Params.version }} <span class="ui-icon ui-icon-carat-1-s"></span>
+                    {{page.version}} <span class="ui-icon ui-icon-carat-1-s"></span>
                 </a>
                 <ul>
-                {{ range .Site.Params.versions }}
-                    <li><a href="{{  .url }}">{{ .version }}</a></li>
-                {{ end }}
+                {% for version in page.versions %}
+                  <li><a href="{{ version.url }}">{{ version.version }}</a></li>
+                {% endfor %}
                 </ul>
+              </li>
             </li>
         </ul>
         <!-- <a href="/docs/home" class="button" id="viewDocs" data-auto-burger-exclude>View Documentation</a> -->
@@ -52,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

@@ -0,0 +1,559 @@
+;(function () {
+	var partners = [
+		{
+			type: 0,
+			name: 'CoreOS',
+			logo: 'core_os',
+			link: 'https://tectonic.com/',
+			blurb: 'Tectonic is the enterprise-ready Kubernetes product, by CoreOS. It adds key features to allow you to manage, update, and control clusters in production.'
+		},
+		{
+			type: 0,
+			name: 'Deis',
+			logo: 'deis',
+			link: 'https://deis.com',
+			blurb: 'Deis the creators of Helm, Workflow, and Steward, helps developers and operators build, deploy, manage and scale their applications on top of Kubernetes.'
+		},
+		{
+			type: 0,
+			name: 'StackPointCloud',
+			logo: 'stackpoint',
+			link: 'https://stackpoint.io',
+			blurb: 'StackPointCloud builds Stackpoint.io, the universal control plane for Kubernetes Anywhere -- compose and build your own infrastructure as easily as a DigitalOcean droplet at any public cloud provider.'
+		},
+		{
+			type: 0,
+			name: 'Sysdig Cloud',
+			logo: 'sys_dig',
+			link: 'https://sysdig.com/blog/monitoring-kubernetes-with-sysdig-cloud/',
+			blurb: 'Container native monitoring with deep support for Kubernetes.'
+		},
+		{
+			type: 0,
+			name: 'Puppet',
+			logo: 'puppet',
+			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,
+			name: 'Citrix',
+			logo: 'citrix',
+			link: 'http://wercker.com/workflows/partners/kubernetes/',
+			blurb: 'Netscaler CPX gives app developers all the features they need to load balance their microservices and containerized apps with Kubernetes.'
+		},
+		{
+			type: 0,
+			name: 'Cockroach Labs',
+			logo: 'cockroach_labs',
+			link: 'https://www.cockroachlabs.com/blog/running-cockroachdb-on-kubernetes/',
+			blurb: 'CockroachDB is a distributed SQL database whose built-in replication and survivability model pair with Kubernetes to truly make data easy.'
+		},
+		{
+			type: 0,
+			name: 'Skippbox',
+			logo: 'skippbox',
+			link: 'http://www.skippbox.com/tag/products/',
+			blurb: 'Creator of Cabin the first mobile application for Kubernetes, and kompose. Skippbox’s solutions distill all the power of k8s in simple easy to use interfaces.'
+		},
+		{
+			type: 0,
+			name: 'Weave Works',
+			logo: 'weave_works',
+			link: ' https://weave.works/kubernetes',
+			blurb: 'Weaveworks enables Developers and Dev/Ops teams to easily connect, deploy, secure, manage, and troubleshoot microservices in Kubernetes.'
+		},
+		{
+			type: 0,
+			name: 'Wercker',
+			logo: 'wercker',
+			link: 'http://wercker.com/workflows/partners/kubernetes/',
+			blurb: 'Wercker automates your build, test and deploy pipelines for launching containers and triggering rolling updates on your Kubernetes cluster. '
+		},
+		{
+			type: 0,
+			name: 'Rancher',
+			logo: 'rancher',
+			link: 'http://rancher.com/kubernetes/',
+			blurb: 'Rancher is an open-source, production-ready container management platform that makes it easy to deploy and leverage Kubernetes in the enterprise.'
+		},
+		{
+			type: 0,
+			name: 'Red Hat',
+			logo: 'redhat',
+			link: 'https://www.openshift.com/',
+			blurb: 'Leverage an enterprise Kubernetes platform to orchestrate complex, multi-container apps.'
+		},
+		{
+			type: 0,
+			name: 'Intel',
+			logo: 'intel',
+			link: 'https://tectonic.com/press/intel-coreos-collaborate-on-openstack-with-kubernetes.html',
+			blurb: 'Powering the GIFEE (Google’s Infrastructure for Everyone Else), to run OpenStack deployments on Kubernetes.'
+		},
+		{
+			type: 0,
+			name: 'ElasticKube',
+			logo: 'elastickube',
+			link: 'https://www.ctl.io/elastickube-kubernetes/',
+			blurb: 'Self-service container management for Kubernetes.'
+		},
+		{
+			type: 0,
+			name: 'Platform9',
+			logo: 'platform9',
+			link: 'https://platform9.com/products/kubernetes/',
+			blurb: 'Platform9 is the open source-as-a-service company that takes all of the goodness of Kubernetes and delivers it as a managed service.'
+		},
+		{
+			type: 0,
+			name: 'Datadog',
+			logo: 'datadog',
+			link: 'http://docs.datadoghq.com/integrations/kubernetes/',
+			blurb: 'Full-stack observability for dynamic infrastructure & applications. Includes precision alerting, analytics and deep Kubernetes integrations. '
+		},
+		{
+			type: 0,
+			name: 'AppFormix',
+			logo: 'appformix',
+			link: 'http://www.appformix.com/solutions/appformix-for-kubernetes/',
+			blurb: 'AppFormix is a cloud infrastructure performance optimization service helping enterprise operators streamline their cloud operations on any Kubernetes cloud. '
+		},
+		{
+			type: 0,
+			name: 'Crunchy',
+			logo: 'crunchy',
+			link: 'http://info.crunchydata.com/blog/advanced-crunchy-containers-for-postgresql',
+			blurb: 'Crunchy PostgreSQL Container Suite is a set of containers for managing PostgreSQL with DBA microservices leveraging Kubernetes and Helm.'
+		},
+		{
+			type: 0,
+			name: 'Aqua',
+			logo: 'aqua',
+			link: 'http://blog.aquasec.com/security-best-practices-for-kubernetes-deployment',
+			blurb: 'Deep, automated security for your containers running on Kubernetes.'
+		},
+		{
+			type: 0,
+			name: 'Canonical',
+			logo: 'canonical',
+			link: 'https://jujucharms.com/canonical-kubernetes/',
+			blurb: 'The Canonical Distribution of Kubernetes enables you to operate Kubernetes clusters on demand on any major public cloud and private	infrastructure.'
+		},
+		{
+			type: 0,
+			name: 'Distelli',
+			logo: 'distelli',
+			link: 'https://www.distelli.com/',
+			blurb: 'Pipelines from your source repositories to your Kubernetes Clusters on any cloud.'
+		},
+		{
+			type: 0,
+			name: 'Nuage networks',
+			logo: 'nuagenetworks',
+			link: 'https://github.com/nuagenetworks/nuage-kubernetes',
+			blurb: 'The Nuage SDN platform provides policy-based networking between Kubernetes Pods and non-Kubernetes environments with visibility and security monitoring.'
+		},
+		{
+			type: 0,
+			name: 'Sematext',
+			logo: 'sematext',
+			link: 'https://sematext.com/kubernetes/',
+			blurb: 'Logging & Monitoring: Automatic collection and processing of Metrics, Events and Logs for auto-discovered pods and Kubernetes nodes.'
+		},
+		{
+			type: 0,
+			name: 'Diamanti',
+			logo: 'diamanti',
+			link: 'https://www.diamanti.com/products/',
+			blurb: 'Diamanti deploys containers with guaranteed performance using Kubernetes in the first hyperconverged appliance purpose built for containerized applications.'
+		},
+		{
+			type: 0,
+			name: 'Apprenda',
+			logo: 'apprenda',
+			link: 'https://apprenda.com/kubernetes-support/',
+			blurb: 'Apprenda creates and supports modern, enterprise-ready application platforms for both cloud native and traditional application workloads.'
+		},
+		{
+			type: 0,
+			name: 'Aporeto',
+			logo: 'aporeto',
+			link: 'https://aporeto.com/trireme',
+			blurb: 'Aporeto makes cloud-native applications secure by default without impacting developer velocity and works at any scale, on any cloud.'
+		},
+		{
+  		type: 0,
+ 			name: 'Giant Swarm',
+ 			logo: 'giant_swarm',
+ 			link: 'https://giantswarm.io',
+ 			blurb: 'Giant Swarm provides fully-managed Kubernetes Clusters in your location of choice, so you can focus on your product.'
+ 		},
+		{
+ 			type: 0,
+ 			name: 'Mirantis',
+ 			logo: 'mirantis',
+ 			link: 'https://content.mirantis.com/Containerizing-OpenStack-on-Kubernetes-Video-Landing-Page.html',
+ 			blurb: 'Mirantis builds and manages private clouds with open source software such as OpenStack, deployed as containers orchestrated by Kubernetes.'
+ 		},
+		{
+ 			type: 0,
+ 			name: 'Kubernetic',
+ 			logo: 'kubernetic',
+ 			link: 'https://kubernetic.com/',
+ 			blurb: 'Kubernetic is a Kubernetes Desktop client that simplifies and democratizes cluster management for DevOps.'
+ 		},
+		{
+			type: 1,
+			name: 'Apprenda',
+			logo: 'apprenda',
+			link: 'https://apprenda.com/kubernetes-support/',
+			blurb: 'Apprenda offers flexible and wide range of support plans for pure play Kubernetes on your choice of infrastructure, cloud provider and operating system.'
+		},
+		{
+			type: 1,
+			name: 'Reactive Ops',
+			logo: 'reactive_ops',
+			link: 'https://www.reactiveops.com/kubernetes/',
+			blurb: 'ReactiveOps has written automation on best practices for infrastructure as code on GCP & AWS using Kubernetes, helping you build and maintain a world-class infrastructure at a fraction of the price of an internal hire.'
+		},
+		{
+			type: 1,
+			name: 'Livewyer',
+			logo: 'livewyer',
+			link: 'https://livewyer.io/services/kubernetes-experts/',
+			blurb: 'Kubernetes experts that on-board applications and empower IT teams to get the most out of containerised technology.'
+		},
+		{
+			type: 1,
+			name: 'Deis',
+			logo: 'deis',
+			link: 'https://deis.com/services/',
+			blurb: 'Deis provides professional services and 24x7 operational support for any Kubernetes cluster managed by our global cluster operations team.'
+		},
+		{
+			type: 1,
+			name: 'StackPointCloud',
+			logo: 'stackpoint',
+			link: 'https://stackpoint.io',
+			blurb: 'StackPointCloud offers a wide range of support plans for managed Kubernetes clusters built through its universal control plane for Kubernetes Anywhere.'
+		},
+		{
+			type: 1,
+			name: 'Samsung SDS',
+			logo: 'samsung_sds',
+			link: 'http://www.samsungsdsa.com/cloud-infrastructure_kubernetes',
+			blurb: 'Samsung SDS’s Cloud Native Computing Team offers expert consulting across the range of technical aspects involved in building services targeted at a Kubernetes cluster.'
+		},
+		{
+			type: 1,
+			name: 'Container Solutions',
+			logo: 'container_solutions',
+			link: 'http://container-solutions.com/resources/kubernetes/',
+			blurb: 'Container Solutions is a premium software consultancy that focuses on programmable infrastructure, offering our expertise in software development, strategy and operations to help you innovate at speed and scale.'
+		},
+		{
+			type: 1,
+			name: 'Jetstack',
+			logo: 'jetstack',
+			link: 'https://www.jetstack.io/',
+			blurb: 'Jetstack is an organisation focused entirely on Kubernetes. They will help you to get the most out of Kubernetes through expert professional services and open source tooling. Get in touch, and accelerate your project.'
+		},
+		{
+			type: 0,
+			name: 'Tigera',
+			logo: 'tigera',
+			link: 'http://docs.projectcalico.org/v1.5/getting-started/kubernetes/',
+			blurb: 'Tigera builds high performance, policy driven, cloud native networking solutions for Kubernetes.'
+		},
+		{
+			type: 1,
+			name: 'Skippbox',
+			logo: 'skippbox',
+			link: 'http://www.skippbox.com/services/',
+			blurb: 'Skippbox brings its Kubernetes expertise to help companies embrace Kubernetes on their way to digital transformation. Skippbox offers both professional services and expert training.'
+		},
+		{
+ 			type: 1,
+ 			name: 'Harbur',
+ 			logo: 'harbur',
+ 			link: 'https://harbur.io/',
+ 			blurb: 'Based in Barcelona, Harbur is a consulting firm that helps companies deploy self-healing solutions empowered by Container technologies'
+  		},
+		{
+ 			type: 1,
+ 			name: 'Endocode',
+ 			logo: 'endocode',
+ 			link: 'https://endocode.com/kubernetes/',
+ 			blurb: 'Endocode practices and teaches the open source way. Kernel to cluster - Dev to Ops. We offer Kubernetes trainings, services and support.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'Spotinst',
+ 			logo: 'spotinst',
+ 			link: 'http://blog.spotinst.com/2016/08/04/elastigroup-kubernetes-minions-steroids/',
+ 			blurb: 'Spotinst uses a prediction algorithm in the Amazon EC2 Spot allowing k8s clusters to increase performance and lower the infrastructure costs'
+  		},
+		{
+ 			type: 1,
+ 			name: 'inwinSTACK',
+ 			logo: 'inwinstack',
+ 			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: 1,
+ 			name: 'Semantix',
+ 			logo: 'semantix',
+ 			link: 'http://www.semantix.com.br/',
+ 			blurb: 'Semantix is a company that works with data analytics and distributed systems. Kubernetes is used to orchestrate services for our customers.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'ASM Technologies Limited',
+ 			logo: 'asm',
+ 			link: 'http://www.asmtech.com/',
+ 			blurb: 'Our technology supply chain portfolio enables your software products to be accessible, viable and available more effectively.'
+  		},
+		{
+ 			type: 1,
+ 			name: 'InfraCloud Technologies',
+ 			logo: 'infracloud',
+ 			link: 'http://blog.infracloud.io/state-of-kubernetes/',
+ 			blurb: 'InfraCloud Technologies is software consultancy which provides services in Containers, Cloud and DevOps.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'SignalFx',
+ 			logo: 'signalfx',
+ 			link: 'https://github.com/signalfx/integrations/tree/master/kubernetes',
+ 			blurb: 'Gain real-time visibility across metrics & the most intelligent alerts for todays architectures, including deep integration with Kubernetes'
+  		},
+		{
+ 			type: 0,
+ 			name: 'NATS',
+ 			logo: 'nats',
+ 			link: 'https://github.com/pires/kubernetes-nats-cluster',
+ 			blurb: 'NATS is a simple, secure, and scalable cloud native messaging system.'
+  		},
+		{
+ 			type: 1,
+ 			name: 'RX-M',
+ 			logo: 'rxm',
+ 			link: 'http://rx-m.com/training/kubernetes-training/',
+ 			blurb: 'Market neutral Kubernetes Dev, DevOps and Production training and consulting services'
+  		},
+		{
+ 			type: 1,
+ 			name: 'Emerging Technology Advisors',
+ 			logo: 'eta',
+ 			link: 'https://www.emergingtechnologyadvisors.com/services/kubernetes.html',
+ 			blurb: 'ETA helps companies architect, implement, and manage scalable applications using Kubernetes on on public or private cloud.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'CloudPlex.io',
+ 			logo: 'cloudplex',
+ 			link: 'http://www.cloudplex.io',
+ 			blurb: 'CloudPlex enables operations teams to visually deploy, orchestrate, manage, and monitor infrastructure, applications, and services in public or private cloud.'
+  		},
+		{
+ 			type: 1,
+ 			name: 'Kumina',
+ 			logo: 'kumina',
+ 			link: 'https://www.kumina.nl/managed_kubernetes',
+ 			blurb: 'Kumina creates Kubernetes solutions on your choice of infrastructure with around-the-clock management and unlimited support.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'CA Technologies',
+ 			logo: 'ca',
+ 			link: 'https://www.ca.com/us/products/application-deployment.html',
+ 			blurb: 'The RA CDE Kubernetes plugin enables an automated process for pushing changes to production by applying standard Kubernetes YAML files'
+  		},
+		{
+ 			type: 0,
+ 			name: 'CoScale',
+ 			logo: 'coscale',
+ 			link: 'http://www.coscale.com/blog/how-to-monitor-your-kubernetes-cluster',
+ 			blurb: 'Full stack monitoring of containers and microservices orchestrated by Kubernetes. Powered by anomaly detection to find problems faster.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'Supergiant.io',
+ 			logo: 'supergiant',
+ 			link: 'https://supergiant.io/blog/supergiant-packing-algorithm-unique-save-money',
+ 			blurb: 'Supergiant autoscales hardware for Kubernetes. Open-source, it makes HA, distributed, stateful apps easy to deploy, manage, and scale.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'Avi Networks',
+ 			logo: 'avinetworks',
+ 			link: 'https://kb.avinetworks.com/avi-vantage-openshift-installation-guide/',
+ 			blurb: 'Avis elastic application services fabric provides scalable, feature rich & integrated L4-7 networking for K8S environments.'
+  		},
+		{
+ 			type: 1,
+ 			name: 'codecrux web technologies pvt ltd',
+ 			logo: 'codecrux',
+ 			link: 'http://codecrux.com/kubernetes/',
+ 			blurb: 'At CodeCrux we help your organization get the most out of Containers and Kubernetes, regardless of where you are in your journey'
+  		},
+		{
+ 			type: 0,
+ 			name: 'Greenqloud',
+ 			logo: 'qstack',
+ 			link: 'https://www.qstack.com/application-orchestration/',
+ 			blurb: 'Qstack provides self-serviceable on-site Kubernetes clusters with an intuitive User Interface for Infrastructure and Kubernetes management.'
+  		},
+		{
+ 			type: 1,
+ 			name: 'StackOVerdrive.io',
+ 			logo: 'stackoverdrive',
+ 			link: 'http://www.stackoverdrive.net/kubernetes-consulting/',
+ 			blurb: 'We are a devops consulting firm and we do alot of work with containers and Kunbernetes is one of our go to tools.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'F5 Networks',
+ 			logo: 'f5networks',
+ 			link: 'https://f5.com/about-us/news/press-kit',
+ 			blurb: 'Integration of our ADC services with Kubernetes'
+  		},
+		{
+ 			type: 0,
+ 			name: 'StackIQ, Inc.',
+ 			logo: 'stackiq',
+ 			link: 'https://www.stackiq.com/kubernetes/',
+ 			blurb: 'With Stacki and the Stacki Pallet for Kubernetes, you can go from bare metal to containers in one step very quickly and easily.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'Cobe',
+ 			logo: 'cobe',
+ 			link: 'https://cobe.io/blog/posts/problems-within-your-kubernetes-cluster/',
+ 			blurb: 'Manage Kubernetes clusters with a live, searchable model that captures all relationships and performance data in full visualised context.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'Datawire',
+ 			logo: 'datawire',
+ 			link: 'http://www.datawire.io',
+ 			blurb: 'Datawires open source tools let your microservices developers be awesomely productive on Kubernetes, while letting ops sleep at night.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'Mashape, Inc.',
+ 			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.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'F5 Networks',
+ 			logo: 'f5networks',
+ 			link: 'http://github.com/f5networks',
+ 			blurb: 'We have a LB integration into Kubernetes.'
+  		},
+		{
+ 			type: 1,
+ 			name: 'Lovable Tech',
+ 			logo: 'lovable',
+ 			link: 'https://drive.google.com/file/d/0BxCnAyMK1pgBTUFOdEZsUndLa01xMGJYZWtUVmVOdldadk80/view?usp=sharing',
+ 			blurb: ''
+  		},
+		{
+ 			type: 0,
+ 			name: 'StackState',
+ 			logo: 'stackstate',
+ 			link: 'http://stackstate.com/platform/container-monitoring',
+ 			blurb: 'Operational Analytics across teams and tools. Includes topology visualization, root cause analysis and anomaly detection for Kubernetes.'
+  		},
+		{
+ 			type: 1,
+ 			name: 'INEXCCO INC',
+ 			logo: 'inexcco',
+ 			link: 'https://www.inexcco.com/',
+ 			blurb: 'Strong DevOps and Cloud talent working with couple clients on kubernetes and helm implementations. '
+  		},
+		{
+ 			type: 0,
+ 			name: 'Bitnami',
+ 			logo: 'bitnami',
+ 			link: 'http://bitnami.com/kubernetes',
+ 			blurb: 'Bitnami brings a catalog of trusted, up to date, and easy to use applications and application building blocks to Kubernetes.'
+  		},
+		{
+ 			type: 1,
+ 			name: 'Nebulaworks',
+ 			logo: 'nebulaworks',
+ 			link: 'http://www.nebulaworks.com/container-platforms',
+ 			blurb: 'Nebulaworks provides services to help the enterprise adopt modern container platforms and optimized processes to enable innovation at scale.'
+  		},
+		{
+ 			type: 1,
+ 			name: 'EASYNUBE LTD',
+ 			logo: 'easynube',
+ 			link: 'https://www.carrefour.es/supermercado/?ic_source=portal-home&ic_medium=menu-links&ic_content=section-home',
+ 			blurb: 'Provide consultancy, architecture and implementation'
+  		},
+		{
+ 			type: 1,
+ 			name: 'Opcito Technologies',
+ 			logo: 'opcito',
+ 			link: 'http://www.opcito.com/kubernetes/',
+ 			blurb: 'Opcito is a software consultancy that uses Kubernetes to help organisations build, architect & deploy highly scalable applications.'
+  		},
+		{
+ 			type: 0,
+ 			name: 'Huawei Technologies Co., Ltd.',
+ 			logo: 'huawei',
+ 			link: 'http://developer.huawei.com/ict/en/site-paas',
+ 			blurb: 'FusionStage is an enterprise-grade PaaS, the core of which is based on open source container technology including Kubernetes and Docker.'
+  		},
+		{
+ 			type: 0,
+ 			name: '{code} by Dell EMC',
+ 			logo: 'codedellemc',
+ 			link: 'https://blog.codedellemc.com',
+ 			blurb: 'Respected as a thought leader in storage persistence for containerized applications. Contributed significant work to K8 and Ecosystem'
+  		}
+		
+	]
+
+	var isvContainer = document.getElementById('isvContainer')
+	var servContainer = document.getElementById('servContainer')
+
+	var sorted = partners.sort(function (a, b) {
+		if (a.name > b.name) return 1
+		if (a.name < b.name) return -1
+		return 0
+	})
+
+	sorted.forEach(function (obj) {
+		var box = document.createElement('div')
+		box.className = 'partner-box'
+
+		var img = document.createElement('img')
+		img.src = '/images/square-logos/' + obj.logo + '.png'
+
+		var div = document.createElement('div')
+
+		var p = document.createElement('p')
+		p.textContent = obj.blurb
+
+		var link = document.createElement('a')
+		link.href = obj.link
+		link.target = '_blank'
+		link.textContent = 'Learn more'
+
+		div.appendChild(p)
+		div.appendChild(link)
+
+		box.appendChild(img)
+		box.appendChild(div)
+
+		var container = obj.type ? servContainer : isvContainer
+		container.appendChild(box)
+	})
+})();

_includes/partner-style.css

@@ -0,0 +1,94 @@
+h5 {
+	font-size: 18px;
+	line-height: 1.5em;
+	margin-bottom: 2em;
+}
+
+#usersGrid a {
+	display: inline-block;
+	background-color: #f9f9f9;
+}
+
+#isvContainer, #servContainer {
+	position: relative;
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	flex-wrap: wrap;
+}
+
+#isvContainer {
+	margin-bottom: 80px;
+}
+
+.partner-box {
+	position: relative;
+	width: 47%;
+	max-width: 48%;
+	min-width: 48%;
+	margin-bottom: 20px;
+	padding: 20px;
+	flex: 1;
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+}
+
+.partner-box img {
+	background-color: #f9f9f9;
+}
+
+.partner-box > div {
+	margin-left: 30px;
+}
+
+.partner-box a {
+	color: #3576E3;
+}
+
+@media screen and (max-width: 1024px) {
+	.partner-box {
+		flex-direction: column;
+		justify-content: flex-start;
+	}
+
+	.partner-box > div {
+		margin: 20px 0 0;
+	}
+}
+
+@media screen and (max-width: 568px) {
+	#isvContainer, #servContainer {
+		justify-content: center;
+	}
+
+	.partner-box {
+		flex-direction: column;
+		justify-content: flex-start;
+		width: 100%;
+		max-width: 100%;
+		min-width: 100%;
+	}
+
+	.partner-box > div {
+		margin: 20px 0 0;
+	}
+}
+
+@media screen and (max-width: 568px) {
+	#isvContainer, #servContainer {
+		justify-content: center;
+	}
+
+	.partner-box {
+		flex-direction: column;
+		justify-content: flex-start;
+		width: 100%;
+		max-width: 100%;
+		min-width: 100%;
+	}
+
+	.partner-box > div {
+		margin: 20px 0 0;
+	}
+}

_includes/tabs.md

@@ -0,0 +1,15 @@
+{% comment %} See /docs/tabs-example.md for usage example. {% endcomment %}
+{% assign tab_set_id = tab_set_name | default: "tabset" | slugify %}
+<div id="{{tab_set_id}}">
+    <ul>
+{% for name in tab_names %}
+        <li><a href="#{{tab_set_id}}-{{forloop.index0}}">{{ name | strip }}</a></li>
+{% endfor %}
+    </ul>
+{% for content in tab_contents %}
+    <div id="{{tab_set_id}}-{{forloop.index0}}">
+    {{ content | markdownify }}
+    </div>
+{% endfor %}
+</div>
+<script>$(function(){$("#{{tab_set_id}}").tabs();});</script>

_includes/task-tutorial-prereqs.md

@@ -0,0 +1,4 @@
+You need to have a Kubernetes cluster, and the kubectl command-line tool must
+be configured to communicate with your cluster. If you do not already have a
+cluster, you can create one by using
+[Minikube](/docs/getting-started-guides/minikube).

_includes/templates/_errorthrower.md

@@ -0,0 +1,16 @@
+### ERROR: You must define a <span style="font-family: monospace">`{{ include.missing_block }}`</span> block
+{: style="color:red" }
+
+This template requires that you provide text that {{ include.purpose }}. The text in this block will
+be displayed under the heading **{{ include.heading }}**.
+
+To get rid of this message and take advantage of this template, define the `{{ include.missing_block }}`
+variable and populate it with content.
+
+```liquid
+{% raw %}{%{% endraw %} capture {{ include.missing_block }} {% raw %}%}{% endraw %}
+Text that {{ include.purpose }}.
+{% raw %}{%{% endraw %} endcapture {% raw %}%}{% endraw %}
+```
+
+<!-- TEMPLATE_ERROR -->

_includes/templates/concept-overview.md

@@ -0,0 +1,88 @@
+{% if concept %}<!-- check for this before going any further; if not present, skip to else at bottom -->
+
+# Overview of {{concept}}s
+
+{% if what_is %}
+
+### What is a {{ concept }}?
+
+{{ what_is }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='what_is' heading='What is a (Concept)?' purpose='explains what this concept is and its purpose.' %}
+
+{% endif %}
+
+
+{% if when_to_use %}
+
+### When to use {{ concept }}s
+
+{{ when_to_use }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='when_to_use' heading='When to use (Concept)' purpose='explains when to use this object.' %}
+
+{% endif %}
+
+
+{% if when_not_to_use %}
+
+### When not to use {{ concept }}s
+
+{{ when_not_to_use }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='when_not_to_use' heading='When not to use (Concept)' purpose='explains when not to use this object.' %}
+
+{% endif %}
+
+
+{% if status %}
+
+### {{ concept }} status
+
+{{ status }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='status' heading='Retrieving status for a (Concept)' purpose='explains how to retrieve a status description for this object.' %}
+
+{% endif %}
+
+
+{% if usage %}
+
+#### Usage
+
+{{ usage }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='usage' heading='Usage' purpose='shows the most basic, common use case for this object, in the form of a code sample, command, etc, using tabs to show multiple approaches' %}
+
+{% endif %}
+
+<!-- continuing the "if concept" if/then: -->
+
+{% else %}
+
+### ERROR: You must define a "concept" variable
+{: style="color:red" }
+
+This template requires a variable called `concept` that is simply the name of the
+concept for which you are giving an overview. This will be displayed in the 
+headings for the document.
+
+To get rid of this message and take advantage of this template, define `concept`:
+
+```liquid
+{% raw %}{% assign concept="Replication Controller" %}{% endraw %}
+```
+
+Complete this task, then we'll walk you through preparing the rest of the document.
+
+{% endif %}

_includes/templates/concept.md

@@ -0,0 +1,32 @@
+{% if overview %}
+
+{{ overview }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='overview' purpose='provides an overview of this concept.' %}
+
+{% endif %}
+
+* TOC
+{:toc}
+
+{% if body %}
+
+{{ body }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='body' purpose='supplies the body of the page content.' %}
+
+{% endif %}
+
+
+{% if whatsnext %}
+
+## What's next
+
+{{ whatsnext }}
+
+{% endif %}
+

_includes/templates/kubectl.md

@@ -0,0 +1,37 @@
+{% if command %}
+
+# {% if site.data.kubectl[command].name != "kubectl" %}kubectl {% endif %}{{ site.data.kubectl[command].name }}
+
+{{ site.data.kubectl[command].synopsis }}
+
+## Description
+
+{{ site.data.kubectl[command].description }}
+
+{% if site.data.kubectl[command].options %}
+## Options
+
+| Option | Shorthand | Default Value | Usage |
+|--------------------|---------------|-------|{% for option in site.data.kubectl[command].options %}
+| `{{option.name | strip}}` | {% if option.shorthand %}`{{ option.shorthand | strip }}`{% endif %} | {% if option.default_value %}`{{option.default_value| strip}}`{% endif %} | {% if option.usage %}{{option.usage| strip | replace:'|',', '}}{% endif %} |{% endfor %}
+{% endif %}
+
+{% if site.data.kubectl[command].inherited_options %}
+## Inherited Options
+
+| Option | Shorthand | Default Value | Usage |
+|--------------------|---------------|-------|{% for option in site.data.kubectl[command].inherited_options %}
+| `{{option.name | strip}}` | {% if option.shorthand %}`{{ option.shorthand | strip }}`{% endif %} | {% if option.default_value %}`{{option.default_value| strip}}`{% endif %} | {% if option.usage %}{{option.usage| strip | replace:'|',', '}}{% endif %} |{% endfor %}
+{% endif %}
+
+## See also
+
+{% for seealso in site.data.kubectl[command].see_also %}
+- [`{{ seealso }}`](/docs/kubectl/{% if seealso != "kubectl" %}kubectl_{{seealso}}{% endif %})
+{% endfor %}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='command' heading='kubectl (command)' purpose='names the kubectl command, so that the appropriate YAML file (from _data/kubectl) can be transformed into a page.' %}
+
+{% endif %}

_includes/templates/task.md

@@ -0,0 +1,55 @@
+{% if overview %}
+
+{{ overview }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='overview' purpose='states, in one or two sentences, the purpose of this document' %}
+
+{% endif %}
+
+
+* TOC
+{: toc}
+
+
+{% if prerequisites %}
+
+## Before you begin
+
+{{ prerequisites }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='prerequisites' heading='Before you begin' purpose='lists action prerequisites and knowledge prerequisites' %}
+
+{% endif %}
+
+
+{% if steps %}
+
+{{ steps }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='steps' purpose='lists a sequence of numbered steps that accomplish the task.' %}
+
+{% endif %}
+
+
+{% if discussion %}
+
+{{ discussion }}
+
+{% else %}
+
+{% endif %}
+
+
+{% if whatsnext %}
+
+## What's next
+
+{{ whatsnext }}
+
+{% endif %}

_includes/templates/tutorial.md

@@ -0,0 +1,68 @@
+{% if overview %}
+
+{{ overview }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='overview' purpose='states, in one or two sentences, the purpose of this document' %}
+
+{% endif %}
+
+
+* TOC
+{: toc}
+
+
+{% if objectives %}
+
+## Objectives
+
+{{ objectives }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='objectives' heading='Objectives' purpose='lists the objectives for this tutorial.' %}
+
+{% endif %}
+
+
+{% if prerequisites %}
+
+## Before you begin
+
+{{ prerequisites }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='prerequisites' heading='Before you begin' purpose='lists action prerequisites and knowledge prerequisites' %}
+
+{% endif %}
+
+
+{% if lessoncontent %}
+
+{{ lessoncontent }}
+
+{% else %}
+
+{% include templates/_errorthrower.md missing_block='lessoncontent' purpose='provides the lesson content for this tutorial.' %}
+
+{% endif %}
+
+
+{% if cleanup %}
+
+## Cleaning up
+
+{{ cleanup }}
+
+{% endif %}
+
+
+{% if whatsnext %}
+
+## What's next
+
+{{ whatsnext }}
+
+{% endif %}

_includes/tocsearch.html

@@ -0,0 +1,15 @@
+{% capture whitespace %}
+  {% for item in include.tree %}
+    {% if found_toc %}
+      {% break %}
+    {% endif %}
+    {% if item.section %}
+      {% include tocsearch.html tree=item.section toc=include.toc %}
+    {% else %}
+      {% if item == page.path %}
+        {% assign found_toc = include.toc %}
+        {% break %}
+      {% endif %}
+    {% endif %}
+  {% endfor %}
+{% endcapture %}

_includes/tree.html

@@ -0,0 +1,25 @@
+{% for item in include.tree %}
+  {% if item.section %}
+    <div class="item" data-title="{{ item.title }}">
+      <div class="container">
+        {% include_cached tree.html tree=item.section %}
+      </div>
+    </div>
+  {% else %}
+
+    {% capture whitespace %}
+      {% if item.path %}
+        {% assign path   = item.path %}
+        {% assign title  = item.title %}
+      {% else %}
+        {% assign found_page = site.pages | where: "path", item | first %}
+        {% assign title = found_page.title %}
+        {% assign path  = found_page.url %}
+      {% endif %}
+    {% endcapture %}
+
+    {% if path %}
+      <a class="item" data-title="{{ title }}" href="{{ path }}"></a>
+    {% endif %}
+  {% endif %}
+{% endfor %}

_layouts/basic.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html id="{{ page.cid }}" lang="en" class="{{ page.class }}">
+
+    {% include head.html %}
+
+    <body>
+        {% include header.html %}
+
+        {{ content }}
+
+        {% include footer.html %}
+
+        {% include footer-scripts.html %}
+    </body>
+</html>

_layouts/docwithnav.html

@@ -0,0 +1,79 @@
+{% for current_toc in site.tocs %}
+  {% if found_toc %}
+    {% break %}
+  {% else %}
+    {% assign toc=site.data[current_toc] %}
+    {% include tocsearch.html tree=toc.toc toc=toc %}
+  {% endif %}
+{% endfor %}
+
+<!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 == "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 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">
+    </div>
+  </div>
+</section>
+
+{% include deprecation-warning.html %}
+
+<section id="encyclopedia">
+  <div id="docsToc">
+        <div class="pi-accordion">
+          {% include_cached tree.html tree=toc.toc %}
+        </div> <!-- /pi-accordion -->
+    <button class="push-menu-close-button" onclick="kub.toggleToc()"></button>
+  </div> <!-- /docsToc -->
+
+  <div id="docsContent">
+        <p><a href="/editdocs#{{ page.path }}" id="editPageButton">Edit This Page</a></p>
+
+        {% unless page.notitle %}
+          <h1>{{ page.title }}</h1>
+        {% endunless %}
+
+        {{ content }}
+
+        <p><a href=""><img src="https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/{{ page.path }}?pixel" alt="Analytics" /></a></p>
+        {% if page.url != "/404.html" and page.url != "/docs/search/" %}
+        <script type="text/javascript">
+            PDRTJS_settings_8345992 = {
+                "id" : "8345992",
+                "unique_id" : "{{ page.url }}",
+                "title" : "{{ page.title }}",
+                "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/kubernetes.github.io/issues/new?title=Issue%20with%20' +
+        'k8s.io'+window.location.pathname)" class="button issue">Create an Issue</a>
+        <a href="/editdocs#{{ page.path }}" class="button issue">Edit this Page</a>
+    {% endif %}
+    </div>
+</section>
+
+{% include_cached footer.html %}
+{% include footer-scripts.html %}
+
+</body>
+</html>

_sass/_base.sass

@@ -292,7 +292,6 @@ ul.global-nav
 .flip-nav ul.global-nav li a .ui-icon
 	filter: brightness(0)
 
-
 .flip-nav ul.global-nav li ul li a,
 	background: #fff
 	color: $dark-grey
@@ -379,12 +378,12 @@ ul.global-nav
 		width: 100%
 		background-color: transparentize(white, 0.9)
 		content: ''
-
+	
 	&.no-sub
-
+		
 		h5
 			display: none
-
+		
 		h1
 			margin-bottom: 20px
 
@@ -478,12 +477,12 @@ footer
 		display: block
 		height: 0
 		overflow: hidden
-
+		
 	&.button
 		background-image: none
 		width: auto
 		height: auto
-
+		
 		&:hover
 			color: $blue
 
@@ -554,7 +553,7 @@ section
 		font-weight: bold
 
 	li + li
-		margin-left: 0
+		margin-left: 20px
 
 
 #docs
@@ -572,7 +571,7 @@ section
 			height: 44px
 			line-height: 44px
 			position: relative
-
+			
 			&:before
 				position: absolute
 				width: 15px
@@ -829,7 +828,7 @@ dd
 
 	h1,h2
 		border-bottom: 1px solid #cccccc
-
+		
 	h1
 		font-size: 32px
 		padding-right: 60px
@@ -975,7 +974,7 @@ dd
 		background-position: 12px 10px
 		background-size: 29px 29px
 
-	#markdown-toc, #TableOfContents
+	#markdown-toc
 		margin-bottom: 20px
 
 		ul, li
@@ -1003,18 +1002,13 @@ dd
 		//font-weight: 700
 		text-decoration: underline
 
-	#TableOfContents > ul > li { list-style: none; }
-	#TableOfContents
-		ul, li
-			list-style: disk
-
-//	a:visited
-//		color: blueviolet
+//  a:visited
+//      color: blueviolet
 
 	a.button
 		border-radius: 2px
 		text-decoration: none
-
+		
 		&:visited
 			color: white
 
@@ -1027,9 +1021,6 @@ dd
 
 #miceType
 	clear: both
-	font-size: 11px
-	line-height: 18px
-	color: #aaa
 
 
 html.search #docsContent
@@ -1133,7 +1124,7 @@ $feature-box-div-margin-bottom: 40px
 #video
 	width: 100%
 	position: relative
-	background-image: url(/images/kub_video_banner_box.jpg)
+	background-image: url(/images/kub_video_banner.jpg)
 	background-position: center center
 	background-size: cover
 
@@ -1143,8 +1134,10 @@ $feature-box-div-margin-bottom: 40px
 		position: absolute
 		top: 50%
 		left: 75%
-		width: 525px
-		padding-right: 80px
+		width: 50%
+		max-width: 600px
+		min-width: 500px
+		padding-right: 10%
 		transform: translate(-50%, -50%)
 		color: white
 
@@ -1156,14 +1149,6 @@ $feature-box-div-margin-bottom: 40px
 	p
 		margin-bottom: 20px
 
-	#desktopKCButton
-		position: relative
-		font-size: 18px
-		background-color: $dark-grey
-		border-radius: 8px
-		color: $white
-		padding: 20px 10px 20px 10px
-
 	#desktopShowVideoButton
 		position: relative
 		font-size: 24px
@@ -1171,7 +1156,6 @@ $feature-box-div-margin-bottom: 40px
 		border-radius: 8px
 		color: $blue
 		padding: 15px 30px 15px 80px
-		margin-bottom: 15px
 
 		&:before
 			content: ""
@@ -1347,7 +1331,7 @@ $feature-box-div-margin-bottom: 40px
 			height: 30vw
 			max-width: 1200px
 			max-height: 450px
-			margin: 20px auto
+			margin: 20px auto           
 
 		iframe
 			position: absolute
@@ -1429,7 +1413,7 @@ $feature-box-div-margin-bottom: 40px
 
 	h1,h2
 		border-bottom: 1px solid #cccccc
-
+		
 	h1
 		font-size: 32px
 		padding-right: 60px
@@ -1603,13 +1587,13 @@ $feature-box-div-margin-bottom: 40px
 		//font-weight: 700
 		text-decoration: underline
 
-//	a:visited
-//		color: blueviolet
+//  a:visited
+//      color: blueviolet
 
 	a.button
 		border-radius: 2px
 		text-decoration: none
-
+		
 		&:visited
 			color: white
 
@@ -1711,7 +1695,7 @@ $feature-box-div-margin-bottom: 40px
 	#talkToUs
 		main
 			padding: 30px 0
-
+		
 		h5
 			font-size: 20px
 
@@ -1720,7 +1704,7 @@ $feature-box-div-margin-bottom: 40px
 		position: relative
 		text-align: center
 		margin-bottom: 30px
-
+		
 		div
 			position: relative
 			display: inline-block
@@ -1743,10 +1727,10 @@ $feature-box-div-margin-bottom: 40px
 
 		div:nth-child(4)
 			background-image: url(/images/community_logos/wikimedia_foundation_logo.png)
-
+			
 		p
 			font-size: 20px
-
+			
 		a
 			position: absolute
 			bottom: 0
@@ -1755,16 +1739,20 @@ $feature-box-div-margin-bottom: 40px
 			color: $blue
 			font-weight: 400
 
-
-
-/* Google Search */
-.cse .gsc-control-cse, .gsc-control-cse
-	padding: 0;
-
-
-.gsc-control-cse table, .gsc-control-cse-en table
-	margin: 0px !important;
-
-
-.gsc-above-wrapper-area
-	border-bottom: 0;
+	
+	//#bigSocial
+	//  text-align: center
+	//  
+	//  div
+	//      display: inline-block
+	//      float: none
+	//      padding-top: 125px
+	//      width: calc(90%)
+	//      
+	//      a
+	//          margin-top: 15px
+	//          font-size: 18px
+	//
+	//
+	//
+//

_sass/_code-styles.sass

@@ -0,0 +1,199 @@
+/* Default gh-pages-blog css from https://github.com/thedereck/gh-pages-blog/blob/master/css/syntax.css */
+.highlight br
+	display: none
+
+.highlight
+	background: #ffffff
+
+.highlight .c
+	color: #999988
+	font-style: italic
+
+.highlight .err
+	color: #a61717
+	background-color: #e3d2d2
+
+.highlight .k
+	font-weight: bold
+
+.highlight .o
+	font-weight: bold
+
+.highlight .cm
+	color: #999988
+	font-style: italic
+
+.highlight .cp
+	color: #999999
+	font-weight: bold
+
+.highlight .c1
+	color: #999988
+	font-style: italic
+
+.highlight .cs
+	color: #999999
+	font-weight: bold
+	font-style: italic
+
+.highlight .gd
+	color: #000000
+	background-color: #ffdddd
+
+.highlight .gd .x
+	color: #000000
+	background-color: #ffaaaa
+
+.highlight .ge
+	font-style: italic
+
+.highlight .gr
+	color: #aa0000
+
+.highlight .gh
+	color: #999999
+
+.highlight .gi
+	color: #000000
+	background-color: #ddffdd
+
+.highlight .gi .x
+	color: #000000
+	background-color: #aaffaa
+
+.highlight .go
+	color: #888888
+
+.highlight .gp
+	color: #555555
+
+.highlight .gs
+	font-weight: bold
+
+.highlight .gu
+	color: #aaaaaa
+
+.highlight .gt
+	color: #aa0000
+
+.highlight .kc
+	font-weight: bold
+
+.highlight .kd
+	font-weight: bold
+
+.highlight .kp
+	font-weight: bold
+
+.highlight .kr
+	font-weight: bold
+
+.highlight .kt
+	color: #445588
+	font-weight: bold
+
+.highlight .m
+	color: #009999
+
+.highlight .s
+	color: #d14
+
+.highlight .na
+	color: #008080
+
+.highlight .nb
+	color: #0086B3
+
+.highlight .nc
+	color: #445588
+	font-weight: bold
+
+.highlight .no
+	color: #008080
+
+.highlight .ni
+	color: #800080
+
+.highlight .ne
+	color: #990000
+	font-weight: bold
+
+.highlight .nf
+	color: #990000
+	font-weight: bold
+
+.highlight .nn
+	color: #555555
+
+.highlight .nt
+	color: #000080
+
+.highlight .nv
+	color: #008080
+
+.highlight .ow
+	font-weight: bold
+
+.highlight .w
+	color: #bbbbbb
+
+.highlight .mf
+	color: #009999
+
+.highlight .mh
+	color: #009999
+
+.highlight .mi
+	color: #009999
+
+.highlight .mo
+	color: #009999
+
+.highlight .sb
+	color: #d14
+
+.highlight .sc
+	color: #d14
+
+.highlight .sd
+	color: #d14
+
+.highlight .s2
+	color: #d14
+
+.highlight .se
+	color: #d14
+
+.highlight .sh
+	color: #d14
+
+.highlight .si
+	color: #d14
+
+.highlight .sx
+	color: #d14
+
+.highlight .sr
+	color: #009926
+
+.highlight .s1
+	color: #d14
+
+.highlight .ss
+	color: #990073
+
+.highlight .bp
+	color: #999999
+
+.highlight .vc
+	color: #008080
+
+.highlight .vg
+	color: #008080
+
+.highlight .vi
+	color: #008080
+
+.highlight .il
+	color: #009999
+

_sass/_desktop.sass

@@ -49,7 +49,7 @@ $video-section-height: 550px
 
 				#searchBox
 					float: right
-					width: 250px
+					width: 320px
 
 				#search
 					vertical-align: middle
@@ -97,15 +97,12 @@ $video-section-height: 550px
 	section, header, footer
 		main
 			max-width: $main-max-width
-
+	
 	header, #vendorStrip, #encyclopedia, #hero h1, #hero h5, #docs #hero h1, #docs #hero h5,
 	#community #hero h1, .gridPage #hero h1, #community #hero h5, .gridPage #hero h5
 		padding-left: 100px
 		padding-right: 100px
 
-	#vendorStrip
-		padding-right: 10px
-
 	#home
 		section, header, footer
 			main
@@ -138,7 +135,7 @@ $video-section-height: 550px
 	#video
 		height: $video-section-height
 		position: relative
-		background-image: url(../images/kub_video_banner_box.jpg)
+		background-image: url(../images/kub_video_banner.jpg)
 		background-position: center center
 		background-size: cover
 
@@ -299,7 +296,7 @@ $video-section-height: 550px
 			width: auto
 			background-color: $blue
 			padding: 0 20px
-
+			
 
 
 
@@ -312,12 +309,3 @@ $video-section-height: 550px
 		div
 			width: 24%
 			min-height: 260px
-
-@media screen and (min-width: 1300px)
-	#vendorStrip
-		padding-right: 100px
-
-@media screen and (min-width: 456px)
-	#vendorStrip
-		li + li
-			margin-left: 20px

archetypes/default.md

@@ -1,6 +0,0 @@
----
-title: "{{ replace .Name "-" " " | title }}"
-date: {{ .Date }}
-draft: true
----
-

case-studies/index.html

@@ -0,0 +1,99 @@
+---
+title: Case Studies
+layout: basic
+class: gridPage
+cid: caseStudies
+---
+
+<section id="hero" class="light-text">
+    <h1>Kubernetes User Case Studies</h1>
+    <h5>A collection of users running Kubernetes in production.</h5>
+</section>
+
+<section id="mainContent">
+    <main>
+        <div class="content">
+            <div class="case-studies">
+                <div class="case-study">
+                    <img src="/images/case_studies/pearson.png" alt="Pearson">
+                    <p class="quote">"We chose Kubernetes because of its flexibility, ease of management and the way it improves our engineers' productivity."</p>
+                    <!--<p class="attrib">— Chris Jackson, Director for Cloud Product Engineering, Pearson</p>-->
+                    <a href="./pearson/">Read about Pearson</a>
+                </div>
+                <div class="case-study">
+                    <img src="/images/case_studies/wikimedia.png" alt="Wikimedia">
+                    <p class="quote">"With Kubernetes, we're simplifying our environment and making it easier for developers to build the tools that make wikis run better."</p>
+                    <!--<p class="attrib">— Yuvi Panda, Operations Engineer, Wikimedia Foundation</p>-->
+                    <a href="./wikimedia/">Read about Wikimedia</a>
+                </div>
+                <div class="case-study">
+                    <img src="/images/case_studies/ebay.png" alt="eBay">
+                    <p class="quote">Inside eBay's shift to Kubernetes and containers atop OpenStack</p>
+                    <a href="http://www.nextplatform.com/2015/11/12/inside-ebays-shift-to-kubernetes-and-containers-atop-openstack/">Read about eBay</a>
+                </div>
+                <div class="case-study">
+                    <img src="/images/case_studies/box.png" alt="box">
+                    <p class="quote">Kubernetes at Box: Microservices at Maximum Velocity</p>
+                    <a href="https://blog.box.com/blog/kubernetes-box-microservices-maximum-velocity/">Read about Box</a>
+                </div>
+            </div>
+        </div>
+    </main>
+</section>
+
+<section id="video">
+    <main>
+        <!--<div>-->
+            <!--<h3>"I don't want to deploy software the old way ever again"</h3>-->
+            <!--<p class="attrib">— Dylan Carney, Lead Software Engineer, Zulily</p>-->
+            <!--<img src="/images/case_studies/zulily.png" id="zulilyLogo" alt="zulily">-->
+        <!--</div>-->
+        <!--<div><button onclick="kub.showVideo()"><img src="/images/case_studies/video_thumb.jpg" alt="Zulily video"><h6>Kubernetes at zulily</h6></button></div>-->
+        <div>
+            <!--<h3>SAP</h3>-->
+            <h3>SAP's OpenStack, running on Kubernetes in production</h3>
+            <img src="/images/case_studies/sap_small.png" id="zulilyLogo" alt="SAP">
+        </div>
+        <div><button onclick="kub.showVideo()"><img src="/images/case_studies/video_thumb1.png" alt="SAP video"><h6>Kubernetes at SAP</h6></button></div>
+    </main>
+</section>
+
+<section id="users">
+    <main>
+        <h3>Kubernetes Users</h3>
+        <div id="usersGrid">
+            <a target="_blank" href="https://www.youtube.com/watch?v=P5qfyv_zGcU"><img src="/images/case_studies/nyt.png" alt="New York Times"></a>
+            <a target="_blank" href="https://openai.com/blog/infrastructure-for-deep-learning"><img src="/images/case_studies/openai.png" alt="OpenAI"></a>
+            <a target="_blank" href="http://blogs.wsj.com/cio/2016/02/24/big-changes-in-goldmans-software-emerge-from-small-containers/"><img src="/images/case_studies/gs.png" alt="Goldman Sachs"></a>
+            <a target="_blank" href="https://youtu.be/4gyeixJLabo"><img src="/images/case_studies/sap.png" alt="SAP"></a>
+            <a target="_blank" href="http://www.nextplatform.com/2016/05/24/samsung-experts-put-kubernetes-paces/"><img src="/images/case_studies/sds.png" alt="Samsung SDS"></a>
+            <a target="_blank" href="http://thenewstack.io/wepay-kubernetes-changed-business/"><img src="/images/case_studies/wepay.png" alt="WePay"></a>
+            <a target="_blank" href="https://www.youtube.com/watch?v=5378N5iLb2Q"><img src="/images/case_studies/soundcloud.png" alt="SoundCloud"></a>
+            <a target="_blank" href="https://www.youtube.com/watch?v=F3iMkz_NSvU"><img src="/images/case_studies/homeoffice.png" alt="UK Home Office"></a>
+            <a target="_blank" href="http://searchitoperations.techtarget.com/news/450297178/Tech-firms-roll-out-Kubernetes-in-production"><img src="/images/case_studies/concur.png" alt="Concur"></a>
+            <a target="_blank" href="http://www.nextplatform.com/2015/08/04/amadeus-takes-off-with-containers-and-clouds/"><img src="/images/case_studies/amadeus.png" alt="Amadeus"></a>
+            <a target="_blank" href="http://superuser.openstack.org/articles/how-ancestry-com-s-open-source-strategy-combines-kubernetes-and-openstack"><img src="/images/case_studies/ancestry.png" alt="Ancestry.com"></a>
+            <a target="_blank" href="https://cloud.google.com/customers/ccp-games/"><img src="/images/case_studies/ccp.png" alt="CCP Games"></a>
+            <a target="_blank" href="https://www.openstack.org/videos/video/running-kubernetes-on-openstack-at-liveperson"><img src="/images/case_studies/liveperson.png" alt="LivePerson"></a>
+            <a target="_blank" href="https://youtu.be/YkOY7DgXKyw"><img src="/images/case_studies/monzo_logo.png" alt="monzo"></a>
+            <a target="_blank" href="https://blog.box.com/blog/kubernetes-box-microservices-maximum-velocity/"><img src="/images/case_studies/box_logo.png" alt="Box"></a>
+            <a target="_blank" href="https://cloudplatform.googleblog.com/2016/09/bringing-Pokemon-GO-to-life-on-Google-Cloud.html"><img src="/images/case_studies/pokemon_go_logo.png" alt="Pokemon GO"></a>
+            <a target="_blank" href="http://blog.kubernetes.io/2016/10/kubernetes-and-openstack-at-yahoo-japan.html"><img src="/images/case_studies/yahooJapan_logo.png" alt="Yahoo! Japan"></a>
+            <a target="_blank" href="https://cloud.google.com/customers/philips/"><img src="/images/case_studies/philips_logo.png" alt="Philips"></a>
+            <a target="_blank" href="https://youtu.be/EC_ZRLsw58M"><img src="/images/case_studies/buffer_logo.png" alt="buffer"></a>
+            <a target="_blank" href="https://youtu.be/lmeFkH-rHII"><img src="/images/case_studies/comcast_logo.png" alt="Comcast"></a>
+            <a href="./wikimedia/"><img src="/images/case_studies/wikimedia_logo.png" alt="Wikimedia"></a>
+            <a href="./pearson/"><img src="/images/case_studies/pearson_logo.png" alt="Pearson"></a>
+            <a target="_blank" href="#" onclick="event.preventDefault(); kub.showVideo()"><img src="/images/case_studies/zulily_logo.png" alt="zulily"></a>
+            <a target="_blank" href="http://www.nextplatform.com/2015/11/12/inside-ebays-shift-to-kubernetes-and-containers-atop-openstack/"><img src="/images/case_studies/ebay_logo.png" alt="Ebay"></a>
+            <a target="_blank" href="https://docs.google.com/a/google.com/forms/d/e/1FAIpQLScuI7Ye3VQHQTwBASrgkjQDSS5TP0g3AXfFhwSM9YpHgxRKFA/viewform" class="tell-your-story"><img src="/images/case_studies/story.png" alt="Tell your story"></a>
+        </div>
+    </main>
+</section>
+
+
+<div id="videoPlayer">
+    <!--<iframe data-url="https://www.youtube.com/watch?v=B0_5Nms8sD0" frameborder="0" allowfullscreen></iframe>-->
+    <iframe data-url="https://www.youtube.com/embed/4gyeixJLabo?autoplay=1" frameborder="0" allowfullscreen="true"></iframe>
+    <button id="closeButton"></button>
+</div>

case-studies/pearson.html

@@ -1,6 +1,6 @@
 ---
 title: Pearson Case Study
-
+layout: basic
 class: gridPage
 cid: caseStudies
 ---
@@ -31,13 +31,13 @@ cid: caseStudies
             <div class="bullet">
                 <h4>Challenges:</h4>
                 <ul>
-                    <li>Pearson had difficulty in scaling and adapting to the growing online audience. They wanted to build and deliver content primarily over the web.</li>
+                    <li>Pearson had difficulty in scaling and adapting to the growing online audience. They wanted to build and deliver content primarily over the web.</li>
                 </ul>
             </div>
             <div class="bullet">
                 <h4>Why Kubernetes:</h4>
                 <ul>
-                    <li>Kubernetes will allow Pearson's teams to develop their apps in a consistent manner, saving time and minimizing complexity.</li>
+                    <li>Kubernetes will allow Pearson's teams to develop their apps in a consistent manner, saving time and minimizing complexity.</li>
                 </ul>
             </div>
             <div class="bullet">

case-studies/wikimedia.html

@@ -1,6 +1,6 @@
 ---
 title: Wikimedia Case Study
-
+layout: basic
 class: gridPage
 cid: caseStudies
 ---

cn/README.md

@@ -0,0 +1,18 @@
+## 如何参与 Kubernetes 文档汉化工作
+
+我们非常欢迎，非常希望您参与 Kubernetes 文档汉化做出贡献。
+
+您可以单击屏幕右上角的 **Fork** 按钮，在您的 Github 账户中创建一外名为 *fork* 的存储库副本。在您的分支中进行更改，当您准备好将这些更改发送给我们时，请转到您的仓库创建新的 pull 请求，让我们知道这一点。
+
+关于更多的贡献信息，请参阅:
+
+* [贡献于 Kubernetes 文档](http://kubernetes.io/editdocs/)
+* [创建文档拉取请求](http://kubernetes.io/docs/contribute/create-pull-request/)
+* [写一个新的话题](http://kubernetes.io/docs/contribute/write-new-topic/)
+* [暂停您的文档更改](http://kubernetes.io/docs/contribute/stage-documentation-changes/)
+* [更用页面模板](http://kubernetes.io/docs/contribute/page-templates/)
+* [文档样式指南](http://kubernetes.io/docs/contribute/style-guide/)
+
+## 谢谢您!
+
+Kubernetes 在社区参与中茁壮成长，我们非常感谢您对我们的网站和文档的贡献！

cn/_includes/user-guide-content-moved.md

@@ -0,0 +1,2 @@
+Kubernetes 文档的 [用户指南](/docs/user-guide/) 部分中的主题将被移动到 [任务](/docs/tasks/)、[教程](/docs/tutorials/)和
+[概念](/docs/concepts) 部分。 本主题的内容已转移到:

cn/docs/concepts/overview/what-is-kubernetes.md

@@ -0,0 +1,119 @@
+---
+assignees:
+- k8s-merge-robot
+
+title: 认识 Kubernetes?
+---
+
+Kubernetes 是一个 [开源的容器调度平台，它可以自动化应用容器的部署、扩展和操作](http://www.slideshare.net/BrianGrant11/wso2con-us-2015-kubernetes-a-platform-for-automating-deployment-scaling-and-operations) 可以跨主机集群, 提供以容器为中心的基础架构。
+
+使用 Kubernetes, 您可以快速高效地响应客户需求:
+
+ - 快速、可预测地部署您的应用程序
+ - 拥有即时扩展应用程序的能力
+ - 不影响现有业务的情况下，无缝地发布新功能。
+ - 优化您的硬件资源，降低您的拥有成本
+
+我们的目标是构建一个软件和工具的生态系统，以减轻您在公共云或私有云运行应用程序的负担。
+
+#### Kubernetes 具有如下特点:
+
+* **便携性**: 无论公有云、私有云、混合云还是多云架构都全面支持
+* **可扩展**: 它是模块化、可插拔、可挂载、可组合的，支持各种形式的扩展
+* **自修复**: 它可以自保持应用状态、可自重启、自复制、自缩放的，通过声明式语法提供了强大的自修复能力
+
+Kubernetes 项目由 Google 公司在 2014 年启动。Kubernetes 建立在 [Google 公司超过十余年的运维经验基础之上，Google 所有的应用都运行在容器上](https://research.google.com/pubs/pub43438.html), 再与社区中最好的想法和实践相结合，也许它是最受欢迎的容器平台。
+
+##### 准备好 [开始](/docs/getting-started-guides/)?
+
+## 为什么是容器?
+
+查看此文，可以了解为什么您要使用容器 [容器](http://aucouranton.com/2014/06/13/linux-containers-parallels-lxc-openvz-docker-and-more/)?
+
+![为什么是容器?](/images/docs/why_containers.svg)
+
+*传统* 部署应用程序的方式，一般是使用操作系统自带的包管理器在主机上安装应用依赖，之后再安装应用程序。这无疑将应用程序的可执行文件、应用的配置、应用依赖库和应用的生命周期与宿主机操作系统进行了紧耦合。在此情境下，可以通过构建不可改变的虚拟机镜像版本，通过镜像版本实现可预测的发布和回滚，但是虚拟机实在是太重量级了，且镜像体积太庞大，便捷性差。
+
+*新方式* 是基于操作系统级虚拟化而不是硬件级虚拟化方法来部署容器。容器之间彼此隔离并与主机隔离：它们具有自己的文件系统，不能看到彼此的进程，并且它们所使用的计算资源是可以被限制的。它们比虚拟机更容易构建，并且因为它们与底层基础架构和主机文件系统隔离，所以它们可以跨云和操作系统快速分发。
+
+由于容器体积小且启动快，因此可以在每个容器镜像中打包一个应用程序。这种一对一的应用镜像关系拥有很多好处。使用容器，不需要与外部的基础架构环境绑定, 因为每一个应用程序不需要外部依赖，更不需要与外部的基础架构环境依赖。完美解决了从开发到生产环境的一致性问题。
+
+类似地，容器比虚拟机更加透明，这有助于监测和管理。真实的情况是，容器进程的生命周期由基础设施管理，而容器内的进程对外是隐藏的。最后，每个应用程序用容器封装，管理容器部署就等同于管理应用程序部署。
+
+容器好处摘要:
+
+* **敏捷的应用程序创建和部署**:
+    与虚拟机镜像相比，容器镜像更容易创建，提升了硬件的使用效率。
+* **持续开发、集成和部署**:
+    提供可靠与频繁的容器镜像构建和部署，可以很方便及快速的回滚 (由于镜像不可变性).
+* **关注开发与运维的分离**:
+    在构建/发布时创建应用程序容器镜像，从而将应用程序与基础架构分离。
+* **开发、测试和生产环境的一致性**:
+    在笔记本电脑上运行与云中一样。
+* **云和操作系统的可移植性**:
+    可运行在 Ubuntu, RHEL, CoreOS, 内部部署, Google 容器引擎和其他任何地方。
+* **以应用为中心的管理**:
+    提升了操作系统的抽象级别，以便在使用逻辑资源的操作系统上运行应用程序。
+* **松耦合、分布式、弹性伸缩 [微服务](http://martinfowler.com/articles/microservices.html)**:
+    应用程序被分成更小，更独立的部分，可以动态部署和管理 - 而不是巨型单体应用运行在专用的大型机。
+* **资源隔离**:
+    通过对应用进行资源隔离，可以很容易的预测应用程序性能。
+* **资源利用**:
+    高效率和高密度。
+
+#### 为什么我们需要 Kubernetes，它能做什么?
+
+最基础的，Kubernetes 可以在物理或虚拟机集群上调度和运行应用程序容器。然而，Kubernetes 还允许开发人员从物理和虚拟机'脱离'，从以**主机为中心**的基础架构转移到以**容器为中心**的基础架构，这样可以提供容器固有的全部优点和益处。Kubernetes 提供了基础设施来构建一个真正以**容器为中心**的开发环境。
+
+Kubernetes 满足了生产中运行应用程序的许多常见的需求，例如：
+
+* [Pod](/docs/user-guide/pods/) 提供复合应用并保留一个应用一个容器的容器模型,
+* [挂载外部存储](/docs/user-guide/volumes/),
+* [Secret管理](/docs/user-guide/secrets/),
+* [应用健康检查](/docs/user-guide/production-pods/#liveness-and-readiness-probes-aka-health-checks),
+* [副本应用实例](/docs/user-guide/replication-controller/),
+* [横向自动扩缩容](/docs/user-guide/horizontal-pod-autoscaling/),
+* [服务发现](/docs/user-guide/connecting-applications/),
+* [负载均衡](/docs/user-guide/services/),
+* [滚动更新](/docs/user-guide/update-demo/),
+* [资源监测](/docs/user-guide/monitoring/),
+* [日志采集和存储](/docs/user-guide/logging/overview/),
+* [支持自检和调试](/docs/user-guide/introspection-and-debugging/),
+* [认证和鉴权](/docs/admin/authorization/).
+
+这提供了平台即服务 (PAAS) 的简单性以及基础架构即服务 (IAAS) 的灵活性，并促进跨基础设施供应商的可移植性。
+
+有关详细信息，请参阅 [用户指南](/docs/user-guide/).
+
+#### 为什么 Kubernetes 是一个平台?
+
+Kubernetes 提供了很多的功能，总会有新的场景会受益于新特性。它可以简化应用程序的工作流，加快开发速度。被大家认可的应用编排通常需要有较强的自动化能力。这就是为什么 Kubernetes 被设计作为构建组件和工具的生态系统平台，以便更轻松地部署、扩展和管理应用程序。
+
+[Label](/docs/user-guide/labels/) 允许用户按照自己的方式组织管理对应的资源。 [注解](/docs/user-guide/annotations/) 使用户能够以自定义的描述信息来修饰资源，以适用于自己的工作流，并为管理工具提供检查点状态的简单方法。
+
+此外，[Kubernetes 控制面](/docs/admin/cluster-components) 是构建在相同的 [APIs](/docs/api/) 上面，开发员人和用户都可以用。用户可以编写自己的控制器， [调度器](https://git.k8s.io/community/contributors/devel/scheduler.md)等等，如果这么做，根据新加的[自定义 API](https://git.k8s.io/community/contributors/design-proposals/extending-api.md) ，可以扩展当前的通用 [CLI 命令行工具](/docs/user-guide/kubectl-overview/)。
+
+这种 [设计](https://git.k8s.io/community/contributors/design-proposals/principles.md) 使得许多其他系统可以构建在 Kubernetes 之上。
+
+#### Kubernetes 不是什么:
+
+Kubernetes 不是一个传统意义上，包罗万象的 PaaS (平台即服务) 系统。我们保留用户选择的自由，这非常重要。
+
+* Kubernetes 不限制支持的应用程序类型。 它不插手应用程序框架 (例如 [Wildfly](http://wildfly.org/)), 不限制支持的语言运行时 (例如 Java, Python, Ruby)，只迎合符合 [12种因素的应用程序](http://12factor.net/)，也不区分"应用程序"与"服务"。Kubernetes 旨在支持极其多样化的工作负载，包括无状态、有状态和数据处理工作负载。如果应用可以在容器中运行，它就可以在 Kubernetes 上运行。
+* Kubernetes 不提供作为内置服务的中间件 (例如 消息中间件)、数据处理框架 (例如 Spark)、数据库 (例如 mysql)或集群存储系统 (例如 Ceph)。这些应用可以运行在 Kubernetes 上。
+* Kubernetes 没有提供点击即部署的服务市场
+* Kubernetes 从源代码到镜像都是非垄断的。 它不部署源代码且不构建您的应用程序。 持续集成 (CI) 工作流是一个不同用户和项目都有自己需求和偏好的领域。 所以我们支持在 Kubernetes 分层的 CI 工作流，但不指定它应该如何工作。
+* Kubernetes 允许用户选择其他的日志记录，监控和告警系统 (虽然我们提供一些集成作为概念验证)
+* Kubernetes 不提供或授权一个全面的应用程序配置语言/系统 (例如 [jsonnet](https://github.com/google/jsonnet)).
+* Kubernetes 不提供也不采用任何全面机器配置、保养、管理或自我修复系统
+
+另一方面，许多 PaaS 系统*运行*在 Kubernetes 上面，例如  [Openshift](https://github.com/openshift/origin), [Deis](http://deis.io/), and [Eldarion](http://eldarion.cloud/)。 您也可以自定义您自己的 PaaS, 与您选择的 CI 系统集成，或与 Kubernetes 一起使用: 将您的容器镜像部署到 Kubernetes。
+
+由于 Kubernetes 在应用级别而不仅仅在硬件级别上运行，因此它提供 PaaS 产品通用的一些功能，例如部署、扩展、负载均衡、日志记录、监控等。但是，Kubernetes 不是单一的，默认解决方案是可选和可插拔的。
+
+此处，Kubernetes 不仅仅是一个 "编排系统"；它消除了编排的需要。 "编排"技术定义的是工作流的执行: 从 A 到 B，然后到 C。相反，Kubernetes 是包括一套独立、可组合的控制过程，通过声明式语法使其连续地朝着期望状态驱动当前状态。 不需要告诉它具体从 A 到 C 的过程，只要告诉到 C 的状态即可。 也不需要集中控制；该方法更类似于"编舞"。这使得系统更容易使用并且更强大、更可靠、更具弹性和可扩展性。
+
+#### *Kubernetes* 是什么意思? K8s?
+
+名称 **Kubernetes** 源于希腊语，意为 "舵手" 或 "飞行员"， 且是英文 "governor" 和 ["cybernetic"](http://www.etymonline.com/index.php?term=cybernetics)的词根。 **K8s** 是通过将 8 个字母 "ubernete" 替换为 8 而导出的缩写。另外，在中文里，k8s 的发音与 Kubernetes 的发音比较接近。
+

cn/docs/tutorials/kubernetes-basics/cluster-interactive.html

@@ -0,0 +1,35 @@
+---
+title: 交互式教程 - 创建集群
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                To interact with the Terminal, please use the desktop/tablet version
+            </div>
+            <div class="katacoda__box" id="inline-terminal-1"  data-katacoda-id="kubernetes-bootcamp/1" data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false" data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab" data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;"></div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/deploy-intro/" role="button">Continue to Module 2<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/cluster-intro.html

@@ -0,0 +1,110 @@
+---
+redirect_from:
+- "/docs/tutorials/getting-started/create-cluster/"
+- "/docs/tutorials/getting-started/create-cluster.html"
+title: 使用 Minikube 创建一个集群
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+	<main class="content">
+
+		<div class="row">
+
+      <div class="col-md-8">
+      	<h3>目标</h3>
+				<ul>
+					<li>了解什么是 Kubernetes 集群</li>
+					<li>了解什么是 Minikube</li>
+					<li>使用在线终端启动 Kubernetes 集群</li>
+				</ul>
+			</div>
+
+			<div class="col-md-8">
+				<h3>Kubernetes 集群</h3>
+				<p>
+				<b>Kubernetes 用于协调高度可用的计算机集群，这些计算机群集被连接作为单个单元工作。</b> Kubernetes 中的抽象允许您将容器化的应用程序部署到集群，而不必专门将其绑定到单个计算机。为了利用这种新的部署模型，应用程序需要以将它们与各个主机分离的方式打包: 它们需要被容器化。容器化应用程序比过去的部署模型更灵活和可用，其中应用程序直接安装到特定机器上，作为深入集成到主机中的软件包。 <b>Kubernetes 以更有效的方式自动化、跨集群的容器应用程序的分发和调度。</b> Kubernetes 是一个 <a href="https://github.com/kubernetes/kubernetes">开源</a> 平台，为生产环境准备的。
+				</p>
+				<p>Kubernetes 集群由两种类型的资源组成:
+					<ul>
+			            <li>一个 <b>Master</b> 调度节点</li>
+			            <li><b>Nodes</b> 应用程序实际运行的地方</li>
+			        </ul>
+			    </p>
+			</div>
+
+			<div class="col-md-4">
+				<div class="content__box content__box_lined">
+					<h3>概要:</h3>
+					<ul>
+						<li>Kubernetes 集群</li>
+						<li>Minikube</li>
+					</ul>
+				</div>
+				<div class="content__box content__box_fill">
+					<p><i>
+						Kubernetes 是一个生产级的开源平台，用于协调计算机集群内部和跨计算机集群的应用程序容器的分发(调度)和运行。
+					</i></p>
+				</div>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h2 style="color: #3771e3;">集群图</h2>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg"></p>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><b>Master 负责管理集群。</b> master 协调集群中的所有活动，例如调度应用程序、维护应用程序的所需状态、扩展应用程序和滚动更新。</p>
+				<p><b>node 是 Kubernetes 集群中的工作机器，可以是物理机或虚拟机。</b> 每个工作节点都有一个 Kubelet，它是管理 node 并与 Kubernetes Master 节点进行通信的代理。node 上还应具有处理容器操作的工作，例如 <a href="https://www.docker.com/">Docker</a> 或 <a href="https://coreos.com/rkt/">rkt</a>。一个 Kubernetes 工作集群至少有三个 node 节点。</p>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_fill">
+					<p><i> Master 管理集群和 Nodes 用于托管正在运行的应用程序。  </i></p>
+				</div>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p>当您在 Kubernetes 上部署应用程序时，您可以告诉 master 启动应用程序容器。Master 调度容器在集群的 Node 上运行。<b> Nodes 使用 Master 公开的 Kubernetes API 与 Master 通信</b>。最终用户还可以直接使用 Kubernetes 的 API 与集群交互。</p>
+
+				<p>Kubernetes 集群可以部署在物理机或虚拟机上。要开始使用 Kubernetes 开发，您可以使用 <a href="https://github.com/kubernetes/minikube">Minikube</a>。Minikube 是一个轻量级的 Kubernetes 实现，在本机创建一台虚拟机，并部署一个只包含一个节点的简单集群。 Minikube 适用于 Linux, Mac OS 和 Windows 系统。Minikube CLI 提供了集群的基本引导操作，包括启动、停止、状态和删除。但是，对于此基础训练，您将使用预先安装了 Minikube 的在线终端。</p>
+
+				<p>现在您已经知道 Kubernetes 是什么，让我们使用在线教程，开始我们的第一个集群!</p>
+
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-12">
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/cluster-interactive/" role="button">启动交互教程 <span class="btn__next">›</span></a>
+			</div>
+		</div>
+
+	</main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/deploy-interactive.html

@@ -0,0 +1,39 @@
+---
+title: 交互式教程 - 部署应用程序
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <br>
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                To interact with the Terminal, please use the desktop/tablet version
+            </div>
+
+            <div class="katacoda__box" id="inline-terminal-1"  data-katacoda-id="kubernetes-bootcamp/7" data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false" data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab" data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/explore-intro/" role="button">Continue to Module 3<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/deploy-intro.html

@@ -0,0 +1,108 @@
+---
+title: 使用 kubectl 创建部署
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+	<main class="content">
+
+		<div class="row">
+
+		 <div class="col-md-8">
+      	<h3>目标</h3>
+				<ul>
+					<li>了解应用程序部署</li>
+					<li>使用 kubectl 在 Kubernetes 上部署您的第一个应用程序</li>
+				</ul>
+			</div>
+
+			<div class="col-md-8">
+				<h3>Kubernetes 部署</h3>
+				<p>
+				一旦运行了 Kubernetes 集群，您可以在其上部署容器化应用程序。为此，您可以创建一个 Kubernetes <b>Deployment</b>。Deployment 负责创建和更新应用程序实例。创建 Deployment 后， Kubernetes master 会将 Deployment 创建的应用程序实例调度到集群中的各个节点。
+				</p>
+
+				<p>创建应用程序实例后，Kubernetes Deployment 控制器会持续监视这些实例。如果托管它的节点不可用或删除，则 Deployment 控制器将替换实例。 <b>这提供了一种解决机器故障或维护的自愈机制。</b></p>
+
+				<p>在编排前的世界中，通常会使用安装脚本启动应用程序，但是它们并不能从机器故障中恢复。通过创建应用程序实例并使其运行在跨节点的机器之间，Kubernetes Deployments 提供了截然不同的应用管理方法。 </p>
+
+			</div>
+
+			<div class="col-md-4">
+				<div class="content__box content__box_lined">
+					<h3>概要:</h3>
+					<ul>
+						<li>Deployments</li>
+						<li>Kubectl</li>
+					</ul>
+				</div>
+				<div class="content__box content__box_fill">
+					<p><i>
+						Deployment 负责创建和更新应用程序的实例
+					</i></p>
+				</div>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h2 style="color: #3771e3;">在 Kubernetes 上部署您的第一个应用程序</h2>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_02_first_app.svg"></p>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+
+                <p>您可以使用 Kubernetes 命令行工具 <b>Kubectl</b>创建和管理 Deployment。Kubectl 使用 Kubernetes API 与集群进行交互。在本模块中，您将学习在 Kubernetes 集群上运行应用程序部署所需的最常见 Kubectl 命令。</p>
+
+				<p>创建部署时，您需要为应用程序指定容器镜像以及要运行的副本数。您可以稍后通过更新部署来更改该信息；模块 <a href="/docs/tutorials/kubernetes-basics/scale-intro/">5</a> 和 <a href="/docs/tutorials/kubernetes-basics/update-intro/">6</a> 是一个基础训练讨论如何扩展和更新您的部署。</p>
+
+
+
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_fill">
+					<p><i> 应用程序需要打包成支持的容器格式之一，以便部署在 Kubernetes 上。</i></p>
+				</div>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p>对于我们的第一个部署，我们将使用 <a href="https://nodejs.org">Node.js</a> 应用程序打包到 Docker 容器。源代码和 Dockerfile 可在 Kubernetes Bootcamp <a href="https://github.com/kubernetes/kubernetes-bootcamp">GitHub 存储库</a> 中找到。</p>
+
+				<p>现在您已经知道部署是什么，我来再来看看在线教程，并部署我们的第一个应用程序!</p>
+
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-12">
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/deploy-interactive/" role="button">启动交互式教程 <span class="btn__next">›</span></a>
+			</div>
+		</div>
+
+	</main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/explore-interactive.html

@@ -0,0 +1,39 @@
+---
+title: 交互式教程 - 应用程序探索
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <br>
+        <div class="katacoda">
+
+            <div class="katacoda__alert">
+                To interact with the Terminal, please use the desktop/tablet version
+            </div>
+
+            <div class="katacoda__box" id="inline-terminal-1"  data-katacoda-id="kubernetes-bootcamp/4" data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false" data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab" data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/expose-intro/" role="button">Continue to Module 4<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/explore-intro.html

@@ -0,0 +1,142 @@
+---
+title: 查看 Pods 和 Nodes
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+
+<div class="layout" id="top">
+
+	<main class="content">
+
+		<div class="row">
+
+     <div class="col-md-8">
+      	<h3>目标</h3>
+				<ul>
+					<li>了解 Kubernetes Pods</li>
+					<li>了解 Kubernetes Nodes</li>
+					<li>已部署应用故障排除</li>
+				</ul>
+			</div>
+
+			<div class="col-md-8">
+				<h2>Kubernetes Pods</h2>
+				<p>当您在模块 <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>中创建部署时，Kubernetes 创建了一个 <b>Pod</b> 来托管您的应用程序实例。Pod 是一个 Kubernetes 的资源抽象，表示一个或多个应用容器 (例如 Docker 或 rkt) 组，以及一些用于这些容器的共享资源。这些资源包括:</p>
+				<ul>
+					<li>共享存储，如卷</li>
+					<li>网络，作为唯一的集群 IP 地址</li>
+					<li>每个容器如何运行的信息，例如容器镜像版本或要使用的特定端口</li>
+				</ul>
+				<p>Pod 模型可以理解为应用程序特定的 "逻辑主机"，并且可以包含相对紧密耦合的不同应用程序容器。例如，Pod 可能包含带有 Node.js 应用程序的容器以及用于提供要由 Node.js Web 服务器发布数据的不同容器。Pod 中的容器共享 IP 地址和端口空间，始终位于同一位置并且统一调度，并在相同的节点上运行，共享上下文环境。</p>
+
+			<p>Pods 是 Kubernetes 平台上的原子单元。当我们在 Kubernetes 上创建一个部署时，该部署将在其中创建包含容器的 Pod (而不是直接创建容器)。每个 Pod 绑定到它被调度的节点，并且保持在那里，直到终止 (根据重启策略) 或删除。在节点故障的情况下，在集群中的其他可用节点上调度相同的 Pod。</p>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_lined">
+					<h3>概要:</h3>
+					<ul>
+						<li>Pods</li>
+						<li>Nodes</li>
+						<li>Kubectl 主要命令</li>
+					</ul>
+				</div>
+				<div class="content__box content__box_fill">
+						<p><i>
+							Pod 是一组或多个应用程序容器 (例如 Docker 或 rkt)，包含共享存储 (卷)，IP 地址以及有关如何运行它们的信息。
+						</i></p>
+				</div>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h2 style="color: #3771e3;">Pods 概览</h2>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_03_pods.svg"></p>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h2>Nodes</h2>
+				<p>Pod 总是运行在 <b>Node</b>上。Node 是 Kubernetes 的工作机器，可以是一个虚拟机或物理，这取决于在集群的安装情况。每个 Node 由 Master 管理。一个 Node 上可以有多个 Pod, Kubernetes master 会自动处理调度集群各个 Node 上的 Pod。 Master 在自动调度时，会考虑每个 Node 上的可用资源。</p>
+
+				<p>每个 Kubernetes Node 节点至少运行以下组件:</p>
+				<ul>
+					<li>Kubelet 是负责 Kubernetes Master 和 所有 Node 节点之间通信的进程，它管理机器上运行的 Pod 和容器。</li>
+					<li>容器运行时(例如 Docker, rkt) 负责从镜像仓库中拉取容器镜像，解包容器并运行应用程序。</li>
+				</ul>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_fill">
+					<p><i> 如果一些容器强耦合并且需要共享资源(例如 磁盘)，那么这些容器应该放到单个 Pod 中一起调度。 </i></p>
+				</div>
+			</div>
+		</div>
+
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h2 style="color: #3771e3;">Node 概述</h2>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_03_nodes.svg"></p>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h2>使用 kubectl 进行故障排除</h2>
+				<p>在模块 <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>中，您使用了 Kubectl 命令行接口。您将在模块 3 中继续使用它来获取有关已部署应用程序及其环境信息。最常见的操作可以通过以下 kubectl 命令完成:</p>
+				<ul>
+					<li><b>kubectl get</b> - 列出可用资源</li>
+					<li><b>kubectl describe</b> - 显示有关资源的详细信息</li>
+					<li><b>kubectl logs</b> - 从 Pod 中的容器打印日志</li>
+					<li><b>kubectl exec</b> - 在 Pod 中的容器执行命令</li>
+				</ul>
+
+				<p>您可以使用这些命令来查看应用程序部署的时间，它们当前的状态，运行的位置及其配置。</p>
+
+				<p>现在我们更多地了解了集群组件和命令行交互，接下来，一起来探索分析我们的应用程序。</p>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_fill">
+					<p><i> Node 是 Kubernetes 中的工作机器，可能是物理机或虚拟机，具体取决于集群的安装配置。多个 Pod 可以在一个 Node 上运行。 </i></p>
+				</div>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-12">
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/explore-interactive/" role="button">启动交互式教程<span class="btn__next">›</span></a>
+			</div>
+		</div>
+
+	</main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/expose-interactive.html

@@ -0,0 +1,36 @@
+---
+title: 交互性教程 - 应用外部可见
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                To interact with the Terminal, please use the desktop/tablet version
+            </div>
+            <div class="katacoda__box" id="inline-terminal-1"  data-katacoda-id="kubernetes-bootcamp/8" data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false" data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab" data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/scale-intro/" role="button">Continue to Module 5<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/expose-intro.html

@@ -0,0 +1,138 @@
+---
+title: 使用服务让您的应用程序外部可见
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+	<main class="content">
+
+		<div class="row">
+
+     <div class="col-md-8">
+      	<h3>目标</h3>
+				<ul>
+					<li>了解 Kubernetes 服务</li>
+					<li>了解 Kubernetes 标签</li>
+					<li>应用程序在 Kubernetes 外部可见</li>
+				</ul>
+			</div>
+
+			<div class="col-md-8">
+			<h3>Kubernetes Services</h3>
+
+			<p>虽然每个 Pod 在所在的集群中拥有自己独立的 IP 地址，但这些 IP 地址不会暴露在 Kubernetes 集群外部。考虑到 Pod 可能随时会被终止、删除或被其他 Pod 替换，我们需要一种方法让其他 Pod 和应用程序自动发现彼此。Kubernetes 通过 Service 对 Pods 进行分组来解决此问题。一个 Kubernetes <b>Service</b> 是一个抽象层，它定义了一组逻辑的 Pods，并让这些 Pods 对外部流量可见，可以被负载均衡和服务发现。 </p>
+
+			<p>此抽象允许我们将 Pods 暴露给集群外部的流量访问。Services 具有自己的唯一集群专用 IP 地址，并显示一个端口以接收流量。如果选择在集群外公开 Service，则有如下选项:</p>
+			<ul>
+				<li>LoadBalancer - 提供公有 IP 地址 (在 GCP 或 AWS 上运行 Kubernetes 通常使用此方式)</li>
+				<li>NodePort - 使用 NAT 在集群的每个 Node 节点的同一端口让服务可见。(所有 Kubernetes 集群和 Minikube 中都可用此方式)</li>
+			</ul>
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_lined">
+					<h3>摘要:</h3>
+					<ul>
+						<li>Pod 流量外部可见</li>
+						<li>Pods 流量负载均衡</li>
+						<li>使用标签</li>
+					</ul>
+				</div>
+				<div class="content__box content__box_fill">
+						<p><i>
+							Kubernetes Service 是一个抽象层，它定义了一组逻辑的 Pods，并为这些 Pods 启用了外部流量访问、负载均衡和服务发现。
+						</i></p>
+				</div>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h2 style="color: #3771e3;">Services 概述</h2>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_04_services.svg"></p>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+
+				<p>一个 Service 提供了一组 Pods 的流量负载均衡。通过创建服务以对来自特定部署的所有 Pods 进行分组时，这是有用的(当我们有多个实例运行时，我们的应用程序将在下一个模块中使用这一点)。</p>
+
+				<p>Services 还负责集群内部的服务发现 (包含在 <a href="/docs/user-guide/connecting-applications/#accessing-the-service">访问服务</a>中)。 例如，这将允许前端服务 (如 web 服务器) 从后端服务 (如 数据库) 接收流量，而不必考虑 Pod。 </p>
+
+				<p>Services 使用标签选择器匹配一组 Pods，标签选择器支持在标签上进行原始逻辑分组的能力。</p>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_fill">
+					<p><i> 您可以通过添加 --expose 作为 kubectl 运行命令的参数，在创建 Deployment 的同时创建 Service。 </i></p>
+				</div>
+			</div>
+		</div>
+
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><b>Labels</b> 是附加到对象的 键/值对，例如 Pods，您可以将它们视为社交媒体的标签符号。它们用于以对用户有意义的方式组织相关对象，如:</p>
+				<ul>
+					<li>生产环境 (生产、测试、开发)</li>
+					<li>应用程序版本 (beta、v1.3)</li>
+					<li>服务类型 (前端、后端、数据库)</li>
+				</ul>
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_fill">
+					<p><i> Labels 是附加到对象的键/值对。</i></p>
+				</div>
+			</div>
+		</div>
+		<br>
+		<div class="row">
+			<div class="col-md-8">
+				<h2 style="color: #3771e3;">Labels</h2>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_04_labels.svg"></p>
+			</div>
+		</div>
+		<br>
+		<div class="row">
+			<div class="col-md-8">
+
+				<p>Labels 可以在创建时或以后附加到对象，并可以随时修改。
+				在使用 kubectl run 命令新建 Pods/Deployment 时，会设置一些默认的 Labels/Label。标签和标签选择器之间的链接定义了 Deployment 及其创建 Pod 之间的关系。</p>
+
+				<p>现在，让我们在 Service 的帮助下公开我们的应用程序，并应用一些新的标签。</p>
+			</div>
+		</div>
+		<br>
+		<div class="row">
+			<div class="col-md-12">
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/expose-interactive/" role="button">启动交互式教程<span class="btn__next">›</span></a>
+			</div>
+		</div>
+
+	</main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/index.html

@@ -0,0 +1,106 @@
+---
+title: 概述
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="./public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+  <main class="content">
+
+    <div class="row">
+      <div class="col-md-9">
+        <h2>Kubernetes 基础</h2>
+        <p>本教程介绍了 Kubernetes 集群编排系统的基础知识。每个模块包含关于 Kubernetes 主要特性和概念的一些背景信息，并包括一个交互式在线教程。这些交互式教程让您可以自己管理一个简单的集群及其容器化应用程序。</p>
+        <p>使用交互式教程，您可以学习:</p>
+        <ul>
+        <li>在集群上部署容器化应用程序</li>
+        <li>弹性部署</li>
+        <li>使用新的软件版本，更新容器化应用程序</li>
+        <li>调试容器化应用程序</li>
+        </ul>
+        <p>教程 Katacoda 在您的浏览器中运行一个虚拟终端，在浏览器中运行 Minikube，这是一个可在任何地方小规模本地部署的 Kubernetes 集群。没有安装任何软件或进行任何配置; 每个交互性教程都直接从您的网页浏览器上运行。</p>
+      </div>
+    </div>
+
+    <br>
+
+    <div class="row">
+      <div class="col-md-9">
+        <h2>Kubernetes 可以为您做些什么?</h2>
+        <p>现代的 Web 服务，用户希望应用程序能够 24/7 全天候使用，开发人员希望每天可以多次发布部署新版本的应用程序。 容器化可以帮助软件包服务于这些目标，使应用程序能够以简单快速的方式发布和更新，而无需停机。Kubernetes 帮助您确保这些容器化的应用程序在您想要的地方和时间运行，并帮助应用程序找到它们需要的资源的工具。 <a href="http://kubernetes.io/docs/whatisk8s/">Kubernetes</a>  是一个生产可用的开源平台，具有 Google 容器集群方面的设计与经验积累，拥有来自社区的最佳实践。</p>
+      </div>
+    </div>
+
+    <div class="content__modules">
+      <h2>Kubernetes 基础模块</h2>
+      <div class="row">
+        <div class="col-md-4">
+          <div class="thumbnail">
+            <a href="/docs/tutorials/kubernetes-basics/cluster-intro/"><img src="./public/images/module_01.svg?v=1469803628347" alt=""></a>
+            <div class="caption">
+              <a href="cluster-intro/"><h5>1. 创建一个 Kubernetes 集群</h5></a>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-4">
+          <div class="thumbnail">
+            <a href="/docs/tutorials/kubernetes-basics/deploy-intro/"><img src="./public/images/module_02.svg?v=1469803628347" alt=""></a>
+            <div class="caption">
+              <a href="deploy-intro/"><h5>2. 部署应用程序</h5></a>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-4">
+          <div class="thumbnail">
+            <a href="/docs/tutorials/kubernetes-basics/explore-intro/"><img src="./public/images/module_03.svg?v=1469803628347" alt=""></a>
+            <div class="caption">
+              <a href="explore-intro/"><h5>3. 应用程序探索</h5></a>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-4">
+          <div class="thumbnail">
+            <a href="/docs/tutorials/kubernetes-basics/expose-intro/"><img src="./public/images/module_04.svg?v=1469803628347" alt=""></a>
+            <div class="caption">
+              <a href="expose-intro/"><h5>4. 应用外部可见</h5></a>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-4">
+          <div class="thumbnail">
+            <a href="/docs/tutorials/kubernetes-basics/scale-intro/"><img src="./public/images/module_05.svg?v=1469803628347" alt=""></a>
+            <div class="caption">
+              <a href="scale-intro/"><h5>5. 应用可伸缩</h5></a>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-4">
+          <div class="thumbnail">
+            <a href="/docs/tutorials/kubernetes-basics/update-intro/"><img src="./public/images/module_06.svg?v=1469803628347" alt=""></a>
+            <div class="caption">
+              <a href="update-intro/"><h5>6. 应用更新</h5></a>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-md-12">
+        <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/cluster-intro/" role="button">开始教程<span class="btn__next">›</span></a>
+      </div>
+    </div>
+
+  </main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/scale-interactive.html

@@ -0,0 +1,38 @@
+---
+title: 交互式教程 - 扩展您的应用程序
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                To interact with the Terminal, please use the desktop/tablet version
+            </div>
+            <div class="katacoda__box" id="inline-terminal-1"  data-katacoda-id="kubernetes-bootcamp/5" data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false" data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab" data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/update-intro/" role="button">Continue to Module 6<span class="btn__next">›</span></a>
+            </div>
+        </div>
+
+    </main>
+
+<a class="scrolltop" href="#top"></a>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/scale-intro.html

@@ -0,0 +1,120 @@
+---
+title: 运行应用程序的多个实例
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+	<main class="content">
+
+		<div class="row">
+
+     <div class="col-md-8">
+      	<h3>目标</h3>
+				<ul>
+					<li>使用 kubectl 缩放应用程序</li>
+				</ul>
+			</div>
+
+			<div class="col-md-8">
+       <h3>缩放应用程序</h3>
+
+			<p>在之前的模块中，我们创建了一个 <a href="http://kubernetes.io/docs/user-guide/deployments/"> Deployment</a>，然后通过 <a href="http://kubernetes.io/docs/user-guide/services/">Service</a>让应用程序外部可见。Deployment 仅为我们的应用程序创建了一个 Pod。 当流量增加时，我们将需要扩展应用程序以跟上用户需求。</p>
+
+			<p><b>Scaling</b> 是通过更改 Deployment 中的副本数量实现的。</p>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_lined">
+					<h3>摘要:</h3>
+					<ul>
+						<li>Deployment 的缩放</li>
+					</ul>
+				</div>
+				<div class="content__box content__box_fill">
+					<p><i> 您可以使用 kubectl run 命令的 --replicas 参数，在创建 Deployment 时指定多个实例。 </i></p>
+				</div>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h2 style="color: #3771e3;">Scaling 概述</h2>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-1"></div>
+			<div class="col-md-8">
+				<div id="myCarousel" class="carousel" data-ride="carousel" data-interval="3000">
+					<ol class="carousel-indicators">
+					    <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+					    <li data-target="#myCarousel" data-slide-to="1"></li>
+					</ol>
+					  <div class="carousel-inner" role="listbox">
+					    <div class="item active">
+					      <img src="/docs/tutorials/kubernetes-basics/public/images/module_05_scaling1.svg">
+					    </div>
+
+					    <div class="item">
+					      <img src="/docs/tutorials/kubernetes-basics/public/images/module_05_scaling2.svg">
+					    </div>
+					  </div>
+
+					  <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+						<span class="sr-only ">Previous</span>
+					  </a>
+					  <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+						<span class="sr-only">Next</span>
+					  </a>
+
+					</div>
+			</div>
+		</div>
+
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+
+				<p>扩展 Deployment 将确保新创建的 Pods 会调度到可用资源的 Node 节点上，收缩会保证 Pods 数量减少至新的所需状态。  Kubernetes 还支持 Pods 的 <a href="http://kubernetes.io/docs/user-guide/horizontal-pod-autoscaling/"> 自动缩放版 </a> ，但不在本教程范围之内。收缩到零也是可以的，此时它将终止指定 Deployment 的所有 Pod。 </p>
+
+				<p>运行应用程序的多个实例需要一种将流量分发给所有实例的方法。服务有内置的负载均衡器，可将网络流量分配给 Deployment 暴露的所有 Pods。服务通过使用 endpoints 持续监控运行的 Pods，以确保流量仅发送到可用的 Pods。</p>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_fill">
+					<p><i>通过更改 Deployment 中的副本数可以实现伸缩应用程序。</i></p>
+				</div>
+			</div>
+		</div>
+
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p> 一旦您有应用程序的多个实例，您将能够滚动更新而不会停止服务。我们将在下一个模块中介绍。现在，我们去在线终端扩展我们的应用程序。</p>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-12">
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/scale-interactive/" role="button">启动交互式教程 <span class="btn__next">›</span></a>
+			</div>
+		</div>
+
+	</main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/update-interactive.html

@@ -0,0 +1,31 @@
+---
+title: 交互式教程 - 更新您的应用程序
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+<script src="https://katacoda.com/embed.js"></script>
+
+<div class="layout" id="top">
+
+    <main class="content katacoda-content">
+
+        <div class="katacoda">
+            <div class="katacoda__alert">
+                To interact with the Terminal, please use the desktop/tablet version
+            </div>
+            <div class="katacoda__box" id="inline-terminal-1"  data-katacoda-id="kubernetes-bootcamp/6" data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false" data-katacoda-font="Roboto" data-katacoda-fontheader="Roboto Slab" data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;">
+            </div>
+        </div>
+
+    </main>
+
+</div>
+
+</body>
+</html>

cn/docs/tutorials/kubernetes-basics/update-intro.html

@@ -0,0 +1,135 @@
+---
+title: 执行滚动更新
+---
+
+<!DOCTYPE html>
+
+<html lang="en">
+
+<body>
+
+<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
+
+<div class="layout" id="top">
+
+	<main class="content">
+
+		<div class="row">
+
+     <div class="col-md-8">
+      	<h3>目标</h3>
+				<ul>
+					<li>使用 kubectl 执行滚动更新</li>
+				</ul>
+			</div>
+
+			<div class="col-md-8">
+			<h3>更新应用程序</h3>
+
+			<p>用户期望应用程序始终可用，并且开发人员有望每天部署新版本。这就是 Kubernetes 的滚动更新。 <b>Rolling updates</b> 允许通过使用新的 Pods 实例逐个更新来实现零停机的更新部署。新的 Pods 会被调度到可用资源的 Node 节点上。</p>
+
+			<p>在上一个模块中，我们将应用程序扩展为运行多个实例。这是执行更新但不影响应用可用性的要求。默认情况下，更新期间最大数量的 Pods 可能不可用，此时创建和更新 Pod 的最大数量是一。 这两个选项可以配置为数字或百分比(Pods)。
+			在 Kubernetes 中，更新已版本化，任何部署更新都可以恢复到以前的 (稳定) 版本。</p>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_lined">
+					<h3>摘要:</h3>
+					<ul>
+						<li>更新应用程序</li>
+					</ul>
+				</div>
+				<div class="content__box content__box_fill">
+					<p><i>滚动更新允许通过使用新的 Pods 实例逐个更新来实现零停机的部署更新。 </i></p>
+				</div>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<h2 style="color: #3771e3;">滚动更新概述</h2>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-1"></div>
+			<div class="col-md-8">
+				<div id="myCarousel" class="carousel" data-ride="carousel" data-interval="3000">
+					<ol class="carousel-indicators">
+					    <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+					    <li data-target="#myCarousel" data-slide-to="1"></li>
+					    <li data-target="#myCarousel" data-slide-to="2"></li>
+					    <li data-target="#myCarousel" data-slide-to="3"></li>
+					</ol>
+					  <div class="carousel-inner" role="listbox">
+					    <div class="item active">
+					      <img src="/docs/tutorials/kubernetes-basics/public/images/module_06_rollingupdates1.svg" >
+					    </div>
+
+					    <div class="item">
+					      <img src="/docs/tutorials/kubernetes-basics/public/images/module_06_rollingupdates2.svg">
+					    </div>
+
+					    <div class="item">
+					      <img src="/docs/tutorials/kubernetes-basics/public/images/module_06_rollingupdates3.svg">
+					    </div>
+
+					    <div class="item">
+					      <img src="/docs/tutorials/kubernetes-basics/public/images/module_06_rollingupdates4.svg">
+					    </div>
+					  </div>
+
+					  <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
+						<span class="sr-only ">Previous</span>
+					  </a>
+					  <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
+						<span class="sr-only">Next</span>
+					  </a>
+
+					</div>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+
+				<p>与应用程序缩放类似，如果 Deployment 外部可见，则 Service 将在更新期间将流量负载均衡到可用的 Pod。可用的 Pod 指的是应用程序用户可用的实例。</p>
+
+				<p>滚动更新允许以下操作:</p>
+				<ul>
+					<li>将应用程序从一个环境升级到另一个环境 (通过容器镜像更新)</li>
+					<li>回滚到以前的版本</li>
+					<li>持续集成和持续交付，实现应用程序零故障</li>
+
+				</ul>
+
+			</div>
+			<div class="col-md-4">
+				<div class="content__box content__box_fill">
+					<p><i>如果部署外部可见，则服务将在更新期间将流量负载均衡到可用的 Pod。 </i></p>
+				</div>
+			</div>
+		</div>
+
+		<br>
+
+		<div class="row">
+			<div class="col-md-8">
+				<p> 在下面的交互式教程中，我们将把应用程序更新到一个新版本，并执行回滚。</p>
+			</div>
+		</div>
+		<br>
+
+		<div class="row">
+			<div class="col-md-12">
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/update-interactive/" role="button">启动交互式教程<span class="btn__next">›</span></a>
+			</div>
+		</div>
+
+	</main>
+
+</div>
+
+</body>
+</html>

cn/docs/whatisk8s.md

@@ -0,0 +1,9 @@
+---
+assignees:
+- k8s-merge-robot
+title: 认识 Kubernetes?
+---
+
+{% include user-guide-content-moved.md %}
+
+[认识 Kubernetes?](/docs/concepts/overview/what-is-kubernetes/)

community/index.html

@@ -0,0 +1,71 @@
+---
+title: Community
+layout: basic
+cid: community
+---
+
+<section id="hero" class="light-text">
+    <h1>Community</h1>
+</section>
+
+<section id="mainContent">
+    <main>
+        <div class="content">
+            <h3>Ensuring Kubernetes works well everywhere and for everyone.</h3>
+            <p>Connect with the Kubernetes community on our <a href="http://slack.k8s.io/">Slack channel</a> or join the
+                <a href="https://groups.google.com/forum/#!forum/kubernetes-dev">Kubernetes-dev Google group</a>. A weekly
+                community meeting takes place via video conference to discuss the state of affairs,
+                <a href="https://groups.google.com/forum/#!forum/kubernetes-community-video-chat">get a calendar invite</a>
+                to participate.</p>
+            <p>You can also join Kubernauts all around the world through our
+                <a href="https://www.meetup.com/topics/kubernetes/">Kubernetes Meetup Community</a> and the
+                <a href="https://www.meetup.com/Kubernetes-Cloud-Native-Online-Meetup/">Kubernetes Cloud Native Meetup Community</a>.</p>
+        </div>
+        <div class="content">
+            <h3>Special Interest Groups (SIGs)</h3>
+            <p>Have a special interest in how Kubernetes works with another technology?  See our ever growing
+                <a href="https://github.com/kubernetes/kubernetes/wiki/Special-Interest-Groups-(SIGs)">lists of SIGs</a>,
+                from AWS and Openstack to Big Data and Scalability, there's a place for you to contribute and instructions
+                for forming a new SIG if your special interest isn't covered (yet).</p>
+
+            <p>As a member of the Kubernetes community, you are welcome to join any of the SIG meetings
+                you are interested in. No registration required.</p>
+            <div id="calendarMeetings">
+                <iframe src="https://calendar.google.com/calendar/embed?src=cgnt364vd8s86hr2phapfjc6uk%40group.calendar.google.com&ctz=America/Los_Angeles"
+                        frameborder="0" scrolling="no"></iframe>
+            </div>
+        </div>
+        <div class="content">
+            <h3>Events</h3>
+            <div id="calendarEvents">
+                <iframe src="https://calendar.google.com/calendar/embed?src=nt2tcnbtbied3l6gi2h29slvc0%40group.calendar.google.com&ctz=America/Los_Angeles"
+                        frameborder="0" scrolling="no"></iframe>
+            </div>
+        </div>
+    </main>
+</section>
+
+<section id="talkToUs">
+    <main>
+        <h3>Talk to Us!</h3>
+        <h4>We would love to hear from you, how you are using Kubernetes,<br> and what we can do to make it better.</h4>
+        <div id="bigSocial">
+            <div>
+                <a href="https://twitter.com/kubernetesio">@kubernetesio</a>
+                <p>Get the latest news and updates.</p>
+            </div>
+            <div>
+                <a href="https://github.com/kubernetes/kubernetes">Github Project</a>
+                <p>Check out the project and consider contributing.</p>
+            </div>
+            <div>
+                <a href="http://slack.k8s.io/">#kubernetes-users</a>
+                <p>Our Slack channel is the best way to contact our engineers and share your ideas with them.</p>
+            </div>
+            <div>
+                <a href="http://stackoverflow.com/questions/tagged/kubernetes">Stack Overflow</a>
+                <p>Our user forum is a great place to go for community support.</p>
+            </div>
+        </div>
+    </main>
+</section>

config.toml

@@ -1,111 +0,0 @@
-baseURL = "https://kubernetes.io"
-title = "Kubernetes"
-
-defaultContentLanguage = "en"
-defaultContentLanguageInSubdir = false
-enableRobotsTXT = true
-
-disableKinds = ["taxonomy", "taxonomyTerm"]
-
-ignoreFiles = [ "^OWNERS$", "README.md", "^node_modules$" ]
-
-contentDir = "content/en"
-
-timeout = 3000
-
-# Highlighting config.
-pygmentsCodeFences = true
-pygmentsUseClasses = false
-# See https://help.farbox.com/pygments.html
-pygmentsStyle = "emacs"
-
-[blackfriday]
-hrefTargetBlank = true
-fractions = false
-
-[frontmatter]
-date = ["date", ":filename", "publishDate", "lastmod"]
-
-[permalinks]
-  blog = "/:section/:year/:month/:day/:slug/"
-
-# Be explicit about the output formats. We (currently) only want an RSS feed for the home page.
-[outputs]
-home = [ "HTML", "RSS"]
-page = [ "HTML"]
-section = [ "HTML"]
-
-[outputFormats]
-[outputFormats.RSS]
-baseName = "feed"
-
-[params]
-
-time_format_blog = "Monday, January 02, 2006"
-description = "Production-Grade Container Orchestration"
-showedit = true
-
-latest = "v1.10"
-
-fullversion = "v1.10.3"
-version = "v1.10"
-githubbranch = "master"
-docsbranch = "master"
-deprecated = false
-currentUrl = "https://kubernetes.io/docs/home/"
-nextUrl = "http://kubernetes-io-vnext-staging.netlify.com/"
-githubWebsiteRepo = "github.com/kubernetes/website"
-
-[[params.versions]]
-fullversion = "v1.10.3"
-version = "v1.10"
-githubbranch = "v1.10.3"
-docsbranch = "release-1.10"
-url = "https://kubernetes.io"
-
-[[params.versions]]
-fullversion = "v1.9.7"
-version = "v1.9"
-githubbranch = "v1.9.7"
-docsbranch = "release-1.9"
-url = "https://v1-9.docs.kubernetes.io"
-
-[[params.versions]]
-fullversion = "v1.8.4"
-version = "v1.8"
-githubbranch = "v1.8.4"
-docsbranch = "release-1.8"
-url = "https://v1-8.docs.kubernetes.io"
-
-[[params.versions]]
-fullversion = "v1.7.6"
-version = "v1.7"
-githubbranch = "v1.7.6"
-docsbranch = "release-1.7"
-url = "https://v1-7.docs.kubernetes.io"
-
-[[params.versions]]
-fullversion = "v1.6.8"
-version = "v1.6"
-githubbranch = "v1.6.8"
-docsbranch = "release-1.6"
-url = "https://v1-6.docs.kubernetes.io"
-
-
-# Language definitions.
-
-[languages]
-[languages.en]
-title = "Kubernetes"
-description = "Production-Grade Container Orchestration"
-languageName ="English"
-# Weight used for sorting.
-weight = 1
-[languages.cn]
-title = "Kubernetes"
-description = "Production-Grade Container Orchestration"
-languageName ="Chinese"
-weight = 2
-contentDir = "content/cn"
-
-

content/cn/_index.html

@@ -1,153 +0,0 @@
----
-title: "生产级别的容器编排系统"
-abstract: "自动化的容器部署、扩展和管理"
-cid: "home"
----
-
-<section id="oceanNodes">
-    <main>
-        <div class="image-wrapper"><img src="/images/flower.png"></div>
-        <div class="content">
-            
-            <h3><a href="/docs/concepts/overview/what-is-kubernetes/">Kubernetes</a> 是用于自动部署，扩展和管理容器化应用程序的开源系统。</h3>
-            <p>它将组成应用程序的容器组合成逻辑单元，以便于管理和服务发现，Kubernetes 构建在 <a href="http://queue.acm.org/detail.cfm?id=2898444"> Google 15 年生产环境经验</a>基础之上,并结合来自社区的最佳创意和实践。</p>
-        </div>
-    </main>
-    <main>
-        <div class="image-wrapper"><img src="/images/scalable.png"></div>
-        <div class="content">
-            
-            <h4>星际尺度</h4>
-            <p>根据同样的原则设计，允许 Google 每周运行数十亿个容器，Kubernetes 可以在不增加您的 ops 团队的情况下进行弹性扩展。</p>
-        </div>
-    </main>
-    <main>
-        <div class="image-wrapper"><img src="/images/blocks.png"></div>
-        <div class="content">
-            
-            <h4>永不过时</h4>
-            <p>无论您应用运行在本地还是运行于全球任何地域，Kubernetes 的灵活性都可以随着您的需求复杂度不断增加，还可以持续、轻松地对外提供服务。</p>
-        </div>
-    </main>
-    <main>
-        <div class="image-wrapper"><img src="/images/suitcase.png"></div>
-        <div class="content">
-            
-            <h4>随处运行</h4>
-            <p>Kubernetes 是开源的，可以让您自由地部署在企业内部，私有云、混合云或公有云基础架构，使您轻松将应用迁移至任何位置。</p>
-        </div>
-    </main>
-</section>
-<section id="video">
-    <div class="light-text">
-        
-        <h2>Kubernetes: 最后&hellip; 它是真正的云平台</h2>
-        <p>Box 的联合创始人和服务架构师 Sam Ghods 发表了热情洋溢的演讲，随着使用 Kubernetes，我们首次有一个通用接口，可以建立真正的部署工具。</p>
-        <button id="desktopShowVideoButton" onclick="kub.showVideo()">观看视频</button>
-    </div>
-    <button id="mobileShowVideoButton" onclick="kub.showVideo()"></button>
-</section>
-<section id="features">
-    <main>
-        
-        <h3 class="center">Kubernetes 特性</h3>
-        <div class="feature-box">
-            <div>
-                
-                <h4><a href="/docs/concepts/configuration/manage-compute-resources-container/">自动包装</a></h4>
-                <p>根据资源需求和其他约束自动放置容器，同时不会牺牲可用性，混合关键和最大努力的工作负载，以提高资源利用率并节省更多资源。</p>
-            </div>
-            <div>
-                
-                <h4><a href="/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller">自我修复</a></h4>
-                <p>重新启动失败的容器，在节点不可用时，替换和重新编排节点上的容器，终止不对用户定义的健康检查做出响应的容器，并且不会在客户端准备投放之前将其通告给客户端。</p>
-            </div>
-        </div>
-        <div class="feature-box">
-            <div>
-                
-                <h4><a href="/docs/tasks/run-application/horizontal-pod-autoscale/">横向缩放</a></h4>
-                <p>使用简单的命令或 UI，或者根据 CPU 的使用情况自动调整应用程序副本数。</p>
-            </div>
-            <div>
-                
-                <h4><a href="/docs/concepts/services-networking/service/">服务发现和负载均衡</a></h4>
-                <p>不需要修改您的应用程序来使用不熟悉的服务发现机制，Kubernetes 为容器提供了自己的 IP 地址和一组容器的单个 DNS 名称，并可以在它们之间进行负载均衡。</p>
-            </div>
-        </div>
-        <div class="feature-box">
-            <div>
-                
-                <h4><a href="/docs/concepts/workloads/controllers/deployment/#what-is-a-deployment">自动部署和回滚</a></h4>
-                <p>Kubernetes 逐渐部署对应用程序或其配置的更改，同时监视应用程序运行状况，以确保它不会同时终止所有实例。 如果出现问题，Kubernetes会为您恢复更改，利用日益增长的部署解决方案的生态系统。</p>
-            </div>
-            <div>
-                <h4><a href="/docs/concepts/configuration/secret/">密钥</a> 和 <a href="/docs/tasks/configure-pod-container/configure-pod-configmap/">配置</a> 管理</h4>
-                <p>部署和更新密钥和应用程序配置，不会重新编译您的镜像，不会在堆栈配置中暴露密钥(secrets)。</p>
-            </div>
-        </div>
-        <div class="feature-box">
-            <div>
-                <h4><a href="/docs/concepts/storage/persistent-volumes/">存储编排</a></h4>
-                <p>自动安装您所选择的存储系统，无论是本地存储，如公有云提供商 <a href="https://cloud.google.com/storage/">GCP</a> 或 <a href="https://aws.amazon.com/products/storage/">AWS</a>, 还是网络存储系统 NFS, iSCSI,
-            Gluster, Ceph, Cinder, 或 Flocker。</p>
-        </div>
-        <div>
-            <h4><a href="/docs/concepts/workloads/controllers/jobs-run-to-completion/">批处理</a></h4>
-            <p>除了服务之外，Kubernetes还可以管理您的批处理和 CI 工作负载，如果需要，替换出现故障的容器。</p>
-        </div>
-    </div>
-</main>
-</section>
-<section id="talkToUs">
-<main>
-    
-    <h3>实例探究</h3>
-    <div id="caseStudiesWrapper">
-        <div>
-            <p>使用Kubernetes来重塑世界上最大的教育公司</p>
-            <a href="/case-studies/pearson/">阅读更多</a>
-        </div>
-        <div>
-            <p>Kubernetes at Box: 微服务的最大优势</p>
-            <a href="https://blog.box.com/blog/kubernetes-box-microservices-maximum-velocity/">阅读更多</a>
-        </div>
-        <div>
-            <p>在 eBay 内部转移到 OpenStack 上的 Kubernetes 和容器</p>
-            <a href="https://www.nextplatform.com/2015/11/12/inside-ebays-shift-to-kubernetes-and-containers-atop-openstack/">阅读更多</a>
-        </div>
-        <div>
-            <p>将本地的集群迁移至 Kubernetes</p>
-            <a href="https://www.youtube.com/watch?v=6XGUTu3WhBw">观看视频</a>
-        </div>
-    </div>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    <h5 style="text-align: center"><a href="/case-studies/" style="color: #3371E3; font-weight: 400">探究所有的案例</a></h5>
-</main>
-</section>
-<div id="videoPlayer">
-<iframe data-url="https://www.youtube.com/embed/of45hYbkIZs?autoplay=1" frameborder="0" allowfullscreen></iframe>
-<button id="closeButton"></button>
-</div>