Skip to content

Commit

Permalink
Merge branch 'master' into release-1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
steveperry-53 committed Sep 27, 2017
2 parents 9e6d670 + 21a2110 commit 4d407c1
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 12 deletions.
2 changes: 1 addition & 1 deletion docs/api-reference/v1.5/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h4 id="additional-operations">Additional Operations</h4>
<p><strong>Read / Write Status</strong>: Read or Update the Status for a resource object. The Status can only changed through these update operations.</p>
<hr>
<h1 id="-strong-workloads-strong-"><strong>WORKLOADS</strong></h1>
<p>Worloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1">Containers</a> are created
<p>Workloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1">Containers</a> are created
by Controllers through <a href="#pod-v1">Pods</a>. Pods run Containers and provide environmental dependencies such as shared or
persistent storage <a href="#volume-v1">Volumes</a> and <a href="#configmap-v1">Configuration</a> or <a href="#secret-v1">Secret</a> data injected into the
container.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/api-reference/v1.6/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h4 id="additional-operations">Additional Operations</h4>
<p><strong>Read / Write Status</strong>: Read or Update the Status for a resource object. The Status can only changed through these update operations.</p>
<hr>
<h1 id="-strong-workloads-strong-"><strong>WORKLOADS</strong></h1>
<p>Worloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1-core">Containers</a> are created
<p>Workloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1-core">Containers</a> are created
by Controllers through <a href="#pod-v1-core">Pods</a>. Pods run Containers and provide environmental dependencies such as shared or
persistent storage <a href="#volume-v1-core">Volumes</a> and <a href="#configmap-v1-core">Configuration</a> or <a href="#secret-v1-core">Secret</a> data injected into the
container.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/api-reference/v1.7/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h4 id="additional-operations">Additional Operations</h4>
<p><strong>Read / Write Status</strong>: Read or Update the Status for a resource object. The Status can only changed through these update operations.</p>
<hr>
<h1 id="-strong-workloads-strong-"><strong>WORKLOADS</strong></h1>
<p>Worloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1-core">Containers</a> are created
<p>Workloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1-core">Containers</a> are created
by Controllers through <a href="#pod-v1-core">Pods</a>. Pods run Containers and provide environmental dependencies such as shared or
persistent storage <a href="#volume-v1-core">Volumes</a> and <a href="#configmap-v1-core">Configuration</a> or <a href="#secret-v1-core">Secret</a> data injected into the
container.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/cluster-administration/manage-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Because `kubectl` outputs resource names in the same syntax it accepts, it's eas
```shell
$ kubectl get $(kubectl create -f docs/user-guide/nginx/ -o name | grep service)
NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE
my-nginx-svc 10.0.0.208 80/TCP 0s
my-nginx-svc 10.0.0.208 <pending> 80/TCP 0s
```

With the above commands, we first create resources under docs/user-guide/nginx/ and print the resources created with `-o name` output format
Expand Down
4 changes: 2 additions & 2 deletions docs/concepts/workloads/controllers/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ The following is an example of a Deployment. It creates a ReplicaSet to bring up

In this example:

* A Deployment named `nginx` is created, indicated by the `metadata: name` field.
* A Deployment named `nginx-deployment` is created, indicated by the `metadata: name` field.
* The Deployment creates three replicated Pods, indicated by the `replicas` field.
* The Pod template's specification, or `template: spec` field, indicates that
the Pods run one container, `nginx`, which runs the `nginx`
Expand Down Expand Up @@ -137,7 +137,7 @@ The created ReplicaSet ensures that there are three `nginx` Pods running at all
**Note:** Do not change this label.
{: .note}

The `pod-template-hash label` is added by the Deployment controller to every ReplicaSet that a Deployment creates or adopts.
The `pod-template-hash label` is added by the Deployment controller to every ReplicaSet that a Deployment creates or adopts.

