Merge branch 'master' into patch-1

2016-10-18 03:16:55 -07:00
parent d59443b6fb 92c443e8c5
commit e82b0185f9
205 changed files with 2859 additions and 2539 deletions
@@ -27,7 +27,7 @@ $ kubectl config view
 ```

 Many of the [examples](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/) provide an introduction to using
-kubectl and complete documentation is found in the [kubectl manual](/docs/user-guide/kubectl/kubectl).
+kubectl and complete documentation is found in the [kubectl manual](/docs/user-guide/kubectl/index).

 ### Directly accessing the REST API

@@ -9,7 +9,7 @@ assignees:
 * TOC
 {:toc}

-# The Kubernetes model for connecting containers
+## The Kubernetes model for connecting containers

 Now that you have a continuously running, replicated application you can expose it on a network. Before discussing the Kubernetes approach to networking, it is worthwhile to contrast it with the "normal" way networking works with Docker.

@@ -1,50 +1,50 @@
---
-assignees:
- caesarxuchao
- mikedanese
-
---
-
-kubectl port-forward forwards connections to a local port to a port on a pod. Its man page is available [here](/docs/user-guide/kubectl/kubectl_port-forward). Compared to [kubectl proxy](/docs/user-guide/accessing-the-cluster/#using-kubectl-proxy), `kubectl port-forward` is more generic as it can forward TCP traffic while `kubectl proxy` can only forward HTTP traffic. This guide demonstrates how to use `kubectl port-forward` to connect to a Redis database, which may be useful for database debugging.
-
-## Creating a Redis master
-
-```shell
-$ kubectl create -f examples/redis/redis-master.yaml
-pods/redis-master
-```
-
-wait until the Redis master pod is Running and Ready,
-
-```shell
-$ kubectl get pods
-NAME           READY     STATUS    RESTARTS   AGE
-redis-master   2/2       Running   0          41s
-```
-
-## Connecting to the Redis master[a]
-
-The Redis master is listening on port 6379, to verify this,
-
-```shell{% raw %}
-$ kubectl get pods redis-master --template='{{(index (index .spec.containers 0).ports 0).containerPort}}{{"\n"}}'
-6379{% endraw %}
-```
-
-then we forward the port 6379 on the local workstation to the port 6379 of pod redis-master,
-
-```shell
-$ kubectl port-forward redis-master 6379:6379
-I0710 14:43:38.274550    3655 portforward.go:225] Forwarding from 127.0.0.1:6379 -> 6379
-I0710 14:43:38.274797    3655 portforward.go:225] Forwarding from [::1]:6379 -> 6379
-```
-
-To verify the connection is successful, we run a redis-cli on the local workstation,
-
-```shell
-$ redis-cli
-127.0.0.1:6379> ping
-PONG
-```
-
-Now one can debug the database from the local workstation.
+---
+assignees:
+- caesarxuchao
+- mikedanese
+
+---
+
+kubectl port-forward forwards connections to a local port to a port on a pod. Its man page is available [here](/docs/user-guide/kubectl/kubectl_port-forward). Compared to [kubectl proxy](/docs/user-guide/accessing-the-cluster/#using-kubectl-proxy), `kubectl port-forward` is more generic as it can forward TCP traffic while `kubectl proxy` can only forward HTTP traffic. This guide demonstrates how to use `kubectl port-forward` to connect to a Redis database, which may be useful for database debugging.
+
+## Creating a Redis master
+
+```shell
+$ kubectl create -f examples/redis/redis-master.yaml
+pods/redis-master
+```
+
+wait until the Redis master pod is Running and Ready,
+
+```shell
+$ kubectl get pods
+NAME           READY     STATUS    RESTARTS   AGE
+redis-master   2/2       Running   0          41s
+```
+
+## Connecting to the Redis master[a]
+
+The Redis master is listening on port 6379, to verify this,
+
+```shell{% raw %}
+$ kubectl get pods redis-master --template='{{(index (index .spec.containers 0).ports 0).containerPort}}{{"\n"}}'
+6379{% endraw %}
+```
+
+then we forward the port 6379 on the local workstation to the port 6379 of pod redis-master,
+
+```shell
+$ kubectl port-forward redis-master 6379:6379
+I0710 14:43:38.274550    3655 portforward.go:225] Forwarding from 127.0.0.1:6379 -> 6379
+I0710 14:43:38.274797    3655 portforward.go:225] Forwarding from [::1]:6379 -> 6379
+```
+
+To verify the connection is successful, we run a redis-cli on the local workstation,
+
+```shell
+$ redis-cli
+127.0.0.1:6379> ping
+PONG
+```
+
+Now one can debug the database from the local workstation.
@@ -1,32 +1,32 @@
---
-assignees:
- caesarxuchao
- lavalamp
-
---
-
-You have seen the [basics](/docs/user-guide/accessing-the-cluster) about `kubectl proxy` and `apiserver proxy`. This guide shows how to use them together to access a service([kube-ui](/docs/user-guide/ui)) running on the Kubernetes cluster from your workstation.
-
-
-## Getting the apiserver proxy URL of kube-ui
-
-kube-ui is deployed as a cluster add-on. To find its apiserver proxy URL,
-
-```shell
-$ kubectl cluster-info | grep "KubeUI"
-KubeUI is running at https://173.255.119.104/api/v1/proxy/namespaces/kube-system/services/kube-ui
-```
-
-if this command does not find the URL, try the steps [here](/docs/user-guide/ui/#accessing-the-ui).
-
-
-## Connecting to the kube-ui service from your local workstation
-
-The above proxy URL is an access to the kube-ui service provided by the apiserver. To access it, you still need to authenticate to the apiserver. `kubectl proxy` can handle the authentication.
-
-```shell
-$ kubectl proxy --port=8001
-Starting to serve on localhost:8001
-```
-
+---
+assignees:
+- caesarxuchao
+- lavalamp
+
+---
+
+You have seen the [basics](/docs/user-guide/accessing-the-cluster) about `kubectl proxy` and `apiserver proxy`. This guide shows how to use them together to access a service([kube-ui](/docs/user-guide/ui)) running on the Kubernetes cluster from your workstation.
+
+
+## Getting the apiserver proxy URL of kube-ui
+
+kube-ui is deployed as a cluster add-on. To find its apiserver proxy URL,
+
+```shell
+$ kubectl cluster-info | grep "KubeUI"
+KubeUI is running at https://173.255.119.104/api/v1/proxy/namespaces/kube-system/services/kube-ui
+```
+
+if this command does not find the URL, try the steps [here](/docs/user-guide/ui/#accessing-the-ui).
+
+
+## Connecting to the kube-ui service from your local workstation
+
+The above proxy URL is an access to the kube-ui service provided by the apiserver. To access it, you still need to authenticate to the apiserver. `kubectl proxy` can handle the authentication.
+
+```shell
+$ kubectl proxy --port=8001
+Starting to serve on localhost:8001
+```
+
 Now you can access the kube-ui service on your local workstation at [http://localhost:8001/api/v1/proxy/namespaces/kube-system/services/kube-ui](http://localhost:8001/api/v1/proxy/namespaces/kube-system/services/kube-ui)
@@ -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
@@ -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
@@ -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
@@ -32,5 +32,7 @@ Synchronous garbage collection will be supported in 1.5 (tracking [issue](https:
 If you specify `deleteOptions.orphanDependents=true`, or leave it blank, then the GC will first reset the `ownerReferences` in the dependents, then delete the owner. Note that the deletion of the owner object is asynchronous, that is, a 200 OK response will be sent by the API server before the owner object gets deleted.

 ### Other references
+
 [Design Doc](https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/garbage-collection.md)
+
 [Known issues](https://github.com/kubernetes/kubernetes/issues/26120)
@@ -1,74 +1,74 @@
---
-assignees:
- caesarxuchao
- mikedanese
-
---
-
-Developers can use `kubectl exec` to run commands in a container. This guide demonstrates two use cases.
-
-## Using kubectl exec to check the environment variables of a container
-
-Kubernetes exposes [services](/docs/user-guide/services/#environment-variables) through environment variables. It is convenient to check these environment variables using `kubectl exec`.
-
-We first create a pod and a service,
-
-```shell
-$ kubectl create -f examples/guestbook/redis-master-controller.yaml
-$ kubectl create -f examples/guestbook/redis-master-service.yaml
-```
-wait until the pod is Running and Ready,
-
-```shell
-$ kubectl get pod
-NAME                 READY     REASON       RESTARTS   AGE
-redis-master-ft9ex   1/1       Running      0          12s
-```
-
-then we can check the environment variables of the pod,
-
-```shell
-$ kubectl exec redis-master-ft9ex env
-...
-REDIS_MASTER_SERVICE_PORT=6379
-REDIS_MASTER_SERVICE_HOST=10.0.0.219
-...
-```
-
-We can use these environment variables in applications to find the service.
-
-
-## Using kubectl exec to check the mounted volumes
-
-It is convenient to use `kubectl exec` to check if the volumes are mounted as expected.
-We first create a Pod with a volume mounted at /data/redis,
-
-```shell
-kubectl create -f docs/user-guide/walkthrough/pod-redis.yaml
-```
-
-wait until the pod is Running and Ready,
-
-```shell
-$ kubectl get pods
-NAME      READY     REASON    RESTARTS   AGE
-storage   1/1       Running   0          1m
-```
-
-we then use `kubectl exec` to verify that the volume is mounted at /data/redis,
-
-```shell
-$ kubectl exec storage ls /data
-redis
-```
-
-## Using kubectl exec to open a bash terminal in a pod
-
-After all, open a terminal in a pod is the most direct way to introspect the pod. Assuming the pod/storage is still running, run
-
-```shell
-$ kubectl exec -ti storage -- bash
-root@storage:/data#
-```
-
+---
+assignees:
+- caesarxuchao
+- mikedanese
+
+---
+
+Developers can use `kubectl exec` to run commands in a container. This guide demonstrates two use cases.
+
+## Using kubectl exec to check the environment variables of a container
+
+Kubernetes exposes [services](/docs/user-guide/services/#environment-variables) through environment variables. It is convenient to check these environment variables using `kubectl exec`.
+
+We first create a pod and a service,
+
+```shell
+$ kubectl create -f examples/guestbook/redis-master-controller.yaml
+$ kubectl create -f examples/guestbook/redis-master-service.yaml
+```
+wait until the pod is Running and Ready,
+
+```shell
+$ kubectl get pod
+NAME                 READY     REASON       RESTARTS   AGE
+redis-master-ft9ex   1/1       Running      0          12s
+```
+
+then we can check the environment variables of the pod,
+
+```shell
+$ kubectl exec redis-master-ft9ex env
+...
+REDIS_MASTER_SERVICE_PORT=6379
+REDIS_MASTER_SERVICE_HOST=10.0.0.219
+...
+```
+
+We can use these environment variables in applications to find the service.
+
+
+## Using kubectl exec to check the mounted volumes
+
+It is convenient to use `kubectl exec` to check if the volumes are mounted as expected.
+We first create a Pod with a volume mounted at /data/redis,
+
+```shell
+kubectl create -f docs/user-guide/walkthrough/pod-redis.yaml
+```
+
+wait until the pod is Running and Ready,
+
+```shell
+$ kubectl get pods
+NAME      READY     REASON    RESTARTS   AGE
+storage   1/1       Running   0          1m
+```
+
+we then use `kubectl exec` to verify that the volume is mounted at /data/redis,
+
+```shell
+$ kubectl exec storage ls /data
+redis
+```
+
+## Using kubectl exec to open a bash terminal in a pod
+
+After all, open a terminal in a pod is the most direct way to introspect the pod. Assuming the pod/storage is still running, run
+
+```shell
+$ kubectl exec -ti storage -- bash
+root@storage:/data#
+```
+
 This gets you a terminal.
@@ -89,5 +89,5 @@ Pods and containers
  * [Images and registries](/docs/user-guide/images/)
  * [Migrating from docker-cli to kubectl](/docs/user-guide/docker-cli-to-kubectl/)
  * [Configuration Best Practices and Tips](/docs/user-guide/config-best-practices/)
-  * [Assign pods to selected nodes](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/node-selection/)
-  * [Perform a rolling update on a running group of pods](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/update-demo/)
+  * [Assign pods to selected nodes](/docs/user-guide/node-selection/)
+  * [Perform a rolling update on a running group of pods](/docs/user-guide/update-demo/)
@@ -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=<cron>`   | 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.
@@ -5,7 +5,7 @@ assignees:

 ---

