diff --git a/.travis.yml b/.travis.yml
index 791d289e88..e527e16dbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,10 @@ install:
- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/
- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/*
- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/
+- go get -v k8s.io/kubernetes/cmd/mungedocs
script:
- go test -v k8s.io/kubernetes.github.io/test
- $GOPATH/bin/md-check --root-dir=$HOME/gopath/src/k8s.io/kubernetes.github.io
- ./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
diff --git a/Makefile b/Makefile
index 64ceef89a0..3657cb577a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PONY: all build build-preview help serve
+.PHONY: all build build-preview help serve
help: ## Show this help.
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
diff --git a/_data/concepts.yml b/_data/concepts.yml
index 4102b5f142..71c6512909 100644
--- a/_data/concepts.yml
+++ b/_data/concepts.yml
@@ -2,7 +2,9 @@ bigheader: "Concepts"
abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
toc:
- docs/concepts/index.md
-
+- title: Kubectl Command Line
+ section:
+ - docs/concepts/tools/kubectl/object-management-overview.md
- title: Kubernetes Objects
section:
- docs/concepts/abstractions/overview.md
@@ -10,7 +12,6 @@ toc:
- title: Controllers
section:
- docs/concepts/abstractions/controllers/statefulsets.md
-
- title: Object Metadata
section:
- docs/concepts/object-metadata/annotations.md
diff --git a/_data/guides.yml b/_data/guides.yml
index fdade5b1ec..38ee10b438 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -8,6 +8,7 @@ toc:
- docs/whatisk8s.md
- docs/getting-started-guides/kubeadm.md
- docs/getting-started-guides/kops.md
+ - docs/getting-started-guides/kargo.md
- docs/hellonode.md
- docs/getting-started-guides/kubectl.md
- docs/getting-started-guides/binary_release.md
@@ -92,7 +93,7 @@ toc:
- docs/user-guide/connecting-to-applications-proxy.md
- docs/user-guide/connecting-to-applications-port-forward.md
- title: Using Explorer to Examine the Runtime Environment
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/explorer
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer
- title: Creating a Cluster
section:
@@ -188,6 +189,7 @@ toc:
- docs/admin/disruptions.md
- docs/admin/resourcequota/index.md
- docs/admin/resourcequota/walkthrough.md
+ - docs/admin/resourcequota/limitstorageconsumption.md
- docs/admin/rescheduler.md
- docs/admin/sysctls.md
- docs/admin/cluster-components.md
@@ -199,7 +201,7 @@ toc:
- docs/admin/networking.md
- docs/admin/dns.md
- title: Setting Up and Configuring DNS
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cluster-dns
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/cluster-dns
- docs/admin/master-node-communication.md
- docs/admin/network-plugins.md
- docs/admin/static-pods.md
diff --git a/_data/reference.yml b/_data/reference.yml
index de1dec2c14..0d7dc82db6 100644
--- a/_data/reference.yml
+++ b/_data/reference.yml
@@ -188,13 +188,13 @@ toc:
- title: Kubernetes Design Docs
section:
- title: Kubernetes Architecture
- path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/architecture.md
+ path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/architecture.md
- title: Kubernetes Design Overview
- path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/
+ path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/
- title: Kubernetes Identity and Access Management
- path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/access.md
+ path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/access.md
- docs/admin/ovs-networking.md
- title: Security Contexts
- path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security_context.md
+ path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/security_context.md
- title: Security in Kubernetes
- path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security.md
+ path: https://github.com/kubernetes/kubernetes/blob/release-1.5/docs/design/security.md
diff --git a/_data/samples.yml b/_data/samples.yml
index e94f2b3223..012b00e2c7 100644
--- a/_data/samples.yml
+++ b/_data/samples.yml
@@ -6,72 +6,70 @@ toc:
- title: Storage / Database / KV
section:
- title: Apache Cassandra Database
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cassandra
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/cassandra
- title: Ceph
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rbd/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/rbd/
- title: CephFS
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cephfs/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/cephfs/
- title: CockroachDB
path: https://github.com/kubernetes/kubernetes/tree/release-1.4/examples/cockroachdb/
- title: GlusterFS
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/glusterfs/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/glusterfs/
- title: Hazelcast
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/hazelcast
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/hazelcast
- title: iSCSI
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/iscsi/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/iscsi/
- title: MySQL Galera
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/mysql-galera
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/mysql-galera
- title: NFS
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/nfs/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/volumes/nfs/
- title: Redis
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/redis/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/redis/
- title: RethinkDB
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rethinkdb/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/rethinkdb/
- title: Vitess
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/vitess/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/vitess/
- title: Big Data
section:
- title: Apache Spark
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/spark
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/spark
- title: Apache Storm
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/storm
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storm
- title: Messaging / Queueing
section:
- - title: Celery + RabbitMQ
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/celery-rabbitmq
- title: Hazelcast
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/hazelcast
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/storage/hazelcast
- title: Miscellaneous
section:
- title: Meteor Applications
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/meteor/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/meteor/
- title: OpenShift Origin
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/openshift-origin/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/openshift-origin/
- title: Selenium
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/selenium/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/selenium/
- title: Monitoring and Logging
section:
- title: Elasticsearch
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/elasticsearch/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/elasticsearch/
- title: NewRelic
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/newrelic
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/newrelic
- title: Multi-tier Applications
section:
- title: Guestbook - Go Server
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/guestbook-go/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/guestbook-go/
- title: GuestBook - PHP Server
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/guestbook/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/guestbook/
- docs/getting-started-guides/meanstack.md
- title: MySQL + Wordpress
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/mysql-wordpress-pd/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/mysql-wordpress-pd/
- title: MySQL + Phabricator Server
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/phabricator/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/phabricator/
- title: Nodejs + Mongo
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/nodesjs-mongodb
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/nodesjs-mongodb
- title: Petstore
- path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/k8petstore/
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/k8petstore/
diff --git a/_data/support.yml b/_data/support.yml
index c25faa70f8..a6b13e9d09 100644
--- a/_data/support.yml
+++ b/_data/support.yml
@@ -3,17 +3,6 @@ abstract: "Troubleshooting resources, frequently asked questions, and community
toc:
- docs/troubleshooting.md
-- title: Contributing to the Kubernetes Docs
- section:
- - editdocs.md
- - docs/contribute/create-pull-request.md
- - docs/contribute/write-new-topic.md
- - docs/contribute/stage-documentation-changes.md
- - docs/contribute/page-templates.md
- - docs/contribute/review-issues.md
- - docs/contribute/style-guide.md
-
-
- title: Troubleshooting
section:
- docs/user-guide/debugging-pods-and-replication-controllers.md
@@ -31,6 +20,16 @@ toc:
- title: Services FAQ
path: https://github.com/kubernetes/kubernetes/wiki/Services-FAQ/
+- title: Contributing to the Kubernetes Docs
+ section:
+ - editdocs.md
+ - docs/contribute/create-pull-request.md
+ - docs/contribute/write-new-topic.md
+ - docs/contribute/stage-documentation-changes.md
+ - docs/contribute/page-templates.md
+ - docs/contribute/review-issues.md
+ - docs/contribute/style-guide.md
+
- title: Other Resources
section:
- title: Kubernetes Issue Tracker on GitHub
@@ -40,6 +39,6 @@ toc:
path: https://github.com/kubernetes/kubernetes/releases/
- title: Release Roadmap
path: https://github.com/kubernetes/kubernetes/milestones/
-
+
- title: Deprecation Policy
path: /docs/deprecation-policy.md
diff --git a/_data/tasks.yml b/_data/tasks.yml
index 13315bf5ed..231a583524 100644
--- a/_data/tasks.yml
+++ b/_data/tasks.yml
@@ -1,5 +1,5 @@
bigheader: "Tasks"
-abstract: "Step-by-step instructions for performing operations with Kuberentes."
+abstract: "Step-by-step instructions for performing operations with Kubernetes."
toc:
- docs/tasks/index.md
diff --git a/_data/tools.yml b/_data/tools.yml
index 8c09e7e095..b5e3a29e7f 100644
--- a/_data/tools.yml
+++ b/_data/tools.yml
@@ -7,6 +7,8 @@ toc:
section:
- title: Kubectl
path: /docs/user-guide/kubectl/
+ - title: Kubeadm
+ path: /docs/getting-started-guides/kubeadm
- title: Kubefed
path: /docs/admin/federation/kubefed/
- title: Kubernetes Dashboard
diff --git a/_data/tutorials.yml b/_data/tutorials.yml
index 954d0841a1..395ff9d06d 100644
--- a/_data/tutorials.yml
+++ b/_data/tutorials.yml
@@ -41,6 +41,9 @@ toc:
- docs/tutorials/stateful-application/run-stateful-application.md
- docs/tutorials/stateful-application/run-replicated-stateful-application.md
- docs/tutorials/stateful-application/zookeeper.md
+- title: Connecting Applications
+ section:
+ - docs/tutorials/connecting-apps/connecting-frontend-backend.md
- title: Services
section:
- docs/tutorials/services/source-ip.md
diff --git a/_includes/case-study-styles.html b/_includes/case-study-styles.html
deleted file mode 100644
index 48058bd27b..0000000000
--- a/_includes/case-study-styles.html
+++ /dev/null
@@ -1,313 +0,0 @@
-
-
diff --git a/_includes/code.html b/_includes/code.html
index ce653054e8..59a27ebf1a 100644
--- a/_includes/code.html
+++ b/_includes/code.html
@@ -7,5 +7,20 @@
```
{: id="{{include.file | handleize}}"}
{% endcapture %}
-
\ No newline at end of file
+
diff --git a/_includes/footer-scripts.html b/_includes/footer-scripts.html
new file mode 100644
index 0000000000..091545d12a
--- /dev/null
+++ b/_includes/footer-scripts.html
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
diff --git a/_includes/head-header.html b/_includes/head-header.html
deleted file mode 100644
index fa859604d2..0000000000
--- a/_includes/head-header.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {% seo %}
-
-
-
-
-
-
-
-
-
-
diff --git a/_includes/head.html b/_includes/head.html
new file mode 100644
index 0000000000..2f85549db5
--- /dev/null
+++ b/_includes/head.html
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+ {% if page.class == "gridPage" %}{% endif %}
+
+
+
+
+
+ {% seo %}
+
diff --git a/_includes/header.html b/_includes/header.html
new file mode 100644
index 0000000000..436e4262c4
--- /dev/null
+++ b/_includes/header.html
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
diff --git a/_includes/templates/concept.md b/_includes/templates/concept.md
index dc6efdad13..65edc7f808 100644
--- a/_includes/templates/concept.md
+++ b/_includes/templates/concept.md
@@ -24,7 +24,7 @@
{% if whatsnext %}
-### What's next
+## What's next
{{ whatsnext }}
diff --git a/_includes/templates/task.md b/_includes/templates/task.md
index d74ff3b97a..e76cb7b117 100644
--- a/_includes/templates/task.md
+++ b/_includes/templates/task.md
@@ -15,7 +15,7 @@
{% if prerequisites %}
-### Before you begin
+## Before you begin
{{ prerequisites }}
@@ -48,7 +48,7 @@
{% if whatsnext %}
-### What's next
+## What's next
{{ whatsnext }}
diff --git a/_includes/templates/tutorial.md b/_includes/templates/tutorial.md
index 9c2d680643..b4c1faa0f1 100644
--- a/_includes/templates/tutorial.md
+++ b/_includes/templates/tutorial.md
@@ -15,7 +15,7 @@
{% if objectives %}
-### Objectives
+## Objectives
{{ objectives }}
@@ -28,7 +28,7 @@
{% if prerequisites %}
-### Before you begin
+## Before you begin
{{ prerequisites }}
@@ -52,7 +52,7 @@
{% if cleanup %}
-### Cleaning up
+## Cleaning up
{{ cleanup }}
@@ -61,7 +61,7 @@
{% if whatsnext %}
-### What's next
+## What's next
{{ whatsnext }}
diff --git a/_layouts/basic.html b/_layouts/basic.html
new file mode 100644
index 0000000000..d2b684df52
--- /dev/null
+++ b/_layouts/basic.html
@@ -0,0 +1,15 @@
+
+
+
+ {% include head.html %}
+
+
+ {% include header.html %}
+
+ {{ content }}
+
+ {% include footer.html %}
+
+ {% include footer-scripts.html %}
+
+
diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html
index 4ac68e8acd..073e1c9344 100755
--- a/_layouts/docwithnav.html
+++ b/_layouts/docwithnav.html
@@ -10,7 +10,11 @@
-{% include head-header.html %}
+{% include head.html %}
+
+
+
+{% include header.html %}
@@ -43,6 +47,7 @@
+
Edit This Page
@@ -71,57 +76,7 @@
{% include_cached footer.html %}
+{% include footer-scripts.html %}
-
-
-
-
-
diff --git a/case-studies/index.html b/case-studies/index.html
index f593d73fb9..e4e15111c5 100644
--- a/case-studies/index.html
+++ b/case-studies/index.html
@@ -1,11 +1,10 @@
---
title: Case Studies
+layout: basic
+class: gridPage
+cid: caseStudies
---
-
-
-{% include head-header.html %}
-
Kubernetes User Case Studies
A collection of users running Kubernetes in production.
@@ -98,8 +97,3 @@ title: Case Studies
-{% include footer.html %}
-{% include case-study-styles.html %}
-
-
-
diff --git a/case-studies/pearson.html b/case-studies/pearson.html
index 50f16ce7ae..45428b0bf3 100644
--- a/case-studies/pearson.html
+++ b/case-studies/pearson.html
@@ -1,11 +1,10 @@
---
title: Pearson Case Study
+layout: basic
+class: gridPage
+cid: caseStudies
---
-
-
-{% include head-header.html %}
-
@@ -80,9 +79,3 @@ title: Pearson Case Study
-
-{% include footer.html %}
-{% include case-study-styles.html %}
-
-
-