Skip to content

Commit

Permalink
Merge pull request coreos#153 from aaronlevy/doc_ver
Browse files Browse the repository at this point in the history
docs: change k8s links to v1.1
  • Loading branch information
aaronlevy committed Nov 18, 2015
2 parents 66ecf52 + 7cb7f8f commit 59fc1fc
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Documentation/deploy-addons.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Add-ons are built on the same Kubernetes components as user-submitted jobs &mdas

First create `dns-addon.yml` on your local machine and replace the variable. There is a lot going on in there, so let's break it down after you create it.

[k8s-dns]: http://kubernetes.io/v1.0/docs/admin/dns.html
[k8s-dns]: http://kubernetes.io/v1.1/docs/admin/dns.html

* Replace `${DNS_SERVICE_IP}`

Expand Down Expand Up @@ -157,5 +157,5 @@ $ kubectl get pods --namespace=kube-system | grep kube-dns-v9
<div class="co-m-docs-next-step">
<p>Now that you have a working Kubernetes cluster with a functional CLI tool, you are free to deploy Kubernetes-ready applications.</p>
<p>Start with a multi-tier web application (Guestbook) from the official Kubernetes documentation to visualize how the various Kubernetes components fit together.</p>
<a href="http://kubernetes.io/v1.0/examples/guestbook-go/README.html" class="btn btn-default btn-icon-right" data-category="Docs Next" data-event="kubernetes.io: Guestbook">Deploy the Guestbook Sample app</a>
<a href="http://kubernetes.io/v1.1/examples/guestbook-go/README.html" class="btn btn-default btn-icon-right" data-category="Docs Next" data-event="kubernetes.io: Guestbook">Deploy the Guestbook Sample app</a>
</div>
4 changes: 2 additions & 2 deletions Documentation/deploy-master.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ After=flanneld.service

### Create the kubelet Unit

