Skip to content

Commit 4a22f2f

Browse files
author
k8s-merge-robot
committed
Merge pull request kubernetes#18177 from eosrei/1111-doc-machine-names
Auto commit by PR queue bot
2 parents dc88f18 + ac5726a commit 4a22f2f

13 files changed

Lines changed: 93 additions & 93 deletions

File tree

‎docs/admin/static-pods.md‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ The configuration files are just standard pod definition in json or yaml format
4949

5050
For example, this is how to start a simple web server as a static pod:
5151

52-
1. Choose a node where we want to run the static pod. In this example, it's `my-minion1`.
52+
1. Choose a node where we want to run the static pod. In this example, it's `my-node1`.
5353

5454
```console
55-
[joe@host ~] $ ssh my-minion1
55+
[joe@host ~] $ ssh my-node1
5656
```
5757

5858
2. Choose a directory, say `/etc/kubelet.d` and place a web server pod definition there, e.g. `/etc/kubernetes.d/static-web.yaml`:
5959

6060
```console
61-
[root@my-minion1 ~] $ mkdir /etc/kubernetes.d/
62-
[root@my-minion1 ~] $ cat <<EOF >/etc/kubernetes.d/static-web.yaml
61+
[root@my-node1 ~] $ mkdir /etc/kubernetes.d/
62+
[root@my-node1 ~] $ cat <<EOF >/etc/kubernetes.d/static-web.yaml
6363
apiVersion: v1
6464
kind: Pod
6565
metadata:
@@ -88,7 +88,7 @@ For example, this is how to start a simple web server as a static pod:
8888
3. Restart kubelet. On Fedora 21, this is:
8989

9090
```console
91-
[root@my-minion1 ~] $ systemctl restart kubelet
91+
[root@my-node1 ~] $ systemctl restart kubelet
9292
```
9393

9494
## Pods created via HTTP
@@ -100,9 +100,9 @@ Kubelet periodically downloads a file specified by `--manifest-url=<URL>` argume
100100
When kubelet starts, it automatically starts all pods defined in directory specified in `--config=` or `--manifest-url=` arguments, i.e. our static-web. (It may take some time to pull nginx image, be patient…):
101101

102102
```console
103-
[joe@my-minion1 ~] $ docker ps
103+
[joe@my-node1 ~] $ docker ps
104104
CONTAINER ID IMAGE COMMAND CREATED STATUS NAMES
105-
f6d05272b57e nginx:latest "nginx" 8 minutes ago Up 8 minutes k8s_web.6f802af4_static-web-fk-minion1_default_67e24ed9466ba55986d120c867395f3c_378e5f3c
105+
f6d05272b57e nginx:latest "nginx" 8 minutes ago Up 8 minutes k8s_web.6f802af4_static-web-fk-node1_default_67e24ed9466ba55986d120c867395f3c_378e5f3c
106106
```
107107

108108
If we look at our Kubernetes API server (running on host `my-master`), we see that a new mirror-pod was created there too:
@@ -111,7 +111,7 @@ If we look at our Kubernetes API server (running on host `my-master`), we see th
111111
[joe@host ~] $ ssh my-master
112112
[joe@my-master ~] $ kubectl get pods
113113
POD IP CONTAINER(S) IMAGE(S) HOST LABELS STATUS CREATED MESSAGE
114-
static-web-my-minion1 172.17.0.3 my-minion1/192.168.100.71 role=myrole Running 11 minutes
114+
static-web-my-node1 172.17.0.3 my-node1/192.168.100.71 role=myrole Running 11 minutes
115115
web nginx Running 11 minutes
116116
```
117117

@@ -120,20 +120,20 @@ Labels from the static pod are propagated into the mirror-pod and can be used as
120120
Notice we cannot delete the pod with the API server (e.g. via [`kubectl`](../user-guide/kubectl/kubectl.md) command), kubelet simply won't remove it.
121121

122122
```console
123-
[joe@my-master ~] $ kubectl delete pod static-web-my-minion1
124-
pods/static-web-my-minion1
123+
[joe@my-master ~] $ kubectl delete pod static-web-my-node1
124+
pods/static-web-my-node1
125125
[joe@my-master ~] $ kubectl get pods
126126
POD IP CONTAINER(S) IMAGE(S) HOST ...
127-
static-web-my-minion1 172.17.0.3 my-minion1/192.168.100.71 ...
127+
static-web-my-node1 172.17.0.3 my-node1/192.168.100.71 ...
128128
```
129129

