kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix-link-to-qos

pull/1483/head
Sergey Orlov 2016-10-17 16:12:47 +03:00 committed by GitHub
parent 4b506ea498 965eb76254
commit c4d943313a
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/admin/static-pods.md
View File

@ -88,7 +88,7 @@ static-web-my-node1 172.17.0.3 my-node1/192.168
Labels from the static pod are propagated into the mirror-pod and can be used as usual for filtering. Labels from the static pod are propagated into the mirror-pod and can be used as usual for filtering.
Notice we cannot delete the pod with the API server (e.g. via [`kubectl`](/docs/user-guide/kubectl/kubectl/) command), kubelet simply won't remove it. Notice we cannot delete the pod with the API server (e.g. via [`kubectl`](/docs/user-guide/kubectl/) command), kubelet simply won't remove it.
```shell ```shell
[joe@my-master ~] $ kubectl delete pod static-web-my-node1 [joe@my-master ~] $ kubectl delete pod static-web-my-node1

2
docs/user-guide/federation/replicasets.md
View File

@ -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 API for traditional Kubernetes Replica Set. You can create a replica set by sending
a request to the federation apiserver. 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 ``` shell
kubectl --context=federation-cluster create -f myrs.yaml kubectl --context=federation-cluster create -f myrs.yaml

2
docs/user-guide/federation/secrets.md
View File

@ -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 API for traditional Kubernetes Secret. You can create a secret by sending
a request to the federation apiserver. 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 ``` shell
kubectl --context=federation-cluster create -f mysecret.yaml kubectl --context=federation-cluster create -f mysecret.yaml

2
docs/user-guide/prereqs.md
View File

@ -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 ## Installing kubectl

2
docs/user-guide/replicasets.md
View File

@ -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) as described in the [labels user guide](/docs/user-guide/labels/#label-selectors)
whereas a Replication Controller only supports equality-based selector requirements. 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 Replication Controllers also support Replica Sets. One exception is the
[`rolling-update`](/docs/user-guide/kubectl/kubectl_rolling-update/) command. If [`rolling-update`](/docs/user-guide/kubectl/kubectl_rolling-update/) command. If
you want the rolling update functionality please consider using Deployments you want the rolling update functionality please consider using Deployments