-Use this overview of the `kubectl` command line interface to help you start running commands against Kubernetes clusters. This overview quickly covers `kubectl` syntax, describes the command operations, and provides common examples. For details about each command, including all the supported flags and subcommands, see the [kubectl](/docs/user-guide/kubectl/kubectl) reference documentation.
+Use this overview of the `kubectl` command line interface to help you start running commands against Kubernetes clusters. This overview quickly covers `kubectl` syntax, describes the command operations, and provides common examples. For details about each command, including all the supported flags and subcommands, see the [kubectl](/docs/user-guide/kubectl) reference documentation.

 TODO: Auto-generate this file to ensure it's always in sync with any `kubectl` changes, see [#14177](http://pr.k8s.io/14177).

@@ -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.
@@ -77,7 +78,7 @@ Operation       | Syntax	|       Description
 `stop`		| `kubectl stop` | Deprecated: Instead, see `kubectl delete`.
 `version`		| `kubectl version [--client] [flags]` | Display the Kubernetes version running on the client and server.

-Remember: For more about command operations, see the [kubectl](/docs/user-guide/kubectl/kubectl) reference documentation.
+Remember: For more about command operations, see the [kubectl](/docs/user-guide/kubectl) reference documentation.

 ## Resource types

@@ -85,29 +86,37 @@ The following table includes a list of all the supported resource types and thei

 Resource type	| Abbreviated alias
 -------------------- | --------------------