130-
Back to our `my-minion1` host, we can try to stop the container manually and see, that kubelet automatically restarts it in a while:
130+
Back to our `my-node1` host, we can try to stop the container manually and see, that kubelet automatically restarts it in a while:
131131

132132
```console
133-
[joe@host ~] $ ssh my-minion1
134-
[joe@my-minion1 ~] $ docker stop f6d05272b57e
135-
[joe@my-minion1 ~] $ sleep 20
136-
[joe@my-minion1 ~] $ docker ps
133+
[joe@host ~] $ ssh my-node1
134+
[joe@my-node1 ~] $ docker stop f6d05272b57e
135+
[joe@my-node1 ~] $ sleep 20
136+
[joe@my-node1 ~] $ docker ps
137137
CONTAINER ID IMAGE COMMAND CREATED ...
138138
5b920cbaf8b1 nginx:latest "nginx -g 'daemon of 2 seconds ago ...
139139
```
@@ -143,13 +143,13 @@ CONTAINER ID IMAGE COMMAND CREATED ...
143143
Running kubelet periodically scans the configured directory (`/etc/kubelet.d` in our example) for changes and adds/removes pods as files appear/disappear in this directory.
144144

145145
```console
146-
[joe@my-minion1 ~] $ mv /etc/kubernetes.d/static-web.yaml /tmp
147-
[joe@my-minion1 ~] $ sleep 20
148-
[joe@my-minion1 ~] $ docker ps
146+
[joe@my-node1 ~] $ mv /etc/kubernetes.d/static-web.yaml /tmp
147+
[joe@my-node1 ~] $ sleep 20
148+
[joe@my-node1 ~] $ docker ps
149149
// no nginx container is running
150-
[joe@my-minion1 ~] $ mv /tmp/static-web.yaml /etc/kubernetes.d/
151-
[joe@my-minion1 ~] $ sleep 20
152-
[joe@my-minion1 ~] $ docker ps
150+
[joe@my-node1 ~] $ mv /tmp/static-web.yaml /etc/kubernetes.d/
151+
[joe@my-node1 ~] $ sleep 20
152+
[joe@my-node1 ~] $ docker ps
153153
CONTAINER ID IMAGE COMMAND CREATED ...
154154
e7a62e3427f1 nginx:latest "nginx -g 'daemon of 27 seconds ago
155155
```

‎docs/design/event_compression.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,17 @@ Sample kubectl output
119119

120120
```console
121121
FIRSTSEEN LASTSEEN COUNT NAME KIND SUBOBJECT REASON SOURCE MESSAGE
122-
Thu, 12 Feb 2015 01:13:02 +0000 Thu, 12 Feb 2015 01:13:02 +0000 1 kubernetes-minion-4.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-minion-4.c.saad-dev-vms.internal} Starting kubelet.
123-
Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-minion-1.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-minion-1.c.saad-dev-vms.internal} Starting kubelet.
124-
Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-minion-3.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-minion-3.c.saad-dev-vms.internal} Starting kubelet.
125-
Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-minion-2.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-minion-2.c.saad-dev-vms.internal} Starting kubelet.
122+
Thu, 12 Feb 2015 01:13:02 +0000 Thu, 12 Feb 2015 01:13:02 +0000 1 kubernetes-node-4.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-node-4.c.saad-dev-vms.internal} Starting kubelet.
123+
Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-node-1.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-node-1.c.saad-dev-vms.internal} Starting kubelet.
124+
Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-node-3.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-node-3.c.saad-dev-vms.internal} Starting kubelet.
125+
Thu, 12 Feb 2015 01:13:09 +0000 Thu, 12 Feb 2015 01:13:09 +0000 1 kubernetes-node-2.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-node-2.c.saad-dev-vms.internal} Starting kubelet.
126126
Thu, 12 Feb 2015 01:13:05 +0000 Thu, 12 Feb 2015 01:13:12 +0000 4 monitoring-influx-grafana-controller-0133o Pod failedScheduling {scheduler } Error scheduling: no nodes available to schedule pods
127127
Thu, 12 Feb 2015 01:13:05 +0000 Thu, 12 Feb 2015 01:13:12 +0000 4 elasticsearch-logging-controller-fplln Pod failedScheduling {scheduler } Error scheduling: no nodes available to schedule pods
128128
Thu, 12 Feb 2015 01:13:05 +0000 Thu, 12 Feb 2015 01:13:12 +0000 4 kibana-logging-controller-gziey Pod failedScheduling {scheduler } Error scheduling: no nodes available to schedule pods
129129
Thu, 12 Feb 2015 01:13:05 +0000 Thu, 12 Feb 2015 01:13:12 +0000 4 skydns-ls6k1 Pod failedScheduling {scheduler } Error scheduling: no nodes available to schedule pods
130130
Thu, 12 Feb 2015 01:13:05 +0000 Thu, 12 Feb 2015 01:13:12 +0000 4 monitoring-heapster-controller-oh43e Pod failedScheduling {scheduler } Error scheduling: no nodes available to schedule pods
131-
Thu, 12 Feb 2015 01:13:20 +0000 Thu, 12 Feb 2015 01:13:20 +0000 1 kibana-logging-controller-gziey BoundPod implicitly required container POD pulled {kubelet kubernetes-minion-4.c.saad-dev-vms.internal} Successfully pulled image "kubernetes/pause:latest"
132-
Thu, 12 Feb 2015 01:13:20 +0000 Thu, 12 Feb 2015 01:13:20 +0000 1 kibana-logging-controller-gziey Pod scheduled {scheduler } Successfully assigned kibana-logging-controller-gziey to kubernetes-minion-4.c.saad-dev-vms.internal
131+
Thu, 12 Feb 2015 01:13:20 +0000 Thu, 12 Feb 2015 01:13:20 +0000 1 kibana-logging-controller-gziey BoundPod implicitly required container POD pulled {kubelet kubernetes-node-4.c.saad-dev-vms.internal} Successfully pulled image "kubernetes/pause:latest"
132+
Thu, 12 Feb 2015 01:13:20 +0000 Thu, 12 Feb 2015 01:13:20 +0000 1 kibana-logging-controller-gziey Pod scheduled {scheduler } Successfully assigned kibana-logging-controller-gziey to kubernetes-node-4.c.saad-dev-vms.internal
133133
```
134134

