From ac5726a12f6e65c49f0352244aea893da6f97720 Mon Sep 17 00:00:00 2001 From: Brad Erickson Date: Thu, 3 Dec 2015 15:42:10 -0800 Subject: [PATCH] Minion->Node rename: docs/ machine names only, except gce/aws --- docs/admin/static-pods.md | 44 ++++++++-------- docs/design/event_compression.md | 12 ++--- docs/devel/developer-guides/vagrant.md | 12 ++--- docs/devel/flaky-tests.md | 6 +-- docs/getting-started-guides/libvirt-coreos.md | 8 +-- .../logging-elasticsearch.md | 8 +-- docs/getting-started-guides/logging.md | 10 ++-- .../proposals/compute-resource-metrics-api.md | 2 +- docs/user-guide/compute-resources.md | 16 +++--- docs/user-guide/connecting-applications.md | 4 +- .../user-guide/introspection-and-debugging.md | 52 +++++++++---------- docs/user-guide/kubectl/kubectl_describe.md | 2 +- docs/user-guide/liveness/README.md | 8 +-- 13 files changed, 92 insertions(+), 92 deletions(-) diff --git a/docs/admin/static-pods.md b/docs/admin/static-pods.md index a5598daa0c9..a504b20c6b2 100644 --- a/docs/admin/static-pods.md +++ b/docs/admin/static-pods.md @@ -49,17 +49,17 @@ The configuration files are just standard pod definition in json or yaml format For example, this is how to start a simple web server as a static pod: -1. Choose a node where we want to run the static pod. In this example, it's `my-minion1`. +1. Choose a node where we want to run the static pod. In this example, it's `my-node1`. ```console - [joe@host ~] $ ssh my-minion1 + [joe@host ~] $ ssh my-node1 ``` 2. Choose a directory, say `/etc/kubelet.d` and place a web server pod definition there, e.g. `/etc/kubernetes.d/static-web.yaml`: ```console - [root@my-minion1 ~] $ mkdir /etc/kubernetes.d/ - [root@my-minion1 ~] $ cat </etc/kubernetes.d/static-web.yaml + [root@my-node1 ~] $ mkdir /etc/kubernetes.d/ + [root@my-node1 ~] $ cat </etc/kubernetes.d/static-web.yaml apiVersion: v1 kind: Pod metadata: @@ -88,7 +88,7 @@ For example, this is how to start a simple web server as a static pod: 3. Restart kubelet. On Fedora 21, this is: ```console - [root@my-minion1 ~] $ systemctl restart kubelet + [root@my-node1 ~] $ systemctl restart kubelet ``` ## Pods created via HTTP @@ -100,9 +100,9 @@ Kubelet periodically downloads a file specified by `--manifest-url=` argume 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…): ```console -[joe@my-minion1 ~] $ docker ps +[joe@my-node1 ~] $ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS NAMES -f6d05272b57e nginx:latest "nginx" 8 minutes ago Up 8 minutes k8s_web.6f802af4_static-web-fk-minion1_default_67e24ed9466ba55986d120c867395f3c_378e5f3c +f6d05272b57e nginx:latest "nginx" 8 minutes ago Up 8 minutes k8s_web.6f802af4_static-web-fk-node1_default_67e24ed9466ba55986d120c867395f3c_378e5f3c ``` 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 [joe@host ~] $ ssh my-master [joe@my-master ~] $ kubectl get pods POD IP CONTAINER(S) IMAGE(S) HOST LABELS STATUS CREATED MESSAGE -static-web-my-minion1 172.17.0.3 my-minion1/192.168.100.71 role=myrole Running 11 minutes +static-web-my-node1 172.17.0.3 my-node1/192.168.100.71 role=myrole Running 11 minutes web nginx Running 11 minutes ``` @@ -120,20 +120,20 @@ Labels from the static pod are propagated into the mirror-pod and can be used as 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. ```console -[joe@my-master ~] $ kubectl delete pod static-web-my-minion1 -pods/static-web-my-minion1 +[joe@my-master ~] $ kubectl delete pod static-web-my-node1 +pods/static-web-my-node1 [joe@my-master ~] $ kubectl get pods POD IP CONTAINER(S) IMAGE(S) HOST ... -static-web-my-minion1 172.17.0.3 my-minion1/192.168.100.71 ... +static-web-my-node1 172.17.0.3 my-node1/192.168.100.71 ... ``` -Back to our `my-minion1` host, we can try to stop the container manually and see, that kubelet automatically restarts it in a while: +Back to our `my-node1` host, we can try to stop the container manually and see, that kubelet automatically restarts it in a while: ```console -[joe@host ~] $ ssh my-minion1 -[joe@my-minion1 ~] $ docker stop f6d05272b57e -[joe@my-minion1 ~] $ sleep 20 -[joe@my-minion1 ~] $ docker ps +[joe@host ~] $ ssh my-node1 +[joe@my-node1 ~] $ docker stop f6d05272b57e +[joe@my-node1 ~] $ sleep 20 +[joe@my-node1 ~] $ docker ps CONTAINER ID IMAGE COMMAND CREATED ... 5b920cbaf8b1 nginx:latest "nginx -g 'daemon of 2 seconds ago ... ``` @@ -143,13 +143,13 @@ CONTAINER ID IMAGE COMMAND CREATED ... 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. ```console -[joe@my-minion1 ~] $ mv /etc/kubernetes.d/static-web.yaml /tmp -[joe@my-minion1 ~] $ sleep 20 -[joe@my-minion1 ~] $ docker ps +[joe@my-node1 ~] $ mv /etc/kubernetes.d/static-web.yaml /tmp +[joe@my-node1 ~] $ sleep 20 +[joe@my-node1 ~] $ docker ps // no nginx container is running -[joe@my-minion1 ~] $ mv /tmp/static-web.yaml /etc/kubernetes.d/ -[joe@my-minion1 ~] $ sleep 20 -[joe@my-minion1 ~] $ docker ps +[joe@my-node1 ~] $ mv /tmp/static-web.yaml /etc/kubernetes.d/ +[joe@my-node1 ~] $ sleep 20 +[joe@my-node1 ~] $ docker ps CONTAINER ID IMAGE COMMAND CREATED ... e7a62e3427f1 nginx:latest "nginx -g 'daemon of 27 seconds ago ``` diff --git a/docs/design/event_compression.md b/docs/design/event_compression.md index c7982712b4e..a8c5916b309 100644 --- a/docs/design/event_compression.md +++ b/docs/design/event_compression.md @@ -119,17 +119,17 @@ Sample kubectl output ```console FIRSTSEEN LASTSEEN COUNT NAME KIND SUBOBJECT REASON SOURCE MESSAGE -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. -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. -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. -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. +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. +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. +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. +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. 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 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 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 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 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 -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" -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 +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" +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 ``` This demonstrates what would have been 20 separate entries (indicating scheduling failure) collapsed/compressed down to 5 entries. diff --git a/docs/devel/developer-guides/vagrant.md b/docs/devel/developer-guides/vagrant.md index 74e29e3a8be..14ccfe6b2b3 100644 --- a/docs/devel/developer-guides/vagrant.md +++ b/docs/devel/developer-guides/vagrant.md @@ -139,9 +139,9 @@ You may need to build the binaries first, you can do this with `make` $ ./cluster/kubectl.sh get nodes NAME LABELS STATUS -kubernetes-node-0whl kubernetes.io/hostname=kubernetes-node-0whl Ready -kubernetes-node-4jdf kubernetes.io/hostname=kubernetes-node-4jdf Ready -kubernetes-node-epbe kubernetes.io/hostname=kubernetes-node-epbe Ready +kubernetes-node-0whl kubernetes.io/hostname=kubernetes-node-0whl Ready +kubernetes-node-4jdf kubernetes.io/hostname=kubernetes-node-4jdf Ready +kubernetes-node-epbe kubernetes.io/hostname=kubernetes-node-epbe Ready ``` ### 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: $ ./cluster/kubectl.sh get nodes NAME LABELS STATUS -kubernetes-node-0whl kubernetes.io/hostname=kubernetes-node-0whl Ready -kubernetes-node-4jdf kubernetes.io/hostname=kubernetes-node-4jdf Ready -kubernetes-node-epbe kubernetes.io/hostname=kubernetes-node-epbe Ready +kubernetes-node-0whl kubernetes.io/hostname=kubernetes-node-0whl Ready +kubernetes-node-4jdf kubernetes.io/hostname=kubernetes-node-4jdf Ready +kubernetes-node-epbe kubernetes.io/hostname=kubernetes-node-epbe Ready ``` Now start running some containers! diff --git a/docs/devel/flaky-tests.md b/docs/devel/flaky-tests.md index 27c788aa6be..d5cc6a45163 100644 --- a/docs/devel/flaky-tests.md +++ b/docs/devel/flaky-tests.md @@ -80,9 +80,9 @@ You can use this script to automate checking for failures, assuming your cluster ```sh echo "" > output.txt for i in {1..4}; do - echo "Checking kubernetes-minion-${i}" - echo "kubernetes-minion-${i}:" >> output.txt - gcloud compute ssh "kubernetes-minion-${i}" --command="sudo docker ps -a" >> output.txt + echo "Checking kubernetes-node-${i}" + echo "kubernetes-node-${i}:" >> output.txt + gcloud compute ssh "kubernetes-node-${i}" --command="sudo docker ps -a" >> output.txt done grep "Exited ([^0])" output.txt ``` diff --git a/docs/getting-started-guides/libvirt-coreos.md b/docs/getting-started-guides/libvirt-coreos.md index 2d3ec2ad050..ca6c5695e02 100644 --- a/docs/getting-started-guides/libvirt-coreos.md +++ b/docs/getting-started-guides/libvirt-coreos.md @@ -181,9 +181,9 @@ $ virsh -c qemu:///system list Id Name State ---------------------------------------------------- 15 kubernetes_master running - 16 kubernetes_minion-01 running - 17 kubernetes_minion-02 running - 18 kubernetes_minion-03 running + 16 kubernetes_node-01 running + 17 kubernetes_node-02 running + 18 kubernetes_node-03 running ``` You can check that the Kubernetes cluster is working with: @@ -208,7 +208,7 @@ Connect to `kubernetes_master`: ssh core@192.168.10.1 ``` -Connect to `kubernetes_minion-01`: +Connect to `kubernetes_node-01`: ```sh ssh core@192.168.10.2 diff --git a/docs/getting-started-guides/logging-elasticsearch.md b/docs/getting-started-guides/logging-elasticsearch.md index 505af86f36d..f2a4a79dea0 100644 --- a/docs/getting-started-guides/logging-elasticsearch.md +++ b/docs/getting-started-guides/logging-elasticsearch.md @@ -77,10 +77,10 @@ $ kubectl get pods --namespace=kube-system NAME READY REASON RESTARTS AGE elasticsearch-logging-v1-78nog 1/1 Running 0 2h elasticsearch-logging-v1-nj2nb 1/1 Running 0 2h -fluentd-elasticsearch-kubernetes-minion-5oq0 1/1 Running 0 2h -fluentd-elasticsearch-kubernetes-minion-6896 1/1 Running 0 2h -fluentd-elasticsearch-kubernetes-minion-l1ds 1/1 Running 0 2h -fluentd-elasticsearch-kubernetes-minion-lz9j 1/1 Running 0 2h +fluentd-elasticsearch-kubernetes-node-5oq0 1/1 Running 0 2h +fluentd-elasticsearch-kubernetes-node-6896 1/1 Running 0 2h +fluentd-elasticsearch-kubernetes-node-l1ds 1/1 Running 0 2h +fluentd-elasticsearch-kubernetes-node-lz9j 1/1 Running 0 2h kibana-logging-v1-bhpo8 1/1 Running 0 2h kube-dns-v3-7r1l9 3/3 Running 0 2h monitoring-heapster-v4-yl332 1/1 Running 1 2h diff --git a/docs/getting-started-guides/logging.md b/docs/getting-started-guides/logging.md index 1677c9b10f8..2a195c0747e 100644 --- a/docs/getting-started-guides/logging.md +++ b/docs/getting-started-guides/logging.md @@ -41,10 +41,10 @@ logging and DNS resolution for names of Kubernetes services: ```console $ kubectl get pods --namespace=kube-system NAME READY REASON RESTARTS AGE -fluentd-cloud-logging-kubernetes-minion-0f64 1/1 Running 0 32m -fluentd-cloud-logging-kubernetes-minion-27gf 1/1 Running 0 32m -fluentd-cloud-logging-kubernetes-minion-pk22 1/1 Running 0 31m -fluentd-cloud-logging-kubernetes-minion-20ej 1/1 Running 0 31m +fluentd-cloud-logging-kubernetes-node-0f64 1/1 Running 0 32m +fluentd-cloud-logging-kubernetes-node-27gf 1/1 Running 0 32m +fluentd-cloud-logging-kubernetes-node-pk22 1/1 Running 0 31m +fluentd-cloud-logging-kubernetes-node-20ej 1/1 Running 0 31m kube-dns-v3-pk22 3/3 Running 0 32m monitoring-heapster-v1-20ej 0/1 Running 9 32m ``` @@ -215,7 +215,7 @@ Note the first container counted to 108 and then it was terminated. When the nex ```console SELECT metadata.timestamp, structPayload.log - FROM [mylogs.kubernetes_counter_default_count_20150611] + FROM [mylogs.kubernetes_counter_default_count_20150611] ORDER BY metadata.timestamp DESC ``` diff --git a/docs/proposals/compute-resource-metrics-api.md b/docs/proposals/compute-resource-metrics-api.md index b716dbd8e96..25ec76cdf84 100644 --- a/docs/proposals/compute-resource-metrics-api.md +++ b/docs/proposals/compute-resource-metrics-api.md @@ -68,7 +68,7 @@ user via a periodically refreshing interface similar to `top` on Unix-like systems. This info could let users assign resource limits more efficiently. ``` -$ kubectl top kubernetes-minion-abcd +$ kubectl top kubernetes-node-abcd POD CPU MEM monitoring-heapster-abcde 0.12 cores 302 MB kube-ui-v1-nd7in 0.07 cores 130 MB diff --git a/docs/user-guide/compute-resources.md b/docs/user-guide/compute-resources.md index 4890ee757a5..921e2fc6eae 100644 --- a/docs/user-guide/compute-resources.md +++ b/docs/user-guide/compute-resources.md @@ -228,7 +228,7 @@ on the pod you are interested in: Name: simmemleak-hra99 Namespace: default Image(s): saadali/simmemleak -Node: kubernetes-minion-tf0f/10.240.216.66 +Node: kubernetes-node-tf0f/10.240.216.66 Labels: name=simmemleak Status: Running Reason: @@ -251,14 +251,14 @@ Containers: Restart Count: 5 Conditions: Type Status - Ready False + Ready False Events: FirstSeen LastSeen Count From SubobjectPath Reason Message - Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {scheduler } scheduled Successfully assigned simmemleak-hra99 to kubernetes-minion-tf0f - Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-minion-tf0f} implicitly required container POD pulled Pod container image "gcr.io/google_containers/pause:0.8.0" already present on machine - Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-minion-tf0f} implicitly required container POD created Created with docker id 6a41280f516d - Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-minion-tf0f} implicitly required container POD started Started with docker id 6a41280f516d - Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-minion-tf0f} spec.containers{simmemleak} created Created with docker id 87348f12526a + Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {scheduler } scheduled Successfully assigned simmemleak-hra99 to kubernetes-node-tf0f + Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD pulled Pod container image "gcr.io/google_containers/pause:0.8.0" already present on machine + Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD created Created with docker id 6a41280f516d + Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD started Started with docker id 6a41280f516d + Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} spec.containers{simmemleak} created Created with docker id 87348f12526a ``` The `Restart Count: 5` indicates that the `simmemleak` container in this pod was terminated and restarted 5 times. @@ -268,7 +268,7 @@ You can call `get pod` with the `-o go-template=...` option to fetch the status ```console [13:59:01] $ ./cluster/kubectl.sh get pod -o go-template='{{range.status.containerStatuses}}{{"Container Name: "}}{{.name}}{{"\r\nLastState: "}}{{.lastState}}{{end}}' simmemleak-60xbc Container Name: simmemleak -LastState: map[terminated:map[exitCode:137 reason:OOM Killed startedAt:2015-07-07T20:58:43Z finishedAt:2015-07-07T20:58:43Z containerID:docker://0e4095bba1feccdfe7ef9fb6ebffe972b4b14285d5acdec6f0d3ae8a22fad8b2]][13:59:03] clusterScaleDoc ~/go/src/github.com/kubernetes/kubernetes $ +LastState: map[terminated:map[exitCode:137 reason:OOM Killed startedAt:2015-07-07T20:58:43Z finishedAt:2015-07-07T20:58:43Z containerID:docker://0e4095bba1feccdfe7ef9fb6ebffe972b4b14285d5acdec6f0d3ae8a22fad8b2]][13:59:03] clusterScaleDoc ~/go/src/github.com/kubernetes/kubernetes $ ``` We can see that this container was terminated because `reason:OOM Killed`, where *OOM* stands for Out Of Memory. diff --git a/docs/user-guide/connecting-applications.md b/docs/user-guide/connecting-applications.md index cec85e10591..638fae40a50 100644 --- a/docs/user-guide/connecting-applications.md +++ b/docs/user-guide/connecting-applications.md @@ -88,8 +88,8 @@ This makes it accessible from any node in your cluster. Check the nodes the pod ```console $ kubectl create -f ./nginxrc.yaml $ kubectl get pods -l app=nginx -o wide -my-nginx-6isf4 1/1 Running 0 2h e2e-test-beeps-minion-93ly -my-nginx-t26zt 1/1 Running 0 2h e2e-test-beeps-minion-93ly +my-nginx-6isf4 1/1 Running 0 2h e2e-test-beeps-node-93ly +my-nginx-t26zt 1/1 Running 0 2h e2e-test-beeps-node-93ly ``` Check your pods' IPs: diff --git a/docs/user-guide/introspection-and-debugging.md b/docs/user-guide/introspection-and-debugging.md index b3904234cca..b7d885780e8 100644 --- a/docs/user-guide/introspection-and-debugging.md +++ b/docs/user-guide/introspection-and-debugging.md @@ -93,7 +93,7 @@ We can retrieve a lot more information about each of these pods using `kubectl d $ kubectl describe pod my-nginx-gy1ij Name: my-nginx-gy1ij Image(s): nginx -Node: kubernetes-minion-y3vk/10.240.154.168 +Node: kubernetes-node-y3vk/10.240.154.168 Labels: app=nginx Status: Running Reason: @@ -115,13 +115,13 @@ Conditions: Ready True Events: FirstSeen LastSeen Count From SubobjectPath Reason Message - Thu, 09 Jul 2015 15:32:58 -0700 Thu, 09 Jul 2015 15:32:58 -0700 1 {scheduler } scheduled Successfully assigned my-nginx-gy1ij to kubernetes-minion-y3vk - Thu, 09 Jul 2015 15:32:58 -0700 Thu, 09 Jul 2015 15:32:58 -0700 1 {kubelet kubernetes-minion-y3vk} implicitly required container POD pulled Pod container image "gcr.io/google_containers/pause:0.8.0" already present on machine - Thu, 09 Jul 2015 15:32:58 -0700 Thu, 09 Jul 2015 15:32:58 -0700 1 {kubelet kubernetes-minion-y3vk} implicitly required container POD created Created with docker id cd1644065066 - Thu, 09 Jul 2015 15:32:58 -0700 Thu, 09 Jul 2015 15:32:58 -0700 1 {kubelet kubernetes-minion-y3vk} implicitly required container POD started Started with docker id cd1644065066 - Thu, 09 Jul 2015 15:33:06 -0700 Thu, 09 Jul 2015 15:33:06 -0700 1 {kubelet kubernetes-minion-y3vk} spec.containers{nginx} pulled Successfully pulled image "nginx" - Thu, 09 Jul 2015 15:33:06 -0700 Thu, 09 Jul 2015 15:33:06 -0700 1 {kubelet kubernetes-minion-y3vk} spec.containers{nginx} created Created with docker id 56d7a7b14dac - Thu, 09 Jul 2015 15:33:07 -0700 Thu, 09 Jul 2015 15:33:07 -0700 1 {kubelet kubernetes-minion-y3vk} spec.containers{nginx} started Started with docker id 56d7a7b14dac + Thu, 09 Jul 2015 15:32:58 -0700 Thu, 09 Jul 2015 15:32:58 -0700 1 {scheduler } scheduled Successfully assigned my-nginx-gy1ij to kubernetes-node-y3vk + Thu, 09 Jul 2015 15:32:58 -0700 Thu, 09 Jul 2015 15:32:58 -0700 1 {kubelet kubernetes-node-y3vk} implicitly required container POD pulled Pod container image "gcr.io/google_containers/pause:0.8.0" already present on machine + Thu, 09 Jul 2015 15:32:58 -0700 Thu, 09 Jul 2015 15:32:58 -0700 1 {kubelet kubernetes-node-y3vk} implicitly required container POD created Created with docker id cd1644065066 + Thu, 09 Jul 2015 15:32:58 -0700 Thu, 09 Jul 2015 15:32:58 -0700 1 {kubelet kubernetes-node-y3vk} implicitly required container POD started Started with docker id cd1644065066 + Thu, 09 Jul 2015 15:33:06 -0700 Thu, 09 Jul 2015 15:33:06 -0700 1 {kubelet kubernetes-node-y3vk} spec.containers{nginx} pulled Successfully pulled image "nginx" + Thu, 09 Jul 2015 15:33:06 -0700 Thu, 09 Jul 2015 15:33:06 -0700 1 {kubelet kubernetes-node-y3vk} spec.containers{nginx} created Created with docker id 56d7a7b14dac + Thu, 09 Jul 2015 15:33:07 -0700 Thu, 09 Jul 2015 15:33:07 -0700 1 {kubelet kubernetes-node-y3vk} spec.containers{nginx} started Started with docker id 56d7a7b14dac ``` Here you can see configuration information about the container(s) and Pod (labels, resource requirements, etc.), as well as status information about the container(s) and Pod (state, readiness, restart count, events, etc.) @@ -231,7 +231,7 @@ spec: name: default-token-zkhkk readOnly: true dnsPolicy: ClusterFirst - nodeName: kubernetes-minion-u619 + nodeName: kubernetes-node-u619 restartPolicy: Always serviceAccountName: default volumes: @@ -266,14 +266,14 @@ Sometimes when debugging it can be useful to look at the status of a node -- for ```console $ kubectl get nodes NAME LABELS STATUS -kubernetes-minion-861h kubernetes.io/hostname=kubernetes-minion-861h NotReady -kubernetes-minion-bols kubernetes.io/hostname=kubernetes-minion-bols Ready -kubernetes-minion-st6x kubernetes.io/hostname=kubernetes-minion-st6x Ready -kubernetes-minion-unaj kubernetes.io/hostname=kubernetes-minion-unaj Ready +kubernetes-node-861h kubernetes.io/hostname=kubernetes-node-861h NotReady +kubernetes-node-bols kubernetes.io/hostname=kubernetes-node-bols Ready +kubernetes-node-st6x kubernetes.io/hostname=kubernetes-node-st6x Ready +kubernetes-node-unaj kubernetes.io/hostname=kubernetes-node-unaj Ready -$ kubectl describe node kubernetes-minion-861h -Name: kubernetes-minion-861h -Labels: kubernetes.io/hostname=kubernetes-minion-861h +$ kubectl describe node kubernetes-node-861h +Name: kubernetes-node-861h +Labels: kubernetes.io/hostname=kubernetes-node-861h CreationTimestamp: Fri, 10 Jul 2015 14:32:29 -0700 Conditions: Type Status LastHeartbeatTime LastTransitionTime Reason Message @@ -295,28 +295,28 @@ Pods: (0 in total) Namespace Name Events: FirstSeen LastSeen Count From SubobjectPath Reason Message - Fri, 10 Jul 2015 14:32:28 -0700 Fri, 10 Jul 2015 14:32:28 -0700 1 {kubelet kubernetes-minion-861h} NodeNotReady Node kubernetes-minion-861h status is now: NodeNotReady - Fri, 10 Jul 2015 14:32:30 -0700 Fri, 10 Jul 2015 14:32:30 -0700 1 {kubelet kubernetes-minion-861h} NodeNotReady Node kubernetes-minion-861h status is now: NodeNotReady - Fri, 10 Jul 2015 14:33:00 -0700 Fri, 10 Jul 2015 14:33:00 -0700 1 {kubelet kubernetes-minion-861h} starting Starting kubelet. - Fri, 10 Jul 2015 14:33:02 -0700 Fri, 10 Jul 2015 14:33:02 -0700 1 {kubelet kubernetes-minion-861h} NodeReady Node kubernetes-minion-861h status is now: NodeReady - Fri, 10 Jul 2015 14:35:15 -0700 Fri, 10 Jul 2015 14:35:15 -0700 1 {controllermanager } NodeNotReady Node kubernetes-minion-861h status is now: NodeNotReady + Fri, 10 Jul 2015 14:32:28 -0700 Fri, 10 Jul 2015 14:32:28 -0700 1 {kubelet kubernetes-node-861h} NodeNotReady Node kubernetes-node-861h status is now: NodeNotReady + Fri, 10 Jul 2015 14:32:30 -0700 Fri, 10 Jul 2015 14:32:30 -0700 1 {kubelet kubernetes-node-861h} NodeNotReady Node kubernetes-node-861h status is now: NodeNotReady + Fri, 10 Jul 2015 14:33:00 -0700 Fri, 10 Jul 2015 14:33:00 -0700 1 {kubelet kubernetes-node-861h} starting Starting kubelet. + Fri, 10 Jul 2015 14:33:02 -0700 Fri, 10 Jul 2015 14:33:02 -0700 1 {kubelet kubernetes-node-861h} NodeReady Node kubernetes-node-861h status is now: NodeReady + Fri, 10 Jul 2015 14:35:15 -0700 Fri, 10 Jul 2015 14:35:15 -0700 1 {controllermanager } NodeNotReady Node kubernetes-node-861h status is now: NodeNotReady -$ kubectl get node kubernetes-minion-861h -o yaml +$ kubectl get node kubernetes-node-861h -o yaml apiVersion: v1 kind: Node metadata: creationTimestamp: 2015-07-10T21:32:29Z labels: - kubernetes.io/hostname: kubernetes-minion-861h - name: kubernetes-minion-861h + kubernetes.io/hostname: kubernetes-node-861h + name: kubernetes-node-861h resourceVersion: "757" - selfLink: /api/v1/nodes/kubernetes-minion-861h + selfLink: /api/v1/nodes/kubernetes-node-861h uid: 2a69374e-274b-11e5-a234-42010af0d969 spec: externalID: "15233045891481496305" podCIDR: 10.244.0.0/24 - providerID: gce://striped-torus-760/us-central1-b/kubernetes-minion-861h + providerID: gce://striped-torus-760/us-central1-b/kubernetes-node-861h status: addresses: - address: 10.240.115.55 diff --git a/docs/user-guide/kubectl/kubectl_describe.md b/docs/user-guide/kubectl/kubectl_describe.md index 7550c1f0047..5c3e9cd4405 100644 --- a/docs/user-guide/kubectl/kubectl_describe.md +++ b/docs/user-guide/kubectl/kubectl_describe.md @@ -120,7 +120,7 @@ $ kubectl describe pods frontend * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra on 24-Nov-2015 +###### Auto generated by spf13/cobra on 3-Dec-2015 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_describe.md?pixel)]() diff --git a/docs/user-guide/liveness/README.md b/docs/user-guide/liveness/README.md index c240cf3a7ec..45775d665ba 100644 --- a/docs/user-guide/liveness/README.md +++ b/docs/user-guide/liveness/README.md @@ -107,10 +107,10 @@ At the bottom of the *kubectl describe* output there are messages indicating tha ```console $ kubectl describe pods liveness-exec [...] -Sat, 27 Jun 2015 13:43:03 +0200 Sat, 27 Jun 2015 13:44:34 +0200 4 {kubelet kubernetes-minion-6fbi} spec.containers{liveness} unhealthy Liveness probe failed: cat: can't open '/tmp/health': No such file or directory -Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-minion-6fbi} spec.containers{liveness} killing Killing with docker id 65b52d62c635 -Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-minion-6fbi} spec.containers{liveness} created Created with docker id ed6bb004ee10 -Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-minion-6fbi} spec.containers{liveness} started Started with docker id ed6bb004ee10 +Sat, 27 Jun 2015 13:43:03 +0200 Sat, 27 Jun 2015 13:44:34 +0200 4 {kubelet kubernetes-node-6fbi} spec.containers{liveness} unhealthy Liveness probe failed: cat: can't open '/tmp/health': No such file or directory +Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-node-6fbi} spec.containers{liveness} killing Killing with docker id 65b52d62c635 +Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-node-6fbi} spec.containers{liveness} created Created with docker id ed6bb004ee10 +Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-node-6fbi} spec.containers{liveness} started Started with docker id ed6bb004ee10 ```