-`componentstatuses`	|	`cs`
-`daemonsets` | `ds`
-`deployments` |
-`events` | `ev`
-`endpoints` | `ep`
-`horizontalpodautoscalers` | `hpa`
-`ingresses` | `ing`
+`clusters` |
+`componentstatuses` |`cs`
+`configmaps` |`cm`
+`daemonsets` |`ds`
+`deployments` |`deploy`
+`endpoints` |`ep`
+`events` |`ev`
+`horizontalpodautoscalers` |`hpa`
+`ingresses` |`ing`
 `jobs` |
-`limitranges` | `limits`
-`nodes` | `no`
-`namespaces` | `ns`
-`pods` | `po`
-`persistentvolumes` | `pv`
-`persistentvolumeclaims` | `pvc`
-`resourcequotas` | `quota`
-`replicationcontrollers` | `rc`
+`limitranges` |`limits`
+`namespaces` |`ns`
+`networkpolicies` |
+`nodes` |`no`
+`persistentvolumeclaims` |`pvc`
+`persistentvolumes` |`pv`
+`pods` |`po`
+`podsecuritypolicies` |`psp`
+`podtemplates` |
+`replicasets` |`rs`
+`replicationcontrollers` |`rc`
+`resourcequotas` |`quota`
 `secrets` |
-`serviceaccounts` |
-`services` | `svc`
+`serviceaccounts` |`sa`
+`services` |`svc`
+`storageclasses` |
+`thirdpartyresources` |

 ## Output options

-Use the following sections for information about how you can format or sort the output of certain commands. For details about which commands support the various output options, see the [kubectl](/docs/user-guide/kubectl/kubectl) reference documentation.
+Use the following sections for information about how you can format or sort the output of certain commands. For details about which commands support the various output options, see the [kubectl](/docs/user-guide/kubectl) reference documentation.

 ### Formatting output

@@ -138,7 +147,7 @@ In this example, the following command outputs the details for a single pod as a

 `$ kubectl get pod web-pod-13je7 -o=yaml`

-Remember: See the [kubectl](/docs/user-guide/kubectl/kubectl) reference documentation for details about which output format is supported by each command.
+Remember: See the [kubectl](/docs/user-guide/kubectl) reference documentation for details about which output format is supported by each command.

 #### Custom columns

@@ -273,4 +282,4 @@ $ kubectl logs -f <pod-name>

 ## Next steps

