When you deploy applications on Kubernetes, you tell the master to start the application containers. The master schedules the containers to run on the cluster's nodes. The nodes communicate with the master using the Kubernetes API, which the master exposes. End users can also use the Kubernetes API directly to interact with the cluster.
-
A Kubernetes cluster can be deployed on either physical or virtual machines. To get started with Kubernetes development, you can use minikube. Minikube is a is a lightweight Kubernetes implementation that creates a VM on your local machine and deploys a simple cluster containing only one node. Minikube is available for Linux, Mac OS and Windows systems. The minikube CLI provides basic bootstrapping operations for working with your cluster, including start, stop, status, and delete. For this bootcamp, however, you'll use a provided online terminal with minikube pre-installed.
+
A Kubernetes cluster can be deployed on either physical or virtual machines. To get started with Kubernetes development, you can use minikube. Minikube is a lightweight Kubernetes implementation that creates a VM on your local machine and deploys a simple cluster containing only one node. Minikube is available for Linux, Mac OS and Windows systems. The minikube CLI provides basic bootstrapping operations for working with your cluster, including start, stop, status, and delete. For this bootcamp, however, you'll use a provided online terminal with minikube pre-installed.
Now that you know what Kubernetes is, let’s go to the online tutorial and start our first cluster!
diff --git a/docs/tutorials/kubernetes-basics/index.html b/docs/tutorials/kubernetes-basics/index.html
index 723639552b..d678461e41 100644
--- a/docs/tutorials/kubernetes-basics/index.html
+++ b/docs/tutorials/kubernetes-basics/index.html
@@ -42,49 +42,49 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -93,7 +93,7 @@
diff --git a/docs/tutorials/stateless-application/deployment-scale.yaml b/docs/tutorials/stateless-application/deployment-scale.yaml
new file mode 100644
index 0000000000..2968b88360
--- /dev/null
+++ b/docs/tutorials/stateless-application/deployment-scale.yaml
@@ -0,0 +1,16 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: nginx-deployment
+spec:
+ replicas: 4
+ template:
+ metadata:
+ labels:
+ app: nginx
+ spec:
+ containers:
+ - name: nginx
+ image: nginx:1.8 # Update the version of nginx from 1.7.9 to 1.8
+ ports:
+ - containerPort: 80
diff --git a/docs/tutorials/stateless-application/expose-external-ip-address.md b/docs/tutorials/stateless-application/expose-external-ip-address.md
new file mode 100644
index 0000000000..63aabb813d
--- /dev/null
+++ b/docs/tutorials/stateless-application/expose-external-ip-address.md
@@ -0,0 +1,153 @@
+---
+---
+
+{% capture overview %}
+
+This page shows how to create a Kubernetes Service object that exposees an
+external IP address.
+
+{% endcapture %}
+
+
+{% capture prerequisites %}
+
+* Install [kubectl](http://kubernetes.io/docs/user-guide/prereqs).
+
+* Use a cloud provider like Google Container Engine or Amazon Web Services to
+ create a Kubernetes cluster. This tutorial creates an
+ [external load balancer](/docs/user-guide/load-balancer/),
+ which requires a cloud provider.
+
+* Configure `kubectl` to communicate with your Kubernetes API server. For
+ instructions, see the documentation for your cloud provider.
+
+{% endcapture %}
+
+
+{% capture objectives %}
+
+* Run five instances of a Hello World application.
+* Create a Service object that exposes an external IP address.
+* Use the Service object to access the running application.
+
+{% endcapture %}
+
+
+{% capture lessoncontent %}
+
+### Creating a service for an application running in five pods
+
+1. Run a Hello World application in your cluster:
+
+ kubectl run hello-world --replicas=5 --labels="run=load-balancer-example" --image=gcr.io/google-samples/node-hello:1.0 --port=8080
+
+ The preceding command creates a
+ [Deployment](/docs/user-guide/deployments/)
+ object and an associated
+ [ReplicaSet](/docs/user-guide/replicasets/)
+ object. The ReplicaSet has five
+ [Pods](/docs/user-guide/pods/),
+ each of which runs the Hello World application.
+
+1. Display information about the Deployment:
+
+ kubectl get deployments hello-world
+ kubectl describe deployments hello-world
+
+1. Display information about your ReplicaSet objects:
+
+ kubectl get replicasets
+ kubectl describe replicasets
+
+1. Create a Service object that exposes the deployment:
+
+ kubectl expose deployment hello-world --type=LoadBalancer --name=my-service
+
+1. Display information about the Service:
+
+ kubectl get services my-service
+
+ The output is similar to this:
+
+ NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE
+ my-service 10.3.245.137 104.198.205.71 8080/TCP 54s
+
+ Note: If the external IP address is shown as
, wait for a minute
+ and enter the same command again.
+
+1. Display detailed information about the Service:
+
+ kubectl describe services my-service
+
+ The output is similar to this:
+
+ Name: my-service
+ Namespace: default
+ Labels: run=load-balancer-example
+ Selector: run=load-balancer-example
+ Type: LoadBalancer
+ IP: 10.3.245.137
+ LoadBalancer Ingress: 104.198.205.71
+ Port: 8080/TCP
+ NodePort: 32377/TCP
+ Endpoints: 10.0.0.6:8080,10.0.1.6:8080,10.0.1.7:8080 + 2 more...
+ Session Affinity: None
+ Events:
+
+ Make a note of the external IP address exposed by your service. In this
+ example, the external IP address is 104.198.205.71. Also note
+ the value of Port. In this example, the port is 8080.
+
+1. In the preceding output, you can see that the service has several endpoints:
+ 10.0.0.6:8080,10.0.1.6:8080,10.0.1.7:8080 + 2 more. These are internal
+ addresses of the pods that are running the Hello World application. To
+ verify these are pod addresses, enter this command:
+
+ kubectl get pods --output=wide
+
+ The output is similar to this:
+
+ NAME ... IP NODE
+ hello-world-2895499144-1jaz9 ... 10.0.1.6 gke-cluster-1-default-pool-e0b8d269-1afc
+ hello-world-2895499144-2e5uh ... 0.0.1.8 gke-cluster-1-default-pool-e0b8d269-1afc
+ hello-world-2895499144-9m4h1 ... 10.0.0.6 gke-cluster-1-default-pool-e0b8d269-5v7a
+ hello-world-2895499144-o4z13 ... 10.0.1.7 gke-cluster-1-default-pool-e0b8d269-1afc
+ hello-world-2895499144-segjf ... 10.0.2.5 gke-cluster-1-default-pool-e0b8d269-cpuc
+
+1. Use the external IP address to access the Hello World application:
+
+ curl http://:
+
+ where `` us the external IP address of your Service,
+ and `` is the value of `Port` in your Service description.
+
+ The response to a successful request is a hello message:
+
+ Hello Kubernetes!
+
+{% endcapture %}
+
+
+{% capture cleanup %}
+
+To delete the Service, enter this command:
+
+ kubectl delete services my-service
+
+To delete the Deployment, the ReplicaSet, and the Pods that are running
+the Hello World application, enter this command:
+
+ kubectl delete deployment hello-world
+
+{% endcapture %}
+
+
+{% capture whatsnext %}
+
+Learn more about
+[connecting applications with services](/docs/user-guide/connecting-applications/).
+{% endcapture %}
+
+{% include templates/tutorial.md %}
+
+
diff --git a/docs/tutorials/stateless-application/run-stateless-application-deployment.md b/docs/tutorials/stateless-application/run-stateless-application-deployment.md
index 70aeb925c2..20a7aff243 100644
--- a/docs/tutorials/stateless-application/run-stateless-application-deployment.md
+++ b/docs/tutorials/stateless-application/run-stateless-application-deployment.md
@@ -94,6 +94,30 @@ specifies that the deployment should be updated to use nginx 1.8.
kubectl get pods -l app=nginx
+### Scaling the application by increasing the replica count
+
+You can increase the number of pods in your Deployment by applying a new YAML
+file. This YAML file sets `replicas` to 4, which specifies that the Deployment
+should have four pods:
+
+{% include code.html language="yaml" file="deployment-scale.yaml" ghlink="/docs/tutorials/stateless-application/deployment-scale.yaml" %}
+
+1. Apply the new YAML file:
+
+ kubectl apply -f $REPO/docs/tutorials/stateless-application/deployment-scale.yaml
+
+1. Verify that the Deployment has four pods:
+
+ kubectl get pods
+
+ The output is similar to this:
+
+ NAME READY STATUS RESTARTS AGE
+ nginx-deployment-148880595-4zdqq 1/1 Running 0 25s
+ nginx-deployment-148880595-6zgi1 1/1 Running 0 25s
+ nginx-deployment-148880595-fxcez 1/1 Running 0 2m
+ nginx-deployment-148880595-rwovn 1/1 Running 0 2m
+
### Deleting a deployment
Delete the deployment by name:
diff --git a/docs/user-guide/federation/federated-ingress.md b/docs/user-guide/federation/federated-ingress.md
index 42e5ad536d..87965a3fc7 100644
--- a/docs/user-guide/federation/federated-ingress.md
+++ b/docs/user-guide/federation/federated-ingress.md
@@ -18,7 +18,7 @@ automatically checks the health of the pods comprising the service,
and avoids sending requests to unresponsive or slow pods (or entire
unresponsive clusters).
-Federated Ingress is released as a beta feature, and supports Google Cloud (GKE,
+Federated Ingress is released as an alpha feature, and supports Google Cloud Platform (GKE,
GCE and hybrid scenarios involving both) in Kubernetes v1.4. Work is under way to support other cloud
providers such as AWS, and other hybrid cloud scenarios (e.g. services
spanning private on-premise as well as public cloud Kubernetes
diff --git a/docs/user-guide/federation/replicasets.md b/docs/user-guide/federation/replicasets.md
index 805da57782..d0ceaa8bde 100644
--- a/docs/user-guide/federation/replicasets.md
+++ b/docs/user-guide/federation/replicasets.md
@@ -35,7 +35,7 @@ The API for Federated Replica Set is 100% compatible with the
API for traditional Kubernetes Replica Set. You can create a replica set by sending
a request to the federation apiserver.
-You can do that using [kubectl](/docs/user-guide/kubectl/kubectl/) by running:
+You can do that using [kubectl](/docs/user-guide/kubectl/) by running:
``` shell
kubectl --context=federation-cluster create -f myrs.yaml
diff --git a/docs/user-guide/federation/secrets.md b/docs/user-guide/federation/secrets.md
index 7e7a27fc7a..763b53e98e 100644
--- a/docs/user-guide/federation/secrets.md
+++ b/docs/user-guide/federation/secrets.md
@@ -35,7 +35,7 @@ The API for Federated Secret is 100% compatible with the
API for traditional Kubernetes Secret. You can create a secret by sending
a request to the federation apiserver.
-You can do that using [kubectl](/docs/user-guide/kubectl/kubectl/) by running:
+You can do that using [kubectl](/docs/user-guide/kubectl/) by running:
``` shell
kubectl --context=federation-cluster create -f mysecret.yaml
diff --git a/docs/user-guide/kubectl-conventions.md b/docs/user-guide/kubectl-conventions.md
index f4398362da..a22973f16f 100644
--- a/docs/user-guide/kubectl-conventions.md
+++ b/docs/user-guide/kubectl-conventions.md
@@ -8,11 +8,11 @@ assignees:
* TOC
{:toc}
-## Using `kubectl` in Reusable Scripts
+## Using `kubectl` in Reusable Scripts
If you need stable output in a script, you should:
-* Request one of the machine-oriented output forms, such as `-o name`, `-o json`, `-o yaml`, `-o go-template`, or `-o jsonpath`
+* Request one of the machine-oriented output forms, such as `-o name`, `-o json`, `-o yaml`, `-o go-template`, or `-o jsonpath`
* Specify `--output-version`, since those output forms (other than `-o name`) output the resource using a particular API version
* Specify `--generator` to pin to a specific behavior forever, if using generator-based commands (such as `kubectl run` or `kubectl expose`)
* Don't rely on context, preferences, or other implicit state
@@ -27,8 +27,46 @@ In order for `kubectl run` to satisfy infrastructure as code:
* If the image is lightly parameterized, capture the parameters in a checked-in script, or at least use `--record`, to annotate the created objects with the command line.
* If the image is heavily parameterized, definitely check in the script.
* If features are needed that are not expressible via `kubectl run` flags, switch to configuration files checked into source control.
-* Pin to a specific generator version, such as `kubectl run --generator=deployment/v1beta1`
+* Pin to a specific [generator](#generators) version, such as `kubectl run --generator=deployment/v1beta1`
+
+#### Generators
+
+`kubectl run` allows you to generate the following resources (using `--generator` flag):
+
+* Pod - use `run-pod/v1`.
+* Replication controller - use `run/v1`.
+* Deployment - use `deployment/v1beta1`.
+* Job (using `extension/v1beta1` endpoint) - use `job/v1beta1`.
+* Job - use `job/v1`.
+* ScheduledJob - use `scheduledjob/v2alpha1`.
+
+Additionally, if you didn't specify a generator flag, other flags will suggest using
+a specific generator. Below table shows which flags force using specific generators,
+depending on your cluster version:
+
+| Generated Resource | Cluster v1.4 | Cluster v1.3 | Cluster v1.2 | Cluster v1.1 and eariler |
+|:----------------------:|-----------------------|-----------------------|--------------------------------------------|--------------------------------------------|
+| Pod | `--restart=Never` | `--restart=Never` | `--generator=run-pod/v1` | `--restart=OnFailure` OR `--restart=Never` |
+| Replication Controller | `--generator=run/v1` | `--generator=run/v1` | `--generator=run/v1` | `--restart=Always` |
+| Deployment | `--restart=Always` | `--restart=Always` | `--restart=Always` | N/A |
+| Job | `--restart=OnFailure` | `--restart=OnFailure` | `--restart=OnFailure` OR `--restart=Never` | N/A |
+| Scheduled Job | `--schedule=` | N/A | N/A | N/A |
+
+Note that these flags will use a default generator only when you have not specified
+any flag. This also means that combining `--generator` with other flags won't
+change the generator you specified. For example, in a 1.4 cluster, if you specify
+`--restart=Always`, a Deployment will be created; if you specify `--restart=Always`
+and `--generator=run/v1`, a Replication Controller will be created instead.
+This becomes handy if you want to pin to a specific behavior with the generator,
+even when the defaulted generator is changed in the future.
+
+Finally, the order in which flags set the generator is: schedule flag has the highest
+priority, then restart policy and finally the generator itself.
+
+If in doubt about the final resource being created, you can always use `--dry-run`
+flag, which will provide the object to be submitted to the cluster.
+
### `kubectl apply`
-* To use `kubectl apply` to update resources, always create resources initially with `kubectl apply` or with `--save-config`. See [managing resources with kubectl apply](/docs/user-guide/managing-deployments/#kubectl-apply) for the reason behind it.
+* To use `kubectl apply` to update resources, always create resources initially with `kubectl apply` or with `--save-config`. See [managing resources with kubectl apply](/docs/user-guide/managing-deployments/#kubectl-apply) for the reason behind it.
diff --git a/docs/user-guide/kubectl-overview.md b/docs/user-guide/kubectl-overview.md
index 3607f47d53..cc08e47c68 100644
--- a/docs/user-guide/kubectl-overview.md
+++ b/docs/user-guide/kubectl-overview.md
@@ -55,14 +55,15 @@ Operation | Syntax | Description
`api-versions` | `kubectl api-versions [flags]` | List the API versions that are available.
`apply` | `kubectl apply -f FILENAME [flags]`| Apply a configuration change to a resource from a file or stdin.
`attach` | `kubectl attach POD -c CONTAINER [-i] [-t] [flags]` | Attach to a running container either to view the output stream or interact with the container (stdin).
-`autoscale` | `autoscale (-f FILENAME | TYPE NAME | TYPE/NAME) [--min=MINPODS] --max=MAXPODS [--cpu-percent=CPU] [flags]` | Automatically scale the set of pods that are managed by a replication controller.
+`autoscale` | `kubectl autoscale (-f FILENAME | TYPE NAME | TYPE/NAME) [--min=MINPODS] --max=MAXPODS [--cpu-percent=CPU] [flags]` | Automatically scale the set of pods that are managed by a replication controller.
`cluster-info` | `kubectl cluster-info [flags]` | Display endpoint information about the master and services in the cluster.
`config` | `kubectl config SUBCOMMAND [flags]` | Modifies kubeconfig files. See the individual subcommands for details.
`create` | `kubectl create -f FILENAME [flags]` | Create one or more resources from a file or stdin.
`delete` | `kubectl delete (-f FILENAME | TYPE [NAME | /NAME | -l label | --all]) [flags]` | Delete resources either from a file, stdin, or specifying label selectors, names, resource selectors, or resources.
`describe` | `kubectl describe (-f FILENAME | TYPE [NAME_PREFIX | /NAME | -l label]) [flags]` | Display the detailed state of one or more resources.
`edit` | `kubectl edit (-f FILENAME | TYPE NAME | TYPE/NAME) [flags]` | Edit and update the definition of one or more resources on the server by using the default editor.
-`exec` | `kubectl exec POD [-c CONTAINER] [-i] [-t] [flags] [-- COMMAND [args...]]` | Execute a command against a container in a pod.
+`exec` | `kubectl exec POD [-c CONTAINER] [-i] [-t] [flags] [-- COMMAND [args...]]` | Execute a command against a container in a pod,
+`explain` | `kubectl explain [--include-extended-apis=true] [--recursive=false] [flags]` | Get documentation of various resources. For instance pods, nodes, services, etc.
`expose` | `kubectl expose (-f FILENAME | TYPE NAME | TYPE/NAME) [--port=port] [--protocol=TCP|UDP] [--target-port=number-or-name] [--name=name] [----external-ip=external-ip-of-service] [--type=type] [flags]` | Expose a replication controller, service, or pod as a new Kubernetes service.
`get` | `kubectl get (-f FILENAME | TYPE [NAME | /NAME | -l label]) [--watch] [--sort-by=FIELD] [[-o | --output]=OUTPUT_FORMAT] [flags]` | List one or more resources.
`label` | `kubectl label (-f FILENAME | TYPE NAME | TYPE/NAME) KEY_1=VAL_1 ... KEY_N=VAL_N [--overwrite] [--all] [--resource-version=version] [flags]` | Add or update the labels of one or more resources.
diff --git a/docs/user-guide/persistent-volumes/index.md b/docs/user-guide/persistent-volumes/index.md
index 5232f068cd..8c69a75379 100644
--- a/docs/user-guide/persistent-volumes/index.md
+++ b/docs/user-guide/persistent-volumes/index.md
@@ -150,7 +150,7 @@ In the CLI, the access modes are abbreviated to:
| HostPath | x | - | - |
| iSCSI | x | x | - |
| NFS | x | x | x |
-| RDB | x | x | - |
+| RBD | x | x | - |
| VsphereVolume | x | - | - |
### Class
diff --git a/docs/user-guide/petset/bootstrapping/index.md b/docs/user-guide/petset/bootstrapping/index.md
index e9b04fc135..03ba721edc 100644
--- a/docs/user-guide/petset/bootstrapping/index.md
+++ b/docs/user-guide/petset/bootstrapping/index.md
@@ -8,7 +8,7 @@
This purpose of this guide is to help you become familiar with the runtime initialization of [Pet Sets](/docs/user-guide/petset). This guide assumes the same prerequisites, and uses the same terminology as the [Pet Set user document](/docs/user-guide/petset).
-The most common way to initialize the runtime in a containerized environment, is through a custom [entrypoint](https://docs.docker.com/engine/reference/builder/#entrypoint). While this is not necessarily bad, making your application pid 1, and treating containers as processes in general is good for a few reasons outside the scope of this document. Doing so allows you to run docker images from third-party vendors without modification. We will not be writing custom entrypoints for this example, but using a feature called [init containers](http://releases.k8s.io/{{page.githubbranch}}/docs/proposals/container-init.md), to explain 2 common patterns that come up deploying Pet Sets.
+The most common way to initialize the runtime in a containerized environment, is through a custom [entrypoint](https://docs.docker.com/engine/reference/builder/#entrypoint). While this is not necessarily bad, making your application pid 1, and treating containers as processes in general is good for a few reasons outside the scope of this document. Doing so allows you to run docker images from third-party vendors without modification. We will not be writing custom entrypoints for this example, but using a feature called [init containers](http://kubernetes.io/docs/user-guide/production-pods/#handling-initialization), to explain 2 common patterns that come up deploying Pet Sets.
1. Transferring state across Pet restart, so that a future Pet is initialized with the computations of its past incarnation
2. Initializing the runtime environment of a Pet based on existing conditions, like a list of currently healthy peers
diff --git a/docs/user-guide/prereqs.md b/docs/user-guide/prereqs.md
index dfba1542af..e6b94baa62 100644
--- a/docs/user-guide/prereqs.md
+++ b/docs/user-guide/prereqs.md
@@ -5,7 +5,7 @@ assignees:
---
-To deploy and manage applications on Kubernetes, you’ll use the Kubernetes command-line tool, [kubectl](/docs/user-guide/kubectl/kubectl/). It lets you inspect your cluster resources, create, delete, and update components, and much more. You will use it to look at your new cluster and bring up example apps.
+To deploy and manage applications on Kubernetes, you’ll use the Kubernetes command-line tool, [kubectl](/docs/user-guide/kubectl/). It lets you inspect your cluster resources, create, delete, and update components, and much more. You will use it to look at your new cluster and bring up example apps.
## Installing kubectl
diff --git a/docs/user-guide/production-pods.md b/docs/user-guide/production-pods.md
index efd1c43e43..c345ada200 100644
--- a/docs/user-guide/production-pods.md
+++ b/docs/user-guide/production-pods.md
@@ -169,7 +169,7 @@ If no resource requirements are specified, a nominal amount of resources is assu
{% include code.html language="yaml" file="redis-resource-deployment.yaml" ghlink="/docs/user-guide/redis-resource-deployment.yaml" %}
-The container will die due to OOM (out of memory) if it exceeds its specified limit, so specifying a value a little higher than expected generally improves reliability. By specifying request, pod is guaranteed to be able to use that much of resource when needed. See [Resource QoS](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/proposals/resource-qos.md) for the difference between resource limits and requests.
+The container will die due to OOM (out of memory) if it exceeds its specified limit, so specifying a value a little higher than expected generally improves reliability. By specifying request, pod is guaranteed to be able to use that much of resource when needed. See [Resource QoS](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/resource-qos.md) for the difference between resource limits and requests.
If you're not sure how much resources to request, you can first launch the application without specifying resources, and use [resource usage monitoring](/docs/user-guide/monitoring) to determine appropriate values.
@@ -194,13 +194,13 @@ Applications often need a set of initialization steps prior to performing their
* Registering the pod into a central database, or fetching remote configuration from that database
* Downloading application dependencies, seed data, or preconfiguring disk
-Kubernetes now includes an alpha feature known as **init containers**, which are one or more containers in a pod that get a chance to run and initialize shared volumes prior to the other application containers starting. An init container is exactly like a regular container, except that it always runs to completion and each init container must complete successfully before the next one is started. If the init container fails (exits with a non-zero exit code) on a `RestartNever` pod the pod will fail - otherwise it will be restarted until it succeeds or the user deletes the pod.
+Kubernetes now includes a beta feature known as **init containers**, which are one or more containers in a pod that get a chance to run and initialize shared volumes prior to the other application containers starting. An init container is exactly like a regular container, except that it always runs to completion and each init container must complete successfully before the next one is started. If the init container fails (exits with a non-zero exit code) on a `RestartNever` pod the pod will fail - otherwise it will be restarted until it succeeds or the user deletes the pod.
-Since init containers are an alpha feature, they are specified by setting the `pod.alpha.kubernetes.io/init-containers` annotation on a pod (or replica set, deployment, daemon set, pet set, or job). The value of the annotation must be a string containing a JSON array of container definitions:
+Since init containers are a beta feature, they are specified by setting the `pod.beta.kubernetes.io/init-containers` annotation on a pod (or replica set, deployment, daemon set, pet set, or job). The value of the annotation must be a string containing a JSON array of container definitions:
{% include code.html language="yaml" file="nginx-init-containers.yaml" ghlink="/docs/user-guide/nginx-init-containers.yaml" %}
-The status of the init containers is returned as another annotation - `pod.alpha.kubernetes.io/init-container-statuses` -- as an array of the container statuses (similar to the `status.containerStatuses` field).
+The status of the init containers is returned as another annotation - `pod.beta.kubernetes.io/init-container-statuses` -- as an array of the container statuses (similar to the `status.containerStatuses` field).
Init containers support all of the same features as normal containers, including resource limits, volumes, and security settings. The resource requests and limits for an init container are handled slightly different than normal containers since init containers are run one at a time instead of all at once - any limits or quotas will be applied based on the largest init container resource quantity, rather than as the sum of quantities. Init containers do not support readiness probes since they will run to completion before the pod can be ready.
diff --git a/docs/user-guide/replicasets.md b/docs/user-guide/replicasets.md
index 27e9e3da88..d06be55328 100644
--- a/docs/user-guide/replicasets.md
+++ b/docs/user-guide/replicasets.md
@@ -18,7 +18,7 @@ the selector support. Replica Set supports the new set-based selector requiremen
as described in the [labels user guide](/docs/user-guide/labels/#label-selectors)
whereas a Replication Controller only supports equality-based selector requirements.
-Most [`kubectl`](/docs/user-guide/kubectl/kubectl/) commands that support
+Most [`kubectl`](/docs/user-guide/kubectl/) commands that support
Replication Controllers also support Replica Sets. One exception is the
[`rolling-update`](/docs/user-guide/kubectl/kubectl_rolling-update/) command. If
you want the rolling update functionality please consider using Deployments
diff --git a/docs/user-guide/secrets/index.md b/docs/user-guide/secrets/index.md
index 4da56a3cca..f9931bfbf5 100644
--- a/docs/user-guide/secrets/index.md
+++ b/docs/user-guide/secrets/index.md
@@ -284,7 +284,7 @@ For example, you can specify a default mode like this:
"image": "redis",
"volumeMounts": [{
"name": "foo",
- "mountPath": "/etc/foo",
+ "mountPath": "/etc/foo"
}]
}],
"volumes": [{
@@ -322,7 +322,7 @@ permission for different files like this:
"image": "redis",
"volumeMounts": [{
"name": "foo",
- "mountPath": "/etc/foo",
+ "mountPath": "/etc/foo"
}]
}],
"volumes": [{
diff --git a/docs/user-guide/ui.md b/docs/user-guide/ui.md
index 0efdb3fd1f..84e0adabc6 100644
--- a/docs/user-guide/ui.md
+++ b/docs/user-guide/ui.md
@@ -163,7 +163,7 @@ Workloads are categorized as follows:
* [Daemon Sets](http://kubernetes.io/docs/admin/daemons/) which ensure that all or some of the nodes in your cluster run a copy of a Pod.
* [Deployments](http://kubernetes.io/docs/user-guide/deployments/) which provide declarative updates for Pods and Replica Sets (the next-generation [Replication Controller](http://kubernetes.io/docs/user-guide/replication-controller/))
The Details page for a Deployment lists resource details, as well as new and old Replica Sets. The resource details also include information on the [RollingUpdate](http://kubernetes.io/docs/user-guide/rolling-updates/) strategy, if any.
-* [Pet Sets](http://kubernetes.io/docs/user-guide/load-balancer/) (nominal Services, also known as load-balanced Services) for legacy application support.
+* [Pet Sets](http://kubernetes.io/docs/user-guide/petset/) (nominal Services, also known as load-balanced Services) for legacy application support.
* [Replica Sets](http://kubernetes.io/docs/user-guide/replicasets/) for using label selectors.
* [Jobs](http://kubernetes.io/docs/user-guide/jobs/) for creating one or more Pods, ensuring that a specified number of them successfully terminate, and tracking the completions.
* [Replication Controllers](http://kubernetes.io/docs/user-guide/replication-controller/)
diff --git a/docs/user-guide/volumes.md b/docs/user-guide/volumes.md
index e33bd3e018..a7e0b3c2ba 100644
--- a/docs/user-guide/volumes.md
+++ b/docs/user-guide/volumes.md
@@ -126,9 +126,10 @@ Watch out when using this type of volume, because:
behave differently on different nodes due to different files on the nodes
* when Kubernetes adds resource-aware scheduling, as is planned, it will not be
able to account for resources used by a `hostPath`
-* the directories created on the underlying hosts are only writable by root, you either need
- to run your process as root in a privileged container or modify the file permissions on
- the host to be able to write to a `hostPath` volume
+* the directories created on the underlying hosts are only writable by root. You
+ either need to run your process as root in a
+ [privileged container](/docs/user-guide/security-context) or modify the file
+ permissions on the host to be able to write to a `hostPath` volume
#### Example pod
diff --git a/js/redirects.js b/js/redirects.js
new file mode 100644
index 0000000000..dc3cbb56ed
--- /dev/null
+++ b/js/redirects.js
@@ -0,0 +1,60 @@
+$( document ).ready(function() {
+ var oldURLs=["/README.md","/README.html",".html",".md","/v1.1/","/v1.0/"];
+ var fwdDirs=["examples/","cluster/","docs/devel","docs/design"];
+ var doRedirect = false;
+ var notHere = false;
+ var forwardingURL=window.location.href;
+
+ var redirects = [{
+ "from": "third_party/swagger-ui",
+ "to": "http://kubernetes.io/kubernetes/third_party/swagger-ui/"
+ },
+ {
+ "from": "resource-quota",
+ "to": "http://kubernetes.io/docs/admin/resourcequota/"
+ },
+ {
+ "from": "horizontal-pod-autoscaler",
+ "to": "http://kubernetes.io/docs/user-guide/horizontal-pod-autoscaling/"
+ },
+ {
+ "from": "docs/roadmap",
+ "to": "https://github.com/kubernetes/kubernetes/milestones/"
+ },
+ {
+ "from": "api-ref/",
+ "to": "https://github.com/kubernetes/kubernetes/milestones/"
+ },
+ {
+ "from": "docs/user-guide/overview",
+ "to": "http://kubernetes.io/docs/whatisk8s/"
+ }];
+
+ for (i=0;i -1){
+ notHere = true;
+ window.location.replace(redirects[i].to);
+ }
+ }
+
+ for (i=0;i -1){
+ var urlPieces = forwardingURL.split(fwdDirs[i]);
+ var newURL = "https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/" + fwdDirs[i] + urlPieces[1];
+ notHere = true;
+ window.location.replace(newURL);
+ }
+ }
+ if (!notHere) {
+ for (i=0;i -1 &&
+ forwardingURL.indexOf("404.html") < 0){
+ doRedirect=true;
+ forwardingURL=forwardingURL.replace(oldURLs[i],"/");
+ }
+ }
+ if (doRedirect){
+ window.location.replace(forwardingURL);
+ };
+ }
+});
diff --git a/robots.txt b/robots.txt
index 187d7c94bb..9bb39d8dbd 100644
--- a/robots.txt
+++ b/robots.txt
@@ -3,5 +3,7 @@ User-agent: *
Disallow: /legacy/
Disallow: /v1.0/
Disallow: /v1.1/
+Disallow: /404/
+Disallow: 404.html
SITEMAP: http://kubernetes.io/sitemap.xml
diff --git a/sitemap.xml b/sitemap.xml
index a965f4a570..ff1dd0d398 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -11,8 +11,8 @@
http://kubernetes.io/
{{ site.time | date_to_xmlschema }}
-{% for page in site.pages %}
+{% for page in site.pages %}{% if page.url != "/404.html" and page.url != "/sitemap.xml" and page.url != "/css/styles.css" %}
http://kubernetes.io{{ page.url }}
{% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %}
-{% endfor %}
-
\ No newline at end of file
+{% endif %}{% endfor %}
+