Skip to content

Commit

Permalink
Merge pull request kubernetes#31452 from jeffmendoza/cleanup-docs-yamls
Browse files Browse the repository at this point in the history
Removed non-md files from docs. Moved doc yamls to test/fixtures.
  • Loading branch information
eparis authored Aug 26, 2016
2 parents a9c6f87 + 95b7305 commit 6f90869
Show file tree
Hide file tree
Showing 144 changed files with 76 additions and 1,974 deletions.
8 changes: 0 additions & 8 deletions docs/admin/high-availability/default-kubelet

This file was deleted.

Binary file removed docs/admin/high-availability/ha.png
Binary file not shown.
4 changes: 0 additions & 4 deletions docs/admin/high-availability/ha.svg

This file was deleted.

9 changes: 0 additions & 9 deletions docs/admin/high-availability/monit-docker

This file was deleted.

11 changes: 0 additions & 11 deletions docs/admin/high-availability/monit-kubelet

This file was deleted.

Binary file removed docs/admin/ovs-networking.png
Binary file not shown.
Empty file modified docs/admin/resource-quota.md
100755 → 100644
Empty file.
Empty file modified docs/admin/resourcequota/README.md
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions docs/design/admission_control_resource_quota.md
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ kubectl is modified to support the **ResourceQuota** resource.
For example:

```console
$ kubectl create -f docs/admin/resourcequota/namespace.yaml
$ kubectl create -f test/fixtures/doc-yaml/admin/resourcequota/namespace.yaml
namespace "quota-example" created
$ kubectl create -f docs/admin/resourcequota/quota.yaml --namespace=quota-example
$ kubectl create -f test/fixtures/doc-yaml/admin/resourcequota/quota.yaml --namespace=quota-example
resourcequota "quota" created
$ kubectl describe quota quota --namespace=quota-example
Name: quota
Expand Down
16 changes: 8 additions & 8 deletions docs/devel/how-to-doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ The above example generates the following links:
## How to Include an Example

While writing examples, you may want to show the content of certain example
files (e.g. [pod.yaml](../user-guide/pod.yaml)). In this case, insert the
files (e.g. [pod.yaml](../../test/fixtures/doc-yaml/user-guide/pod.yaml)). In this case, insert the
following code in the md file:

```
Expand All @@ -125,13 +125,13 @@ out-of-date every time you update the example file.
For example, the following:

```
<!-- BEGIN MUNGE: EXAMPLE ../user-guide/pod.yaml -->
<!-- END MUNGE: EXAMPLE ../user-guide/pod.yaml -->
<!-- BEGIN MUNGE: EXAMPLE ../../test/fixtures/doc-yaml/user-guide/pod.yaml -->
<!-- END MUNGE: EXAMPLE ../../test/fixtures/doc-yaml/user-guide/pod.yaml -->
```

generates the following after `hack/update-munge-docs.sh`:

<!-- BEGIN MUNGE: EXAMPLE ../user-guide/pod.yaml -->
<!-- BEGIN MUNGE: EXAMPLE ../../test/fixtures/doc-yaml/user-guide/pod.yaml -->

```yaml
apiVersion: v1
Expand All @@ -148,8 +148,8 @@ spec:
- containerPort: 80
```
[Download example](../user-guide/pod.yaml?raw=true)
<!-- END MUNGE: EXAMPLE ../user-guide/pod.yaml -->
[Download example](../../test/fixtures/doc-yaml/user-guide/pod.yaml?raw=true)
<!-- END MUNGE: EXAMPLE ../../test/fixtures/doc-yaml/user-guide/pod.yaml -->
## Misc.
Expand All @@ -170,7 +170,7 @@ console code block:
```
```console

$ kubectl create -f docs/user-guide/pod.yaml
$ kubectl create -f test/fixtures/doc-yaml/user-guide/pod.yaml
pod "foo" created