-Start using the [kubectl](/docs/user-guide/kubectl/kubectl) commands.
+Start using the [kubectl](/docs/user-guide/kubectl) commands.
@@ -98,9 +98,7 @@ kubectl annotate pods foo description-
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -41,9 +41,7 @@ kubectl api-versions
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -70,9 +70,7 @@ cat pod.json | kubectl apply -f -
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -64,9 +64,7 @@ kubectl attach 123456-7890 -c ruby-container -i -t
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -78,9 +78,7 @@ kubectl autoscale rc foo --max=5 --cpu-percent=80
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -48,10 +48,7 @@ kubectl cluster-info
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
-* [kubectl cluster-info dump](kubectl_cluster-info_dump.md)	 - Dump lots of relevant info for debugging and diagnosis

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -73,9 +73,7 @@ kubectl cluster-info dump --namespaces default,kube-system --output-directory=/p
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl cluster-info](kubectl_cluster-info.md)	 - Display cluster info

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -66,9 +66,7 @@ $ source <(kubectl completion zsh)
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -52,21 +52,7 @@ kubectl config SUBCOMMAND
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
-* [kubectl config current-context](kubectl_config_current-context.md)	 - Displays the current-context
-* [kubectl config delete-cluster](kubectl_config_delete-cluster.md)	 - Delete the specified cluster from the kubeconfig
-* [kubectl config delete-context](kubectl_config_delete-context.md)	 - Delete the specified context from the kubeconfig
-* [kubectl config get-clusters](kubectl_config_get-clusters.md)	 - Display clusters defined in the kubeconfig
-* [kubectl config get-contexts](kubectl_config_get-contexts.md)	 - Describe one or many contexts
-* [kubectl config set](kubectl_config_set.md)	 - Sets an individual value in a kubeconfig file
-* [kubectl config set-cluster](kubectl_config_set-cluster.md)	 - Sets a cluster entry in kubeconfig
-* [kubectl config set-context](kubectl_config_set-context.md)	 - Sets a context entry in kubeconfig
-* [kubectl config set-credentials](kubectl_config_set-credentials.md)	 - Sets a user entry in kubeconfig
-* [kubectl config unset](kubectl_config_unset.md)	 - Unsets an individual value in a kubeconfig file
-* [kubectl config use-context](kubectl_config_use-context.md)	 - Sets the current-context in a kubeconfig file
-* [kubectl config view](kubectl_config_view.md)	 - Display merged kubeconfig settings or a specified kubeconfig file

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -50,9 +50,7 @@ kubectl config current-context
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -41,9 +41,7 @@ kubectl config delete-cluster NAME
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -41,9 +41,7 @@ kubectl config delete-context NAME
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -41,9 +41,7 @@ kubectl config get-clusters
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -58,9 +58,7 @@ kubectl config get-contexts my-context
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -64,9 +64,7 @@ kubectl config set-cluster e2e --insecure-skip-tls-verify=true
      --vmodule value               comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -56,9 +56,7 @@ kubectl config set-context gce --user=cluster-admin
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -87,9 +87,7 @@ kubectl config set-credentials cluster-admin --auth-provider=oidc --auth-provide
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -50,9 +50,7 @@ kubectl config set PROPERTY_NAME PROPERTY_VALUE
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -43,9 +43,7 @@ kubectl config unset PROPERTY_NAME
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -41,9 +41,7 @@ kubectl config use-context CONTEXT_NAME
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -71,9 +71,7 @@ kubectl config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}'
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl config](kubectl_config.md)	 - Modify kubeconfig files

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -85,9 +85,7 @@ kubectl convert -f . | kubectl create -f -
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -52,9 +52,7 @@ kubectl cordon foo
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -68,16 +68,7 @@ cat pod.json | kubectl create -f -
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
-* [kubectl create configmap](kubectl_create_configmap.md)	 - Create a configmap from a local file, directory or literal value
-* [kubectl create deployment](kubectl_create_deployment.md)	 - Create a deployment with the specified name.
-* [kubectl create namespace](kubectl_create_namespace.md)	 - Create a namespace with the specified name
-* [kubectl create quota](kubectl_create_quota.md)	 - Create a quota with the specified name.
-* [kubectl create secret](kubectl_create_secret.md)	 - Create a secret using specified subcommand
-* [kubectl create service](kubectl_create_service.md)	 - Create a service using specified subcommand.
-* [kubectl create serviceaccount](kubectl_create_serviceaccount.md)	 - Create a service account with the specified name

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -85,9 +85,7 @@ kubectl create configmap my-config --from-literal=key1=config1 --from-literal=ke
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create](kubectl_create.md)	 - Create a resource by filename or stdin

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -68,9 +68,7 @@ kubectl create deployment my-dep --image=busybox
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create](kubectl_create.md)	 - Create a resource by filename or stdin

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -67,9 +67,7 @@ kubectl create namespace my-namespace
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create](kubectl_create.md)	 - Create a resource by filename or stdin

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -71,9 +71,7 @@ kubectl create quota NAME [--hard=key1=value1,key2=value2] [--scopes=Scope1,Scop
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create](kubectl_create.md)	 - Create a resource by filename or stdin

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -41,12 +41,7 @@ kubectl create secret
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create](kubectl_create.md)	 - Create a resource by filename or stdin
-* [kubectl create secret docker-registry](kubectl_create_secret_docker-registry.md)	 - Create a secret for use with a Docker registry
-* [kubectl create secret generic](kubectl_create_secret_generic.md)	 - Create a secret from a local file, directory or literal value
-* [kubectl create secret tls](kubectl_create_secret_tls.md)	 - Create a TLS secret

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -83,9 +83,7 @@ kubectl create secret docker-registry my-secret --docker-server=DOCKER_REGISTRY_
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create secret](kubectl_create_secret.md)	 - Create a secret using specified subcommand

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -86,9 +86,7 @@ kubectl create secret generic my-secret --from-literal=key1=supersecret --from-l
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create secret](kubectl_create_secret.md)	 - Create a secret using specified subcommand

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -71,9 +71,7 @@ kubectl create secret tls tls-secret --cert=path/to/tls.cert --key=path/to/tls.k
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create secret](kubectl_create_secret.md)	 - Create a secret using specified subcommand

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -41,12 +41,7 @@ kubectl create service
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create](kubectl_create.md)	 - Create a resource by filename or stdin
-* [kubectl create service clusterip](kubectl_create_service_clusterip.md)	 - Create a clusterIP service.
-* [kubectl create service loadbalancer](kubectl_create_service_loadbalancer.md)	 - Create a LoadBalancer service.
-* [kubectl create service nodeport](kubectl_create_service_nodeport.md)	 - Create a NodePort service.

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -72,9 +72,7 @@ kubectl create service clusterip my-cs --clusterip="None"
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create service](kubectl_create_service.md)	 - Create a service using specified subcommand.

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -68,9 +68,7 @@ kubectl create service loadbalancer my-lbs --tcp=5678:8080
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create service](kubectl_create_service.md)	 - Create a service using specified subcommand.

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -68,9 +68,7 @@ kubectl create service nodeport my-ns --tcp=5678:8080
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create service](kubectl_create_service.md)	 - Create a service using specified subcommand.

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -68,9 +68,7 @@ $ kubectl create serviceaccount my-service-account
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl create](kubectl_create.md)	 - Create a resource by filename or stdin

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -92,9 +92,7 @@ kubectl delete pods --all
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -111,9 +111,7 @@ kubectl describe pods frontend
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -79,9 +79,7 @@ $ kubectl drain foo --grace-period=900
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -89,9 +89,7 @@ kubectl edit svc/docker-registry --output-version=v1 -o json
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -65,9 +65,7 @@ kubectl exec 123456-7890 -c ruby-container -i -t -- bash -il
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -87,9 +87,7 @@ kubectl explain pods.spec.containers
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -110,9 +110,7 @@ kubectl expose deployment nginx --port=80 --target-port=8000
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -127,9 +127,7 @@ kubectl get rc/web service/frontend pods/web-pod-13je7
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -91,9 +91,7 @@ kubectl label pods foo bar-
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -75,9 +75,7 @@ kubectl logs --since=1h nginx
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -41,9 +41,7 @@ kubectl namespace [namespace]
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -41,9 +41,7 @@ kubectl options
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -83,9 +83,7 @@ kubectl patch pod valid-pod --type='json' -p='[{"op": "replace", "path": "/spec/
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -64,9 +64,7 @@ kubectl port-forward  mypod 0:5000
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -89,9 +89,7 @@ kubectl proxy --api-prefix=/k8s-api
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -82,9 +82,7 @@ kubectl replace --force -f ./pod.json
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -93,9 +93,7 @@ kubectl rolling-update frontend-v1 frontend-v2 --rollback
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -50,14 +50,7 @@ kubectl rollout undo deployment/abc
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
-* [kubectl rollout history](kubectl_rollout_history.md)	 - View rollout history
-* [kubectl rollout pause](kubectl_rollout_pause.md)	 - Mark the provided resource as paused
-* [kubectl rollout resume](kubectl_rollout_resume.md)	 - Resume a paused resource
-* [kubectl rollout status](kubectl_rollout_status.md)	 - Watch rollout status until it's done
-* [kubectl rollout undo](kubectl_rollout_undo.md)	 - Undo a previous rollout

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -61,9 +61,7 @@ kubectl rollout history deployment/abc --revision=3
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl rollout](kubectl_rollout.md)	 - Manage a deployment rollout

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -63,9 +63,7 @@ kubectl rollout pause deployment/nginx
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl rollout](kubectl_rollout.md)	 - Manage a deployment rollout

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -61,9 +61,7 @@ kubectl rollout resume deployment/nginx
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl rollout](kubectl_rollout.md)	 - Manage a deployment rollout

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -57,9 +57,7 @@ kubectl rollout status deployment/nginx
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl rollout](kubectl_rollout.md)	 - Manage a deployment rollout

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -61,9 +61,7 @@ kubectl rollout undo deployment/abc --to-revision=3
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl rollout](kubectl_rollout.md)	 - Manage a deployment rollout

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -120,9 +120,7 @@ kubectl run pi --schedule="0/5 * * * ?" --image=perl --restart=OnFailure -- perl
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -81,9 +81,7 @@ kubectl scale --replicas=3 job/cron
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -44,10 +44,7 @@ kubectl set SUBCOMMAND
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
-* [kubectl set image](kubectl_set_image.md)	 - Update image of a pod template

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -80,9 +80,7 @@ kubectl set image -f path/to/file.yaml nginx=nginx:1.9.1 --local -o yaml
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl set](kubectl_set.md)	 - Set specific features on objects

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -76,9 +76,7 @@ $ kubectl stop -f path/to/resources
      --vmodule=: comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 24-Nov-2015

