Merge pull request kubernetes#18177 from eosrei/1111-doc-machine-names

Auto commit by PR queue bot
xingzhou · Dec 11, 2015 · a64798d · a64798d
2 parents 7da888e + 77f62c0
commit a64798d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/developer-guides/vagrant.md b/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/flaky-tests.md b/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
 ```