135135
This demonstrates what would have been 20 separate entries (indicating scheduling failure) collapsed/compressed down to 5 entries.

‎docs/devel/developer-guides/vagrant.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ You may need to build the binaries first, you can do this with `make`
139139
$ ./cluster/kubectl.sh get nodes
140140

141141
NAME LABELS STATUS
142-
kubernetes-node-0whl kubernetes.io/hostname=kubernetes-node-0whl Ready
143-
kubernetes-node-4jdf kubernetes.io/hostname=kubernetes-node-4jdf Ready
144-
kubernetes-node-epbe kubernetes.io/hostname=kubernetes-node-epbe Ready
142+
kubernetes-node-0whl kubernetes.io/hostname=kubernetes-node-0whl Ready
143+
kubernetes-node-4jdf kubernetes.io/hostname=kubernetes-node-4jdf Ready
144+
kubernetes-node-epbe kubernetes.io/hostname=kubernetes-node-epbe Ready
145145
```
146146

147147
### Interacting with your Kubernetes cluster with the `kube-*` scripts.
@@ -206,9 +206,9 @@ Your cluster is running, you can list the nodes in your cluster:
206206
$ ./cluster/kubectl.sh get nodes
207207

208208
NAME LABELS STATUS
209-
kubernetes-node-0whl kubernetes.io/hostname=kubernetes-node-0whl Ready
210-
kubernetes-node-4jdf kubernetes.io/hostname=kubernetes-node-4jdf Ready
211-
kubernetes-node-epbe kubernetes.io/hostname=kubernetes-node-epbe Ready
209+
kubernetes-node-0whl kubernetes.io/hostname=kubernetes-node-0whl Ready
210+
kubernetes-node-4jdf kubernetes.io/hostname=kubernetes-node-4jdf Ready
211+
kubernetes-node-epbe kubernetes.io/hostname=kubernetes-node-epbe Ready
212212
```
213213

214214
Now start running some containers!

‎docs/devel/flaky-tests.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ You can use this script to automate checking for failures, assuming your cluster
8080
```sh
8181
echo "" > output.txt
8282
for i in {1..4}; do
83-
echo "Checking kubernetes-minion-${i}"
84-
echo "kubernetes-minion-${i}:" >> output.txt
85-
gcloud compute ssh "kubernetes-minion-${i}" --command="sudo docker ps -a" >> output.txt
83+
echo "Checking kubernetes-node-${i}"
84+
echo "kubernetes-node-${i}:" >> output.txt
85+
gcloud compute ssh "kubernetes-node-${i}" --command="sudo docker ps -a" >> output.txt
8686
done
8787
grep "Exited ([^0])" output.txt
8888
```