@@ -81,9 +81,7 @@ kubectl taint nodes foo dedicated-
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -44,11 +44,7 @@ kubectl top
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
-* [kubectl top node](kubectl_top_node.md)	 - Display Resource (CPU/Memory/Storage) usage of nodes
-* [kubectl top pod](kubectl_top_pod.md)	 - Display Resource (CPU/Memory/Storage) usage of pods

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -61,9 +61,7 @@ kubectl top node NODE_NAME
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl top](kubectl_top.md)	 - Display Resource (CPU/Memory/Storage) usage

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -72,9 +72,7 @@ kubectl top pod -l name=myLabel
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl top](kubectl_top.md)	 - Display Resource (CPU/Memory/Storage) usage

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -52,9 +52,7 @@ $ kubectl uncordon foo
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -47,9 +47,7 @@ kubectl version
      --vmodule value                  comma-separated list of pattern=N settings for file-filtered logging
 ```

-### SEE ALSO

-* [kubectl](../kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016

@@ -1,80 +1,80 @@
---
-assignees:
- mikedanese
-
---
-
-This page is designed to help you use logs to troubleshoot issues with your Kubernetes solution.
-
-## Logging by Kubernetes Components
-
-Kubernetes components, such as kubelet and apiserver, use the [glog](https://godoc.org/github.com/golang/glog) logging library.  Developer conventions for logging severity are described in [docs/devel/logging.md](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/devel/logging.md).
-
-## Examining the logs of running containers
-
-The logs of a running container may be fetched using the command `kubectl logs`. For example, given
-this pod specification [counter-pod.yaml](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/blog-logging/counter-pod.yaml), which has a container which writes out some text to standard
-output every second. (You can find different pod specifications [here](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/logging-demo/).)
-
-{% include code.html language="yaml" file="counter-pod.yaml" k8slink="/examples/blog-logging/counter-pod.yaml" %}
-
-we can run the pod:
-
-```shell
-$ kubectl create -f ./counter-pod.yaml
-pods/counter
-```
-
-and then fetch the logs:
-
-```shell
-$ kubectl logs counter
-0: Tue Jun  2 21:37:31 UTC 2015
-1: Tue Jun  2 21:37:32 UTC 2015
-2: Tue Jun  2 21:37:33 UTC 2015
-3: Tue Jun  2 21:37:34 UTC 2015
-4: Tue Jun  2 21:37:35 UTC 2015
-5: Tue Jun  2 21:37:36 UTC 2015
-...
-```
-
-If a pod has more than one container then you need to specify which container's log files should
-be fetched e.g.
-
-```shell
-$ kubectl logs kube-dns-v3-7r1l9 etcd
-2015/06/23 00:43:10 etcdserver: start to snapshot (applied: 30003, lastsnap: 20002)
-2015/06/23 00:43:10 etcdserver: compacted log at index 30003
-2015/06/23 00:43:10 etcdserver: saved snapshot at index 30003
-2015/06/23 02:05:42 etcdserver: start to snapshot (applied: 40004, lastsnap: 30003)
-2015/06/23 02:05:42 etcdserver: compacted log at index 40004
-2015/06/23 02:05:42 etcdserver: saved snapshot at index 40004
-2015/06/23 03:28:31 etcdserver: start to snapshot (applied: 50005, lastsnap: 40004)
-2015/06/23 03:28:31 etcdserver: compacted log at index 50005
-2015/06/23 03:28:31 etcdserver: saved snapshot at index 50005
-2015/06/23 03:28:56 filePurge: successfully removed file default.etcd/member/wal/0000000000000000-0000000000000000.wal
-2015/06/23 04:51:03 etcdserver: start to snapshot (applied: 60006, lastsnap: 50005)
-2015/06/23 04:51:03 etcdserver: compacted log at index 60006
-2015/06/23 04:51:03 etcdserver: saved snapshot at index 60006
-...
-```
-
-## Cluster level logging to Google Cloud Logging
-
-The getting started guide [Cluster Level Logging to Google Cloud Logging](/docs/getting-started-guides/logging)
-explains how container logs are ingested into [Google Cloud Logging](https://cloud.google.com/logging/docs/)
-and shows how to query the ingested logs.
-
-## Cluster level logging with Elasticsearch and Kibana
-
-The getting started guide [Cluster Level Logging with Elasticsearch and Kibana](/docs/getting-started-guides/logging-elasticsearch)
-describes how to ingest cluster level logs into Elasticsearch and view them using Kibana.
-
-## Ingesting Application Log Files
-
-Cluster level logging only collects the standard output and standard error output of the applications
-running in containers. The guide [Collecting log files from within containers with Fluentd and sending them to the Google Cloud Logging service](https://github.com/kubernetes/contrib/blob/master/logging/fluentd-sidecar-gcp/README.md) explains how the log files of applications can also be ingested into Google Cloud logging.
-
-## Known issues
-
+---
+assignees:
+- mikedanese
+
+---
+
+This page is designed to help you use logs to troubleshoot issues with your Kubernetes solution.
+
+## Logging by Kubernetes Components
+
+Kubernetes components, such as kubelet and apiserver, use the [glog](https://godoc.org/github.com/golang/glog) logging library.  Developer conventions for logging severity are described in [docs/devel/logging.md](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/devel/logging.md).
+
+## Examining the logs of running containers
+
+The logs of a running container may be fetched using the command `kubectl logs`. For example, given
+this pod specification [counter-pod.yaml](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/blog-logging/counter-pod.yaml), which has a container which writes out some text to standard
+output every second. (You can find different pod specifications [here](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/logging-demo/).)
+
+{% include code.html language="yaml" file="counter-pod.yaml" k8slink="/examples/blog-logging/counter-pod.yaml" %}
+
+we can run the pod:
+
+```shell
+$ kubectl create -f ./counter-pod.yaml
+pods/counter
+```
+
+and then fetch the logs:
+
+```shell
+$ kubectl logs counter
+0: Tue Jun  2 21:37:31 UTC 2015
+1: Tue Jun  2 21:37:32 UTC 2015
+2: Tue Jun  2 21:37:33 UTC 2015
+3: Tue Jun  2 21:37:34 UTC 2015
+4: Tue Jun  2 21:37:35 UTC 2015
+5: Tue Jun  2 21:37:36 UTC 2015
+...
+```
+
+If a pod has more than one container then you need to specify which container's log files should
+be fetched e.g.
+
+```shell
+$ kubectl logs kube-dns-v3-7r1l9 etcd
+2015/06/23 00:43:10 etcdserver: start to snapshot (applied: 30003, lastsnap: 20002)
+2015/06/23 00:43:10 etcdserver: compacted log at index 30003
+2015/06/23 00:43:10 etcdserver: saved snapshot at index 30003
+2015/06/23 02:05:42 etcdserver: start to snapshot (applied: 40004, lastsnap: 30003)
+2015/06/23 02:05:42 etcdserver: compacted log at index 40004
+2015/06/23 02:05:42 etcdserver: saved snapshot at index 40004
+2015/06/23 03:28:31 etcdserver: start to snapshot (applied: 50005, lastsnap: 40004)
+2015/06/23 03:28:31 etcdserver: compacted log at index 50005
+2015/06/23 03:28:31 etcdserver: saved snapshot at index 50005
+2015/06/23 03:28:56 filePurge: successfully removed file default.etcd/member/wal/0000000000000000-0000000000000000.wal
+2015/06/23 04:51:03 etcdserver: start to snapshot (applied: 60006, lastsnap: 50005)
+2015/06/23 04:51:03 etcdserver: compacted log at index 60006
+2015/06/23 04:51:03 etcdserver: saved snapshot at index 60006
+...
+```
+
+## Cluster level logging to Google Cloud Logging
+
+The getting started guide [Cluster Level Logging to Google Cloud Logging](/docs/getting-started-guides/logging)
+explains how container logs are ingested into [Google Cloud Logging](https://cloud.google.com/logging/docs/)
+and shows how to query the ingested logs.
+
+## Cluster level logging with Elasticsearch and Kibana
+
+The getting started guide [Cluster Level Logging with Elasticsearch and Kibana](/docs/getting-started-guides/logging-elasticsearch)
+describes how to ingest cluster level logs into Elasticsearch and view them using Kibana.
+
+## Ingesting Application Log Files
+
+Cluster level logging only collects the standard output and standard error output of the applications
+running in containers. The guide [Collecting log files from within containers with Fluentd and sending them to the Google Cloud Logging service](https://github.com/kubernetes/contrib/blob/master/logging/fluentd-sidecar-gcp/README.md) explains how the log files of applications can also be ingested into Google Cloud logging.
+
+## Known issues
+
 Kubernetes does log rotation for Kubernetes components and docker containers. The command `kubectl logs` currently only read the latest logs, not all historical ones.
@@ -6,7 +6,7 @@ assignees:

 Understanding how an application behaves when deployed is crucial to scaling the application and providing a reliable service. In a Kubernetes cluster, application performance can be examined at many different levels: containers, [pods](/docs/user-guide/pods), [services](/docs/user-guide/services), and whole clusters. As part of Kubernetes we want to provide users with detailed resource usage information about their running applications at all these levels. This will give users deep insights into how their applications are performing and where possible application bottlenecks may be found. In comes [Heapster](https://github.com/kubernetes/heapster), a project meant to provide a base monitoring platform on Kubernetes.

-### Overview
+## Overview

 Heapster is a cluster-wide aggregator of monitoring and event data. It currently supports Kubernetes natively and works on all Kubernetes setups. Heapster runs as a pod in the cluster, similar to how any Kubernetes application would run. The Heapster pod discovers all nodes in the cluster and queries usage information from the nodes' [Kubelet](https://releases.k8s.io/{{page.githubbranch}}/DESIGN.md#kubelet)s, the on-machine Kubernetes agent. The Kubelet itself fetches the data from [cAdvisor](https://github.com/google/cadvisor). Heapster groups the information by pod along with the relevant labels. This data is then pushed to a configurable backend for storage and visualization. Currently supported backends include [InfluxDB](http://influxdb.com/) (with [Grafana](http://grafana.org/) for visualization), [Google Cloud Monitoring](https://cloud.google.com/monitoring/) and many others described in more details [here](https://github.com/kubernetes/heapster/blob/master/docs/sink-configuration.md). The overall architecture of the service can be seen below:

@@ -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
@@ -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
@@ -150,7 +150,9 @@ Pod is exposed as a primitive in order to facilitate:
 * clean composition of Kubelet-level functionality with cluster-level functionality &mdash; Kubelet is effectively the "pod controller"
 * high-availability applications, which will expect pods to be replaced in advance of their termination and certainly in advance of deletion, such as in the case of planned evictions, image prefetching, or live pod migration [#3949](http://issue.k8s.io/3949)

-The current best practice for pets is to create a replication controller with `replicas` equal to `1` and a corresponding service. If you find this cumbersome, please comment on [issue #260](http://issue.k8s.io/260).
+There is new first-class support for pet-like pods with the [PetSet](/docs/user-guide/petset/) feature (currently in alpha).
+For prior versions of Kubernetes, best practice for pets is to create a replication controller with `replicas` equal to `1` and a corresponding service. 
+

 ## Termination of Pods

@@ -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

@@ -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.

@@ -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
@@ -12,7 +12,7 @@ assignees:
 To update a service without an outage, `kubectl` supports what is called ['rolling update'](/docs/user-guide/kubectl/kubectl_rolling-update), which updates one pod at a time, rather than taking down the entire service at the same time. See the [rolling update design document](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/simple-rolling-update.md) and the [example of rolling update](/docs/user-guide/update-demo/) for more information.

 Note that `kubectl rolling-update` only supports Replication Controllers. However, if you deploy applications with Replication Controllers,
-consider switching them to [Deployments](/docs/user-guide/deployments/). A Deployments is a higher-level controller that automates rolling updates
+consider switching them to [Deployments](/docs/user-guide/deployments/). A Deployment is a higher-level controller that automates rolling updates
 of applications declaratively, and therefore is recommended. If you still want to keep your Replication Controllers and use `kubectl rolling-update`, keep reading:

 A rolling update applies changes to the configuration of pods being managed by
@@ -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": [{
@@ -377,7 +377,7 @@ To use a secret in an environment variable in a pod:
 1. Modify your Pod definition in each container that you wish to consume the value of a secret key to add an environment variable for each secret key you wish to consume.  The environment variable that consumes the secret key should populate the secret's name and key in `env[x].valueFrom.secretKeyRef`.
 1. Modify your image and/or command line so that the program looks for values in the specified environment variables

-This is an example of a pod that mounts a secret in a volume:
+This is an example of a pod that uses secrets from environment variables:

 ```yaml
 apiVersion: v1