``` 
Expand All @@ -179,7 +179,7 @@ pod "foo" created
which renders as:

```console
$ kubectl create -f docs/user-guide/pod.yaml
$ kubectl create -f test/fixtures/doc-yaml/user-guide/pod.yaml
pod "foo" created
```

Expand Down
2 changes: 1 addition & 1 deletion docs/devel/local-cluster/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The following instructions show you how to set up a simple, single node Kubernet

Here's a diagram of what the final result will look like:

![Kubernetes Single Node on Docker](../../getting-started-guides/k8s-singlenode-docker.png)
![Kubernetes Single Node on Docker](k8s-singlenode-docker.png)

## Prerequisites

Expand Down
2 changes: 1 addition & 1 deletion docs/devel/local-cluster/local.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ However you cannot view the nginx start page on localhost. To verify that nginx
You can control the specifications of a pod via a user defined manifest, and reach nginx through your browser on the port specified therein:

```shell
cluster/kubectl.sh create -f docs/user-guide/pod.yaml
cluster/kubectl.sh create -f test/fixtures/doc-yaml/user-guide/pod.yaml
```

Congratulations!
Expand Down
2 changes: 1 addition & 1 deletion docs/devel/running-locally.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ However you cannot view the nginx start page on localhost. To verify that nginx
You can control the specifications of a pod via a user defined manifest, and reach nginx through your browser on the port specified therein:

```sh
cluster/kubectl.sh create -f docs/user-guide/pod.yaml
cluster/kubectl.sh create -f test/fixtures/doc-yaml/user-guide/pod.yaml
```

Congratulations!
Expand Down
Binary file removed docs/getting-started-guides/all-lines.png
Binary file not shown.
Binary file removed docs/getting-started-guides/bigquery-logging.png
Binary file not shown.
Binary file not shown.
Binary file removed docs/getting-started-guides/es-browser.png
Binary file not shown.
Binary file removed docs/getting-started-guides/k8s-docker.png
Binary file not shown.
Binary file removed docs/getting-started-guides/kibana-logs.png
Binary file not shown.
3 changes: 0 additions & 3 deletions docs/getting-started-guides/mesos/OWNERS

This file was deleted.

Binary file removed docs/getting-started-guides/mesos/k8s-firewall.png
Binary file not shown.
Binary file not shown.
Binary file removed docs/user-guide/cadvisor.png
Binary file not shown.
7 changes: 0 additions & 7 deletions docs/user-guide/configmap/kubectl/game.properties

This file was deleted.

4 changes: 0 additions & 4 deletions docs/user-guide/configmap/kubectl/ui.properties

This file was deleted.

2 changes: 0 additions & 2 deletions docs/user-guide/configmap/redis/redis-config

This file was deleted.

16 changes: 0 additions & 16 deletions docs/user-guide/environment-guide/containers/backend/Dockerfile

This file was deleted.

37 changes: 0 additions & 37 deletions docs/user-guide/environment-guide/containers/backend/backend.go

This file was deleted.

16 changes: 0 additions & 16 deletions docs/user-guide/environment-guide/containers/show/Dockerfile

This file was deleted.

95 changes: 0 additions & 95 deletions docs/user-guide/environment-guide/containers/show/show.go

This file was deleted.

Binary file removed docs/user-guide/environment-guide/diagram.png
Binary file not shown.
Binary file removed docs/user-guide/gcm.png
Binary file not shown.
Binary file removed docs/user-guide/horizontal-pod-autoscaler.png
Binary file not shown.
4 changes: 0 additions & 4 deletions docs/user-guide/horizontal-pod-autoscaler.svg

This file was deleted.

19 changes: 0 additions & 19 deletions docs/user-guide/horizontal-pod-autoscaling/image/Dockerfile

This file was deleted.

7 changes: 0 additions & 7 deletions docs/user-guide/horizontal-pod-autoscaling/image/index.php

This file was deleted.

Binary file removed docs/user-guide/influx.png
Binary file not shown.
Binary file removed docs/user-guide/kibana.png
Binary file not shown.
18 changes: 0 additions & 18 deletions docs/user-guide/liveness/image/Dockerfile

This file was deleted.

27 changes: 0 additions & 27 deletions docs/user-guide/liveness/image/Makefile

This file was deleted.

Loading

0 comments on commit 6f90869

Please sign in to comment.