‎docs/getting-started-guides/libvirt-coreos.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ $ virsh -c qemu:///system list
181181
Id Name State
182182
----------------------------------------------------
183183
15 kubernetes_master running
184-
16 kubernetes_minion-01 running
185-
17 kubernetes_minion-02 running
186-
18 kubernetes_minion-03 running
184+
16 kubernetes_node-01 running
185+
17 kubernetes_node-02 running
186+
18 kubernetes_node-03 running
187187
```
188188

189189
You can check that the Kubernetes cluster is working with:
@@ -208,7 +208,7 @@ Connect to `kubernetes_master`:
208208
ssh core@192.168.10.1
209209
```
210210

211-
Connect to `kubernetes_minion-01`:
211+
Connect to `kubernetes_node-01`:
212212

213213
```sh
214214
ssh core@192.168.10.2

‎docs/getting-started-guides/logging-elasticsearch.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ $ kubectl get pods --namespace=kube-system
7777
NAME READY REASON RESTARTS AGE
7878
elasticsearch-logging-v1-78nog 1/1 Running 0 2h
7979
elasticsearch-logging-v1-nj2nb 1/1 Running 0 2h
80-
fluentd-elasticsearch-kubernetes-minion-5oq0 1/1 Running 0 2h
81-
fluentd-elasticsearch-kubernetes-minion-6896 1/1 Running 0 2h
82-
fluentd-elasticsearch-kubernetes-minion-l1ds 1/1 Running 0 2h
83-
fluentd-elasticsearch-kubernetes-minion-lz9j 1/1 Running 0 2h
80+
fluentd-elasticsearch-kubernetes-node-5oq0 1/1 Running 0 2h
81+
fluentd-elasticsearch-kubernetes-node-6896 1/1 Running 0 2h
82+
fluentd-elasticsearch-kubernetes-node-l1ds 1/1 Running 0 2h
83+
fluentd-elasticsearch-kubernetes-node-lz9j 1/1 Running 0 2h
8484
kibana-logging-v1-bhpo8 1/1 Running 0 2h
8585
kube-dns-v3-7r1l9 3/3 Running 0 2h
8686
monitoring-heapster-v4-yl332 1/1 Running 1 2h

‎docs/getting-started-guides/logging.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ logging and DNS resolution for names of Kubernetes services:
4141
```console
4242
$ kubectl get pods --namespace=kube-system
4343
NAME READY REASON RESTARTS AGE
44-
fluentd-cloud-logging-kubernetes-minion-0f64 1/1 Running 0 32m
45-
fluentd-cloud-logging-kubernetes-minion-27gf 1/1 Running 0 32m
46-
fluentd-cloud-logging-kubernetes-minion-pk22 1/1 Running 0 31m
47-
fluentd-cloud-logging-kubernetes-minion-20ej 1/1 Running 0 31m
44+
fluentd-cloud-logging-kubernetes-node-0f64 1/1 Running 0 32m
45+
fluentd-cloud-logging-kubernetes-node-27gf 1/1 Running 0 32m
46+
fluentd-cloud-logging-kubernetes-node-pk22 1/1 Running 0 31m
47+
fluentd-cloud-logging-kubernetes-node-20ej 1/1 Running 0 31m
4848
kube-dns-v3-pk22 3/3 Running 0 32m
4949
monitoring-heapster-v1-20ej 0/1 Running 9 32m
5050
```
@@ -215,7 +215,7 @@ Note the first container counted to 108 and then it was terminated. When the nex
215215

216216
```console
217217
SELECT metadata.timestamp, structPayload.log
218-
FROM [mylogs.kubernetes_counter_default_count_20150611]
218+
FROM [mylogs.kubernetes_counter_default_count_20150611]
219219
ORDER BY metadata.timestamp DESC
220220
```
221221

‎docs/proposals/compute-resource-metrics-api.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ user via a periodically refreshing interface similar to `top` on Unix-like
6868
systems. This info could let users assign resource limits more efficiently.
6969

7070
```
71-
$ kubectl top kubernetes-minion-abcd
71+
$ kubectl top kubernetes-node-abcd
7272
POD CPU MEM
7373
monitoring-heapster-abcde 0.12 cores 302 MB
7474
kube-ui-v1-nd7in 0.07 cores 130 MB

0 commit comments

Comments
 (0)