diff --git a/404.md b/404.md
index bf053c1e3b..3d32e81bcf 100644
--- a/404.md
+++ b/404.md
@@ -2,67 +2,9 @@
layout: docwithnav
title: 404 Error!
permalink: /404.html
+no_canonical: true
---
-
+
+
Sorry, this page was not found. :(
diff --git a/README.md b/README.md
index ad6c85778b..2801eaead0 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,13 @@ Welcome! We are very pleased you want to contribute to the documentation and/or
You can click the "Fork" button in the upper-right area of the screen to create a copy of our site on 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 the index page for your fork and click "New Pull Request" to let us know about it.
+For more information about contributing to the Kubernetes documentation, see:
+
+* [Creating a Documentation Pull Request](http://kubernetes.io/docs/contribute/create-pull-request/)
+* [Writing a New Topic](http://kubernetes.io/docs/contribute/write-new-topic/)
+* [Staging Your Documentation Changes](http://kubernetes.io/docs/contribute/stage-documentation-changes/)
+* [Using Page Templates](http://kubernetes.io/docs/contribute/page-templates/)
+
## Automatic Staging for Pull Requests
When you create a pull request (either against master or the upcoming release), your changes are staged in a custom subdomain on Netlify so that you can see your changes in rendered form before the PR is merged. You can use this to verify that everything is correct before the PR gets merged. To view your changes:
@@ -13,17 +20,17 @@ When you create a pull request (either against master or the upcoming release),
- Look for "deploy/netlify"; you'll see "Deploy Preview Ready!" if staging was successful
- Click "Details" to bring up the staged site and navigate to your changes
-## Release Branch Staging
+## Branch structure and staging
-The Kubernetes site maintains staged versions at a subdomain provided by Netlify. Every PR for the Kubernetes site, either against the master branch or the upcoming release branch, is staged automatically.
+The current version of the website is served out of the `master` branch. To make changes to the live docs, such as bug fixes, broken links, typos, etc, **target your pull request to the master branch**
-The staging site for the next upcoming Kubernetes release is here: [http://kubernetes-io-vnext-staging.netlify.com/](http://kubernetes-io-vnext-staging.netlify.com/)
+The `release-1.x` branch stores changes for **upcoming releases of Kubernetes**. For example, the `release-1.5` branch has changes for the 1.5 release. These changes target branches (and *not* master) to avoid publishing documentation updates prior to the release for which they're relevant. If you have a change for an upcoming release of Kubernetes, **target your pull request to the appropriate release branch**.
-The staging site reflects the current state of what's been merged in the release branch, or in other words, what the docs will look like for the next upcoming release. It's automatically updated as new PRs get merged.
+The staging site for the next upcoming Kubernetes release is here: [http://kubernetes-io-vnext-staging.netlify.com/](http://kubernetes-io-vnext-staging.netlify.com/). The staging site reflects the current state of what's been merged in the release branch, or in other words, what the docs will look like for the next upcoming release. It's automatically updated as new PRs get merged.
## Staging the site locally (using Docker)
-Don't like installing stuff? Download and run a local staging server with a single `docker run` command.
+Don't like installing stuff? Download and run a local staging server with a single `docker run` command.
git clone https://github.com/kubernetes/kubernetes.github.io.git
cd kubernetes.github.io
@@ -47,7 +54,7 @@ Install Ruby 2.2 or higher. If you're on Linux, run these commands:
apt-get install ruby2.2
apt-get install ruby2.2-dev
-* If you're on a Mac, follow [these instructions](https://gorails.com/setup/osx/).
+* If you're on a Mac, follow [these instructions](https://gorails.com/setup/osx/).
* If you're on a Windows machine you can use the [Ruby Installer](http://rubyinstaller.org/downloads/). During the installation make sure to check the option for *Add Ruby executables to your PATH*.
The remainder of the steps should work the same across operating systems.
@@ -140,16 +147,6 @@ That, of course, will send users to:
(Or whatever Kubernetes release that docs branch is associated with.)
-## Branch structure
-
-The current version of the website is served out of the `master` branch. To make changes to the live docs, such as bug fixes, broken links, typos, etc, **target your pull request to the master branch**.
-
-The `release-1.x` branches store changes for **upcoming releases of Kubernetes**. For example, the `release-1.5` branch has changes for the upcoming 1.5 release. These changes target branches (and *not* master) to avoid publishing documentation updates prior to the release for which they're relevant. If you have a change for an upcoming release of Kubernetes, **target your pull request to the appropriate release branch**.
-
-Changes in the "docsv2" branch (where we are testing a revamp of the docs) are automatically staged here:
-http://k8sdocs.github.io/docs/tutorials/
-
-
## Config yaml guidelines
Guidelines for config yamls that are included in the site docs. These
@@ -177,14 +174,7 @@ example. If creating an image for a doc, follow the
section on "Docker images" from the Kubernetes repository.
## Partners
-Kubernetes partners refers to the companies who contribute to the Kubernetes core codebase and/or extend their platform to support Kubernetes. Partners can get their logos added to the partner section of the [community page](http://k8s.io/community) by following the below steps and meeting the below logo specifications. Partners will also need to have a URL that is specific to integrating with Kubernetes ready; this URL will be the destination when the logo is clicked.
-
-* The partner product logo should be a transparent png image centered in a 215x125 px frame. (look at the existing logos for reference)
-* The logo must link to a URL that is specific to integrating with Kubernetes, hosted on the partner's site.
-* The logo should be named *product-name*_logo.png and placed in the `/images/community_logos` folder.
-* The image reference (including the link to the partner URL) should be added in `community.html` under `
...
`.
-* Please do not change the order of the existing partner images. Append your logo to the end of the list.
-* Once completed and tested the look and feel, submit the pull request.
+Kubernetes partners refers to the companies who contribute to the Kubernetes core codebase, extend their platform to support Kubernetes or provide managed services to users centered around the Kubernetes platform. Partners can get their services and offerings added to the [partner page](https://k8s.io/partners) by completing and submitting the [partner request form](https://goo.gl/qcSnZF). Once the information and assets are verified, the partner product/services will be listed in the partner page. This would typically take 7-10 days.
## Thank you!
diff --git a/_config.yml b/_config.yml
index 7ace374fca..5b7f442fd8 100644
--- a/_config.yml
+++ b/_config.yml
@@ -30,4 +30,3 @@ permalink: pretty
gems:
- jekyll-redirect-from
-
diff --git a/_data/concepts.yml b/_data/concepts.yml
index a69276201e..f9422daa98 100644
--- a/_data/concepts.yml
+++ b/_data/concepts.yml
@@ -1,4 +1,5 @@
bigheader: "Concepts"
+abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
toc:
- title: Concepts
path: /docs/concepts/
diff --git a/_data/docs-home.yml b/_data/docs-home.yml
new file mode 100644
index 0000000000..1cb8c9b05a
--- /dev/null
+++ b/_data/docs-home.yml
@@ -0,0 +1,5 @@
+bigheader: "Kubernetes Documentation"
+abstract: "Documentation for using and learning about Kubernetes."
+toc:
+- title: Kubernetes Documentation
+ path: /docs/
diff --git a/_data/globals.yml b/_data/globals.yml
index 73978ea750..2994e8b519 100644
--- a/_data/globals.yml
+++ b/_data/globals.yml
@@ -1,4 +1,5 @@
tocs:
+- docs-home
- guides
- tutorials
- tasks
diff --git a/_data/guides.yml b/_data/guides.yml
index 40d47b08d6..f3ed275e9f 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -1,8 +1,8 @@
bigheader: "Guides"
-abstract: "How to get started, and achieve tasks, using Kubernetes"
+abstract: "How to get started, and accomplish tasks, using Kubernetes."
toc:
- title: Guides
- path: /docs/
+ path: /docs/user-guide/
- title: Getting Started
section:
@@ -10,8 +10,12 @@ toc:
path: /docs/whatisk8s/
- title: Installing Kubernetes on Linux with kubeadm
path: /docs/getting-started-guides/kubeadm/
+ - title: Installing Kubernetes on AWS with kops
+ path: /docs/getting-started-guides/kops/
- title: Hello World on Google Container Engine
path: /docs/hellonode/
+ - title: Installing kubectl
+ path: /docs/getting-started-guides/kubectl/
- title: Downloading or Building Kubernetes
path: /docs/getting-started-guides/binary_release/
- title: Online Training Course
@@ -68,6 +72,8 @@ toc:
path: /docs/getting-started-guides/network-policy/walkthrough/
- title: Using Calico for NetworkPolicy
path: /docs/getting-started-guides/network-policy/calico/
+ - title: Using Romana for NetworkPolicy
+ path: /docs/getting-started-guides/network-policy/romana/
- title: Batch Jobs
section:
diff --git a/_data/samples.yml b/_data/samples.yml
index 52ac8d572a..3a9f0bcf28 100644
--- a/_data/samples.yml
+++ b/_data/samples.yml
@@ -12,6 +12,8 @@ toc:
path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rbd/
- title: CephFS
path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/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/
- title: Hazelcast
diff --git a/_data/support.yml b/_data/support.yml
index d287f0ecaa..1b8e80699a 100644
--- a/_data/support.yml
+++ b/_data/support.yml
@@ -6,8 +6,16 @@ toc:
- title: Contributing to the Kubernetes Docs
section:
+ - title: Creating a Documentation Pull Request
+ path: /docs/contribute/create-pull-request/
+ - title: Writing a New Topic
+ path: /docs/contribute/write-new-topic/
+ - title: Staging Your Documentation Changes
+ path: /docs/contribute/stage-documentation-changes/
- title: Using Page Templates
path: /docs/contribute/page-templates/
+ - title: Documentation Style Guide
+ path: /docs/contribute/style-guide/
- title: Troubleshooting
section:
diff --git a/_data/tasks.yml b/_data/tasks.yml
index 86209a52aa..9898fae32f 100644
--- a/_data/tasks.yml
+++ b/_data/tasks.yml
@@ -1,11 +1,28 @@
bigheader: "Tasks"
+abstract: "Step-by-step instructions for performing operations with Kuberentes."
toc:
- title: Tasks
path: /docs/tasks/
+- title: Configuring Pods and Containers
+ section:
+ - title: Defining Environment Variables for a Container
+ path: /docs/tasks/configure-pod-container/define-environment-variable-container/
+ - title: Defining a Command and Arguments for a Container
+ path: /docs/tasks/configure-pod-container/define-command-argument-container/
+ - title: Assigning CPU and RAM Resources to a Container
+ path: /docs/tasks/configure-pod-container/assign-cpu-ram-container/
- title: Accessing Applications in a Cluster
section:
- title: Using Port Forwarding to Access Applications in a Cluster
path: /docs/tasks/access-application-cluster/port-forward-access-application-cluster/
+
+
+- title: Debugging Applications in a Cluster
+ section:
+ - title: Determining the Reason for Pod Failure
+ path: /docs/tasks/debug-application-cluster/determine-reason-pod-failure/
+
+
- title: Accessing the Kubernetes API
section:
- title: Using an HTTP Proxy to Access the Kubernetes API
diff --git a/_data/tools.yml b/_data/tools.yml
index 8993e091bb..cf2afca34c 100644
--- a/_data/tools.yml
+++ b/_data/tools.yml
@@ -1,4 +1,5 @@
bigheader: "Tools"
+abstract: "Tools to help you use and enhance Kubernetes."
toc:
- title: Tools
path: /docs/tools/
diff --git a/_data/tutorials.yml b/_data/tutorials.yml
index e312523bcd..61555427d1 100644
--- a/_data/tutorials.yml
+++ b/_data/tutorials.yml
@@ -1,4 +1,5 @@
bigheader: "Tutorials"
+abstract: "Detailed walkthroughs of common Kubernetes operations and workflows."
toc:
- title: Tutorials
path: /docs/tutorials/
@@ -48,3 +49,9 @@ toc:
path: /docs/tutorials/stateless-application/run-stateless-application-deployment/
- title: Using a Service to Access an Application in a Cluster
path: /docs/tutorials/stateless-application/expose-external-ip-address-service/
+ - title: Exposing an External IP Address to Access an Application in a Cluster
+ path: /docs/tutorials/stateless-application/expose-external-ip-address/
+- title: Stateful Applications
+ section:
+ - title: Running a Single-Instance Stateful Application
+ path: /docs/tutorials/stateful-application/run-stateful-application/
diff --git a/_includes/footer.html b/_includes/footer.html
index f98dde06b5..e7fa36d26a 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -4,6 +4,7 @@
Get StartedDocumentationBlog
+ PartnersCommunityCase Studies
@@ -19,6 +20,8 @@
Events Calendar
A selector to restrict the list of returned objects by their fields. Defaults to everything.
+
false
+
string
+
+
+
+
QueryParameter
+
watch
+
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
+
false
+
boolean
+
+
+
+
QueryParameter
+
resourceVersion
+
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.
GET /apis/extensions/v1beta1/thirdpartyresources/{name}
+
GET /apis/extensions/v1beta1/watch/ingresses
@@ -12551,26 +12592,42 @@
QueryParameter
-
export
-
Should this value be exported. Export strips fields that a user can not specify.
+
labelSelector
+
A selector to restrict the list of returned objects by their labels. Defaults to everything.
+
false
+
string
+
+
+
+
QueryParameter
+
fieldSelector
+
A selector to restrict the list of returned objects by their fields. Defaults to everything.
+
false
+
string
+
+
+
+
QueryParameter
+
watch
+
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
false
boolean
QueryParameter
-
exact
-
Should the export be exact. Exact export maintains cluster-specific fields like Namespace
+
resourceVersion
+
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.
A selector to restrict the list of returned objects by their labels. Defaults to everything.
+
false
+
string
-
PathParameter
-
name
-
name of the ThirdPartyResource
-
true
+
QueryParameter
+
fieldSelector
+
A selector to restrict the list of returned objects by their fields. Defaults to everything.
+
false
string
+
+
QueryParameter
+
watch
+
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
+
false
+
boolean
+
+
+
+
QueryParameter
+
resourceVersion
+
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.
A selector to restrict the list of returned objects by their labels. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
fieldSelector
-
A selector to restrict the list of returned objects by their fields. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
watch
-
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
-
false
-
boolean
-
-
-
-
QueryParameter
-
resourceVersion
-
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.
A selector to restrict the list of returned objects by their labels. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
fieldSelector
-
A selector to restrict the list of returned objects by their fields. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
watch
-
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
-
false
-
boolean
-
-
-
-
QueryParameter
-
resourceVersion
-
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.
watch individual changes to a list of HorizontalPodAutoscaler
-
-
-
GET /apis/extensions/v1beta1/watch/horizontalpodautoscalers
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-
Type
-
Name
-
Description
-
Required
-
Schema
-
Default
-
-
-
-
-
QueryParameter
-
pretty
-
If true, then the output is pretty printed.
-
false
-
string
-
-
-
-
QueryParameter
-
labelSelector
-
A selector to restrict the list of returned objects by their labels. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
fieldSelector
-
A selector to restrict the list of returned objects by their fields. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
watch
-
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
-
false
-
boolean
-
-
-
-
QueryParameter
-
resourceVersion
-
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.
A selector to restrict the list of returned objects by their labels. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
fieldSelector
-
A selector to restrict the list of returned objects by their fields. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
watch
-
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
-
false
-
boolean
-
-
-
-
QueryParameter
-
resourceVersion
-
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.
A selector to restrict the list of returned objects by their labels. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
fieldSelector
-
A selector to restrict the list of returned objects by their fields. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
watch
-
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
-
false
-
boolean
-
-
-
-
QueryParameter
-
resourceVersion
-
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.
watch individual changes to a list of StorageClass
-
-
-
GET /apis/extensions/v1beta1/watch/storageclasses
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-
Type
-
Name
-
Description
-
Required
-
Schema
-
Default
-
-
-
-
-
QueryParameter
-
pretty
-
If true, then the output is pretty printed.
-
false
-
string
-
-
-
-
QueryParameter
-
labelSelector
-
A selector to restrict the list of returned objects by their labels. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
fieldSelector
-
A selector to restrict the list of returned objects by their fields. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
watch
-
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
-
false
-
boolean
-
-
-
-
QueryParameter
-
resourceVersion
-
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.
GET /apis/extensions/v1beta1/watch/storageclasses/{name}
-
-
-
-
Parameters
-
-
-
-
-
-
-
-
-
-
-
-
Type
-
Name
-
Description
-
Required
-
Schema
-
Default
-
-
-
-
-
QueryParameter
-
pretty
-
If true, then the output is pretty printed.
-
false
-
string
-
-
-
-
QueryParameter
-
labelSelector
-
A selector to restrict the list of returned objects by their labels. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
fieldSelector
-
A selector to restrict the list of returned objects by their fields. Defaults to everything.
-
false
-
string
-
-
-
-
QueryParameter
-
watch
-
Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
-
false
-
boolean
-
-
-
-
QueryParameter
-
resourceVersion
-
When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.