diff --git a/.gitignore b/.gitignore
index c54db9289e..460a88c521 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,21 @@ _site/**
CNAME
.travis.yml
.idea/
+
+# Vim ignore
+# source: https://github.com/github/gitignore/blob/master/Global/Vim.gitignore
+
+# swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+kubernetes.github.io.iml
diff --git a/.travis.yml b/.travis.yml
index 61caa32130..791d289e88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: go
go:
- - 1.6.2
+ - 1.7.3
# Don't want default ./... here:
install:
@@ -10,7 +10,14 @@ install:
- go get -t -v k8s.io/kubernetes.github.io/test
- 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
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver
+- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go
+- 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/
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
diff --git a/CNAME b/CNAME
index ed60cf1824..b0d9e9ad80 100644
--- a/CNAME
+++ b/CNAME
@@ -1,2 +1 @@
-kubernetes.io
-kubernet.es
+kubernetes.io
\ No newline at end of file
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/OWNERS b/OWNERS
index 247d39ea5e..055a328273 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,4 @@
assignees:
-- lavalamp
- smarterclayton
- janetkuo
- pwittrock
diff --git a/_data/concepts.yml b/_data/concepts.yml
index a9a7c3eb29..71c6512909 100644
--- a/_data/concepts.yml
+++ b/_data/concepts.yml
@@ -2,9 +2,16 @@ 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
+ - docs/concepts/abstractions/pod.md
+ - title: Controllers
+ section:
+ - docs/concepts/abstractions/controllers/statefulsets.md
- title: Object Metadata
section:
- docs/concepts/object-metadata/annotations.md
-- title: Controllers
- section:
- - docs/concepts/abstractions/controllers/statefulsets.md
diff --git a/_data/guides.yml b/_data/guides.yml
index 388f77289d..f66d0706ee 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
@@ -45,6 +46,7 @@ toc:
- docs/getting-started-guides/network-policy/walkthrough.md
- docs/getting-started-guides/network-policy/calico.md
- docs/getting-started-guides/network-policy/romana.md
+ - docs/getting-started-guides/network-policy/weave.md
- title: Batch Jobs
section:
@@ -64,11 +66,9 @@ toc:
- title: Containers and Pods
section:
- - docs/user-guide/simple-nginx.md
- - docs/user-guide/pods/single-container.md
- docs/user-guide/pods/multi-container.md
- - docs/user-guide/configuring-containers.md
- - docs/user-guide/production-pods.md
+ - docs/user-guide/pods/init-container.md
+ - docs/user-guide/pod-templates.md
- docs/user-guide/containers.md
- docs/user-guide/environment-guide/index.md
- docs/user-guide/compute-resources.md
@@ -84,8 +84,11 @@ toc:
- title: Monitoring, Logging, and Debugging Containers
section:
- docs/user-guide/monitoring.md
- - docs/getting-started-guides/logging.md
- - docs/getting-started-guides/logging-elasticsearch.md
+ - title: Logging
+ section:
+ - docs/user-guide/logging/overview.md
+ - docs/user-guide/logging/stackdriver.md
+ - docs/user-guide/logging/elasticsearch.md
- docs/user-guide/getting-into-containers.md
- docs/user-guide/connecting-to-applications-proxy.md
- docs/user-guide/connecting-to-applications-port-forward.md
@@ -119,7 +122,7 @@ toc:
- title: Custom Cloud Solutions
section:
- docs/getting-started-guides/coreos/index.md
- - /docs/getting-started-guides/juju/
+ - docs/getting-started-guides/ubuntu/index.md
- docs/getting-started-guides/rackspace.md
- title: On-Premise VMs
section:
@@ -127,7 +130,6 @@ toc:
- docs/getting-started-guides/cloudstack.md
- docs/getting-started-guides/vsphere.md
- docs/getting-started-guides/photon-controller.md
- - /docs/getting-started-guides/juju/
- docs/getting-started-guides/dcos.md
- docs/getting-started-guides/libvirt-coreos.md
- docs/getting-started-guides/ovirt.md
@@ -146,7 +148,26 @@ toc:
- 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/
+ - 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/calico.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/getting-started-guides/docker-multinode.md
@@ -160,11 +181,16 @@ toc:
- docs/admin/cluster-management.md
- docs/admin/kubeadm.md
- docs/admin/addons.md
+ - docs/admin/audit.md
+ - docs/admin/ha-master-gce.md
- docs/admin/namespaces/index.md
- docs/admin/namespaces/walkthrough.md
- docs/admin/limitrange/index.md
+ - docs/admin/disruptions.md
- docs/admin/resourcequota/index.md
- docs/admin/resourcequota/walkthrough.md
+ - docs/admin/rescheduler.md
+ - docs/admin/sysctls.md
- docs/admin/cluster-components.md
- docs/admin/etcd.md
- docs/admin/multi-cluster.md
@@ -186,5 +212,21 @@ toc:
- title: Administering Federation
section:
- - /docs/admin/federation/kubfed/
- - docs/admin/federation/index.md
+ - docs/admin/federation/kubefed.md
+ - title: Federated Kubernetes Objects
+ section:
+ - docs/user-guide/federation/index.md
+ - docs/user-guide/federation/configmap.md
+ - docs/user-guide/federation/daemonsets.md
+ - docs/user-guide/federation/deployment.md
+ - docs/user-guide/federation/events.md
+ - docs/user-guide/federation/federated-ingress.md
+ - docs/user-guide/federation/namespaces.md
+ - docs/user-guide/federation/replicasets.md
+ - docs/user-guide/federation/secrets.md
+ - docs/federation/api-reference/index.md
+ - title: Federation Components
+ section:
+ - docs/admin/federation-apiserver.md
+ - title : federation-controller-mananger
+ path: /docs/admin/federation-controller-manager
diff --git a/_data/reference.yml b/_data/reference.yml
index 475d87d10c..de1dec2c14 100644
--- a/_data/reference.yml
+++ b/_data/reference.yml
@@ -3,6 +3,21 @@ abstract: "Design docs, concept definitions, and references for APIs and CLIs."
toc:
- docs/reference.md
+- title: "Kubernetes Resource Types (New Docs Style)"
+ section:
+ - title: Version 1.5
+ path: /docs/resources-reference/v1.5/
+
+- title: "Kubernetes API (New Docs Style)"
+ section:
+ - title: Version 1.5
+ path: /docs/api-reference/v1.5/
+
+- title: "Kubectl Commands (New Docs Style)"
+ section:
+ - title: Version 1.5
+ path: /docs/user-guide/kubectl/v1.5/
+
- title: Kubernetes API
section:
- docs/api.md
@@ -15,6 +30,7 @@ toc:
- docs/admin/service-accounts-admin.md
- docs/api-reference/v1/operations.html
- docs/api-reference/v1/definitions.html
+ - docs/api-reference/labels-annotations-taints.md
- kubernetes/third_party/swagger-ui/index.md
- title: Autoscaling API
@@ -182,21 +198,3 @@ toc:
path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security_context.md
- title: Security in Kubernetes
path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security.md
-
-- title: Federation
- section:
- - docs/user-guide/federation/index.md
- - docs/user-guide/federation/configmap.md
- - docs/user-guide/federation/daemonsets.md
- - docs/user-guide/federation/deployment.md
- - docs/user-guide/federation/events.md
- - docs/user-guide/federation/federated-ingress.md
- - docs/user-guide/federation/namespaces.md
- - docs/user-guide/federation/replicasets.md
- - docs/user-guide/federation/secrets.md
- - docs/federation/api-reference/README.md
- - title: Federation Components
- section:
- - docs/admin/federation-apiserver.md
- - title : federation-controller-mananger
- path: /docs/admin/federation-controller-manager
diff --git a/_data/support.yml b/_data/support.yml
index efb049ccb1..a6b13e9d09 100644
--- a/_data/support.yml
+++ b/_data/support.yml
@@ -3,20 +3,10 @@ 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/style-guide.md
-
- title: Troubleshooting
section:
- docs/user-guide/debugging-pods-and-replication-controllers.md
- docs/user-guide/introspection-and-debugging.md
- - docs/user-guide/logging.md
- docs/user-guide/application-troubleshooting.md
- docs/admin/cluster-troubleshooting.md
- docs/user-guide/debugging-services.md
@@ -30,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
@@ -39,3 +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 05a880637a..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
@@ -10,10 +10,16 @@ toc:
- docs/tasks/configure-pod-container/assign-cpu-ram-container.md
- docs/tasks/configure-pod-container/configure-volume-storage.md
- docs/tasks/configure-pod-container/distribute-credentials-secure.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/communicate-containers-same-pod.md
+ - docs/tasks/configure-pod-container/configure-pod-initialization.md
+ - docs/tasks/configure-pod-container/attach-handler-lifecycle-event.md
- title: Accessing Applications in a Cluster
section:
- docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
+ - docs/tasks/access-application-cluster/load-balance-access-application-cluster.md
- title: Debugging Applications in a Cluster
section:
@@ -26,9 +32,9 @@ toc:
- title: Administering a Cluster
section:
- docs/tasks/administer-cluster/assign-pods-nodes.md
-
- docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
- docs/tasks/administer-cluster/safely-drain-node.md
+ - docs/tasks/administer-cluster/change-pv-reclaim-policy.md
- title: Managing Stateful Applications
section:
@@ -41,4 +47,4 @@ toc:
- title: Troubleshooting
section:
- docs/tasks/troubleshoot/debug-init-containers.md
- - /docs/tasks/administer-cluster/access-control-identity-management/
+ - docs/tasks/administer-cluster/access-control-identity-management/
diff --git a/_data/tools.yml b/_data/tools.yml
index 92764f795a..b5e3a29e7f 100644
--- a/_data/tools.yml
+++ b/_data/tools.yml
@@ -16,8 +16,7 @@ toc:
- title: Third-Party Tools
section:
+ - docs/tools/kompose/index.md
+ - docs/tools/kompose/user-guide.md
- title: Helm
path: https://github.com/kubernetes/helm
- - title: Kompose
- path: https://github.com/kubernetes-incubator/kompose
-
diff --git a/_data/tutorials.yml b/_data/tutorials.yml
index 08e8b0b46a..954d0841a1 100644
--- a/_data/tutorials.yml
+++ b/_data/tutorials.yml
@@ -41,3 +41,6 @@ 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: 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/_includes/tree.html b/_includes/tree.html
index 4aeaeb0176..78505504f1 100644
--- a/_includes/tree.html
+++ b/_includes/tree.html
@@ -12,9 +12,9 @@
{% assign path = item.path %}
{% assign title = item.title %}
{% else %}
- {% assign page = site.pages | where: "path", item | first %}
- {% assign title = page.title %}
- {% assign path = page.url %}
+ {% assign found_page = site.pages | where: "path", item | first %}
+ {% assign title = found_page.title %}
+ {% assign path = found_page.url %}
{% endif %}
{% endcapture %}
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 %}
-
-
-