The [kubelet](http://kubernetes.io/v1.0/docs/admin/kubelet.html) is the agent on each machine that starts and stops Pods and other machine-level tasks. The kubelet communicates with the API server (also running on the master machines) with the TLS certificates we placed on disk earlier.
The [kubelet](http://kubernetes.io/v1.1/docs/admin/kubelet.html) is the agent on each machine that starts and stops Pods and other machine-level tasks. The kubelet communicates with the API server (also running on the master machines) with the TLS certificates we placed on disk earlier.

On the master node, the kubelet is configured to communicate with the API server, but not register for cluster work, as shown in the `--register-node=false` line in the YAML excerpt below. This prevents user pods being scheduled on the master nodes, and ensures cluster work is routed only to task-specific worker nodes.

Expand Down Expand Up @@ -406,7 +406,7 @@ A successful response should look something like:
{
"major": "1",
"minor": "0",
"gitVersion": "v1.0.6",
"gitVersion": "v1.1.1",
"gitCommit": "388061f00f0d9e4d641f9ed4971c775e1654579d",
"gitTreeState": "clean"
}
Expand Down
8 changes: 4 additions & 4 deletions Documentation/kubernetes-networking.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The Kubernetes network model outlines four methods of component communication:

See [Kubernetes Networking][kubernetes-network] for more detailed information on the Kubernetes network model and motiviation.

[kubernetes-network]: http://kubernetes.io/v1.0/docs/admin/networking.html
[kubernetes-network]: http://kubernetes.io/v1.1/docs/admin/networking.html

## Port allocation

Expand Down Expand Up @@ -44,7 +44,7 @@ etcd Node Inbound
| TCP | 2379-2380 | Control Nodes | etcd server client API |
| TCP | 2379-2380 | Worker Nodes | etcd server client API (only required if using flannel). |

[external-service]: http://kubernetes.io/v1.0/docs/user-guide/services.html#external-services
[external-service]: http://kubernetes.io/v1.1/docs/user-guide/services.html#external-services

## Advanced Configuration

Expand Down Expand Up @@ -76,7 +76,7 @@ The actual allocation of Pod IPs on the host can be achieved by configuring Dock

To achieve this network model, there are various methods that can be used. See the [Kubernetes Networking][how-to-achieve] documentation for more detail.

[how-to-achieve]: http://kubernetes.io/v1.0/docs/admin/networking.html#how-to-achieve-this
[how-to-achieve]: http://kubernetes.io/v1.1/docs/admin/networking.html#how-to-achieve-this

### Pod-to-Service Communication

Expand All @@ -90,5 +90,5 @@ IP addresses assigned on the pod network are typically not routable outside of t

In a manually configured network, it may be necessary to open a range of ports to outside clients (default 30000-32767) for use with "external services". See the [Kubernetes Service][kube-service] documentation for more information on external services.

[kube-service]: http://kubernetes.io/v1.0/docs/user-guide/services.html#external-services
[kube-service]: http://kubernetes.io/v1.1/docs/user-guide/services.html#external-services

2 changes: 1 addition & 1 deletion Documentation/kubernetes-on-baremetal.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ However, bare metal is a common platform where a self-managed network is used, d
See the [Kubernetes networking](kubernetes-networking.md) documentation for more information on self-managed networking options.

[coreos-flannel]: https://coreos.com/flannel/docs/latest/flannel-config.html
[pod-network]: http://kubernetes.io/v1.0/docs/design/networking.html#pod-to-pod
[pod-network]: http://kubernetes.io/v1.1/docs/design/networking.html#pod-to-pod

<p><strong>Did you install CoreOS on your machines?</strong> An SSH connection to each machine is all that's needed. We'll start the configuration next.</p>
<div class="co-m-docs-next-step">
Expand Down
4 changes: 2 additions & 2 deletions Documentation/kubernetes-on-vagrant-single.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ NAME LABELS STATUS
<div class="co-m-docs-next-step">
<p><strong>Is kubectl working correctly?</strong></p>
<p>Now that you've got a working Kubernetes cluster with a functional CLI tool, you are free to deploy Kubernetes-ready applications.
Start with a <a href="http://kubernetes.io/v1.0/examples/guestbook-go/README.html" data-category="Docs Next" data-event="kubernetes.io: Guestbook">multi-tier web application</a> from the official Kubernetes documentation to visualize how the various Kubernetes components fit together.</p>
<a href="http://kubernetes.io/v1.0/examples/guestbook-go/README.html" class="btn btn-default btn-icon-right" data-category="Docs Next" data-event="kubernetes.io: Guestbook">View the Guestbook example app</a>
Start with a <a href="http://kubernetes.io/v1.1/examples/guestbook-go/README.html" data-category="Docs Next" data-event="kubernetes.io: Guestbook">multi-tier web application</a> from the official Kubernetes documentation to visualize how the various Kubernetes components fit together.</p>
<a href="http://kubernetes.io/v1.1/examples/guestbook-go/README.html" class="btn btn-default btn-icon-right" data-category="Docs Next" data-event="kubernetes.io: Guestbook">View the Guestbook example app</a>
</div>
4 changes: 2 additions & 2 deletions Documentation/kubernetes-on-vagrant.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ NAME LABELS STATUS
<div class="co-m-docs-next-step">
<p><strong>Is kubectl working correctly?</strong></p>
<p>Now that you've got a working Kubernetes cluster with a functional CLI tool, you are free to deploy Kubernetes-ready applications.
Start with a <a href="http://kubernetes.io/v1.0/examples/guestbook-go/README.html" data-category="Docs Next" data-event="kubernetes.io: Guestbook">multi-tier web application</a> from the official Kubernetes documentation to visualize how the various Kubernetes components fit together.</p>
<a href="http://kubernetes.io/v1.0/examples/guestbook-go/README.html" class="btn btn-default btn-icon-right" data-category="Docs Next" data-event="kubernetes.io: Guestbook">View the Guestbook example app</a>
Start with a <a href="http://kubernetes.io/v1.1/examples/guestbook-go/README.html" data-category="Docs Next" data-event="kubernetes.io: Guestbook">multi-tier web application</a> from the official Kubernetes documentation to visualize how the various Kubernetes components fit together.</p>
<a href="http://kubernetes.io/v1.1/examples/guestbook-go/README.html" class="btn btn-default btn-icon-right" data-category="Docs Next" data-event="kubernetes.io: Guestbook">View the Guestbook example app</a>
</div>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ When designing these guides and tools, the following considerations are made:
* Internal cluster DNS is available
* Service accounts enabled
* Use a cloud-provider if we can, for instance on AWS
* Follow Kubernetes v1.0 guidelines for AdmissionControllers and other suggested configuration
* Follow Kubernetes guidelines for AdmissionControllers and other suggested configuration

## Kubernetes Topics

Expand Down

0 comments on commit 59fc1fc

Please sign in to comment.