@@ -543,9 +543,9 @@ credentials.
 Make the secrets:

 ```shell
-$ kubectl create secret generic prod-db-secret --from-literal=user=produser --from-literal=password=Y4nys7f11
+$ kubectl create secret generic prod-db-secret --from-literal=username=produser --from-literal=password=Y4nys7f11
 secret "prod-db-secret" created
-$ kubectl create secret generic test-db-secret --from-literal=user=testuser --from-literal=password=iluvtests
+$ kubectl create secret generic test-db-secret --from-literal=username=testuser --from-literal=password=iluvtests
 secret "test-db-secret" created
 ```

@@ -0,0 +1,118 @@
+---
+assignees:
+- IanLewis
+
+---
+
+* TOC
+{:toc}
+
+## What is ThirdPartyResource?
+
+Kubernetes comes with many built-in API objects. However, there are often times when you might need to extend Kubernetes with their own API objects in order to do custom automation.
+
+`ThirdPartyResource` objects are a way to extend the Kubernetes API with a new API object type. The new API object type will be given an API endpoint URL and support CRUD operations, and watch API. You can then create custom objects using this API endpoint. You can think of `ThirdPartyResources` as being much like the schema for a database table. Once you have created the table, you can then start storing rows in the table. Once created, `ThirdPartyResources` can act as the data model behind custom controllers or automation programs.
+
+## Structure of a ThirdPartyResource
+
+Each `ThirdPartyResource` has the following:
+
+   * `metadata` - Standard Kubernetes object metadata.
+   * `kind` - The kind of the resources described by this third party resource.
+   * `description` - A free text description of the resource.
+   * `versions` - A list of the versions of the resource.
+
+The `kind` for a `ThirdPartyResource` takes the form `<kind name>.<domain>`. You are expected to provide a unique kind and domain name in order to avoid conflicts with other `ThirdPartyResource` objects. Kind names will be converted to CamelCase when creating instances of the `ThirdPartyResource`. Hypens in the `kind` are assumed to be word breaks. For instance the kind `camel-case` would be converted to `CamelCase` but `camelcase` would be converted to `Camelcase`.
+
+Other fields on the `ThirdPartyResource` are treated as custom data fields. These fields can hold arbitrary JSON data and have any structure.
+
+You can view the full documentation about `ThirdPartyResources` using the `explain` command in kubectl.
+
+```
+$ kubectl explain thirdpartyresource
+```
+
+## Creating a ThirdPartyResource
+
+When you user create a new `ThirdPartyResource`, the Kubernetes API Server reacts by creating a new, namespaced RESTful resource path. For now, non-namespaced objects are not supported. As with existing built-in objects, deleting a namespace deletes all custom objects in that namespace. `ThirdPartyResources` themselves are non-namespaced and are available to all namespaces.
+
+For example, if a save the following `ThirdPartyResource` to `resource.yaml`:
+
+```yaml
+apiVersion: extensions/v1beta1
+kind: ThirdPartyResource
+metadata:
+  name: cron-tab.stable.example.com
+description: "A specification of a Pod to run on a cron style schedule"
+versions:
+- name: v1
+```
+
+And create it:
+
+```shell
+$ kubectl create -f resource.yaml
+thirdpartyresource "cron-tab.stable.example.com" created
+```
+
+Then a new RESTful API endpoint is created at:
+
+`/apis/stable.example.com/v1/namespaces/<namespace>/crontabs/...`
+
+This endpoint URL can then be used to create and manage custom objects.
+
+## Creating Custom Objects
+
+After the `ThirdPartyResource` object has been created you can create custom objects. Custom objects can contain custom fields. These fields can contain arbitrary JSON. 
+In the following example, a `cronSpec` and `image` custom fields are set to the custom `CronTab` object. If you save the following YAML to `my-crontab.yaml`:
+
+```yaml
+apiVersion: "stable.example.com/v1"
+kind: CronTab
+metadata:
+  name: my-new-cron-object
+cronSpec: "* * * * /5"
+image: my-awesome-cron-image
+```
+
+and create it:
+
+```shell
+$ kubectl create -f my-crontab.yaml
+crontab "my-new-cron-object" created
+```
+
+You can then manage our `CronTab` objects using kubectl. Note that resource names are not case-sensitive when using kubectl:
+
+```shell
+$ kubectl get crontab
+NAME                 LABELS    DATA
+my-new-cron-object   <none>    {"apiVersion":"stable.example.com/v1","cronSpec":"...
+```
+
+You can also view the raw JSON data. Here you can see that it contains the custom `cronSpec` and `image` fields from the yaml you used to create it:
+
+```yaml
+$ kubectl get crontab -o json
+{
+    "kind": "List",
+    "apiVersion": "v1",
+    "metadata": {},
+    "items": [
+        {
+            "apiVersion": "stable.example.com/v1",
+            "cronSpec": "* * * * /5",
+            "image": "my-awesome-cron-image",
+            "kind": "CronTab",
+            "metadata": {
+                "creationTimestamp": "2016-09-29T04:59:00Z",
+                "name": "my-new-cron-object",
+                "namespace": "default",
+                "resourceVersion": "12601503",
+                "selfLink": "/apis/stable.example.com/v1/namespaces/default/crontabs/my-new-cron-object",
+                "uid": "6f65e7a3-8601-11e6-a23e-42010af0000c"
+            }
+        }
+    ]
+}
+```
@@ -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/)
@@ -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