summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-merge-robot <k8s.production.user@gmail.com>2015-12-10 21:42:08 -0800
committerk8s-merge-robot <k8s.production.user@gmail.com>2015-12-10 21:42:08 -0800
commita64798d24c9ce71c4843327fd2a090771f7b74c4 (patch)
treee4487698bc71d099af44c40042135a30139fd251
parent7da888eee00d0ca825059b7ceaf05dbdecceaf38 (diff)
parent77f62c05d2577f3eae2c07fa513d7334e8241e98 (diff)
Merge pull request #18177 from eosrei/1111-doc-machine-names
Auto commit by PR queue bot
-rw-r--r--developer-guides/vagrant.md12
-rw-r--r--flaky-tests.md6
2 files changed, 9 insertions, 9 deletions
diff --git a/developer-guides/vagrant.md b/developer-guides/vagrant.md
index 74e29e3a..14ccfe6b 100644
--- 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
index 27c788aa..d5cc6a45 100644
--- 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
```