This label ensures that child ReplicaSets of a Deployment do not overlap. It is generated by hashing the `PodTemplate` of the ReplicaSet and using the resulting hash as the label value that is added to the ReplicaSet selector, Pod template labels,
and in any existing Pods that the ReplicaSet might have.
Expand Down
2 changes: 1 addition & 1 deletion docs/resources-reference/v1.5/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div id="wrapper">
<div id="code-tabs-wrapper" class="code-tabs"><ul class="code-tab-list"><li class="code-tab" id="example">example</li></ul></div>
<div id="page-content-wrapper" class="body-content container-fluid"><h1 id="-strong-workloads-strong-"><strong>WORKLOADS</strong></h1>
<p>Worloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1">Containers</a> are created
<p>Workloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1">Containers</a> are created
by Controllers through <a href="#pod-v1">Pods</a>. Pods run Containers and provide environmental dependencies such as shared or
persistent storage <a href="#volume-v1">Volumes</a> and <a href="#configmap-v1">Configuration</a> or <a href="#secret-v1">Secret</a> data injected into the
container.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/resources-reference/v1.6/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div id="wrapper">
<div id="code-tabs-wrapper" class="code-tabs"><ul class="code-tab-list"><li class="code-tab" id="example">example</li></ul></div>
<div id="page-content-wrapper" class="body-content container-fluid"><h1 id="-strong-workloads-strong-"><strong>WORKLOADS</strong></h1>
<p>Worloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1-core">Containers</a> are created
<p>Workloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1-core">Containers</a> are created
by Controllers through <a href="#pod-v1-core">Pods</a>. Pods run Containers and provide environmental dependencies such as shared or
persistent storage <a href="#volume-v1-core">Volumes</a> and <a href="#configmap-v1-core">Configuration</a> or <a href="#secret-v1-core">Secret</a> data injected into the
container.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/resources-reference/v1.7/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div id="wrapper">
<div id="code-tabs-wrapper" class="code-tabs"><ul class="code-tab-list"><li class="code-tab" id="example">example</li></ul></div>
<div id="page-content-wrapper" class="body-content container-fluid"><h1 id="-strong-workloads-strong-"><strong>WORKLOADS</strong></h1>
<p>Worloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1-core">Containers</a> are created
<p>Workloads resources are responsible for managing and running your containers on the cluster. <a href="#container-v1-core">Containers</a> are created
by Controllers through <a href="#pod-v1-core">Pods</a>. Pods run Containers and provide environmental dependencies such as shared or
persistent storage <a href="#volume-v1-core">Volumes</a> and <a href="#configmap-v1-core">Configuration</a> or <a href="#secret-v1-core">Secret</a> data injected into the
container.</p>
Expand Down
10 changes: 9 additions & 1 deletion docs/setup/independent/create-cluster-kubeadm.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,9 @@ kubectl apply -f https://raw.githubusercontent.com/romana/romana/master/containe

The official Weave Net set-up guide is [here](https://www.weave.works/docs/net/latest/kube-addon/).

**Note:** Weave Net works on `amd64`, `arm` and `arm64` without any extra action required.
**Note:** Weave Net works on `amd64`, `arm` and `arm64` without any extra action required.
Weave Net sets hairpin mode by default. This allows Pods to access themselves via their Service IP address
if they don't know their PodIP.

```shell
export kubever=$(kubectl version | base64 | tr -d '\n')
Expand Down Expand Up @@ -558,6 +560,12 @@ You may have trouble in the configuration if you see Pod statuses like `RunConta

If not, you may still use the [NodePort feature of
services](/docs/concepts/services-networking/service/#type-nodeport) or use `HostNetwork=true`.

1. **Pods cannot access themselves via their Service IP**.
Many network add-ons do not yet enable [hairpin mode](https://kubernetes.io/docs/tasks/debug-application-cluster/debug-service/#a-pod-cannot-reach-itself-via-service-ip)
which allows pods to access themselves via their Service IP if they don't know about their podIP. This is an issue
related to [CNI](https://github.com/containernetworking/cni/issues/476). Please contact the providers of the network
add-on providers to get timely information about whether they support hairpin mode.

1. If you are using VirtualBox (directly or via Vagrant), you will need to
ensure that `hostname -i` returns a routable IP address (i.e. one on the
Expand Down
4 changes: 2 additions & 2 deletions docs/setup/pick-right-solution.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ When you are ready to scale up to more machines and higher availability, a [host
[Turnkey cloud solutions](#turnkey-cloud-solutions) require only a few commands to create
and cover a wide range of cloud providers.

If you already have a way to configure hosting resources, use [kubeadm](/docs/getting-started-guides/kubeadm/) to easily bring up a cluster with a single command per machine.
If you already have a way to configure hosting resources, use [kubeadm](/docs/setup/independent/create-cluster-kubeadm/) to easily bring up a cluster with a single command per machine.

[Custom solutions](#custom-solutions) vary from step-by-step instructions to general advice for setting up
a Kubernetes cluster from scratch.
Expand Down Expand Up @@ -88,7 +88,7 @@ If you are interested in supporting Kubernetes on a new platform, see
## Universal

If you already have a way to configure hosting resources, use
[kubeadm](/docs/getting-started-guides/kubeadm/) to easily bring up a cluster
[kubeadm](/docs/setup/independent/create-cluster-kubeadm/) to easily bring up a cluster
with a single command per machine.

## Cloud
Expand Down

0 comments on commit 4d407c1

Please sign in to comment.