From 918ddbe5f07df638147f6911e66405a300d0dfb2 Mon Sep 17 00:00:00 2001 From: gmarek Date: Thu, 11 Feb 2016 10:08:06 +0100 Subject: [PATCH] Small cleanup --- cluster/validate-cluster.sh | 2 +- test/e2e/metrics_grabber_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/validate-cluster.sh b/cluster/validate-cluster.sh index c6d0622b19f..3e977f31dab 100755 --- a/cluster/validate-cluster.sh +++ b/cluster/validate-cluster.sh @@ -66,7 +66,7 @@ while true; do if (( attempt > 100 )); then echo -e "${color_red}Detected ${ready} ready nodes, found ${found} nodes out of expected ${EXPECTED_NUM_NODES}. Your cluster may not be fully functional.${color_norm}" "${KUBE_ROOT}/cluster/kubectl.sh" get nodes - if [ "$((${EXPECTED_NUM_NODES} - ${found}))" -gt "${ALLOWED_NOTREADY_NODES}" ]; then + if [ "$((${EXPECTED_NUM_NODES} - ${ready}))" -gt "${ALLOWED_NOTREADY_NODES}" ]; then exit 1 else return_value=2 diff --git a/test/e2e/metrics_grabber_test.go b/test/e2e/metrics_grabber_test.go index e0f6537abe9..888d7f754a3 100644 --- a/test/e2e/metrics_grabber_test.go +++ b/test/e2e/metrics_grabber_test.go @@ -102,7 +102,7 @@ var _ = Describe("MetricsGrabber", func() { It("should grab all metrics from a Kubelet.", func() { // We run this test only on GCE, as for some reason it flakes in GKE #19468 if providerIs("gce") { - By("Connecting proxying to Node through the API server") + By("Proxying to Node through the API server") nodes := ListSchedulableNodesOrDie(c) Expect(nodes.Items).NotTo(BeEmpty()) response, err := grabber.GrabFromKubelet(nodes.Items[0].Name) @@ -112,7 +112,7 @@ var _ = Describe("MetricsGrabber", func() { }) It("should grab all metrics from a Scheduler.", func() { - By("Connecting proxying to Pod through the API server") + By("Proxying to Pod through the API server") // Check if master Node is registered nodes, err := c.Nodes().List(api.ListOptions{}) expectNoError(err) @@ -136,7 +136,7 @@ var _ = Describe("MetricsGrabber", func() { }) It("should grab all metrics from a ControllerManager.", func() { - By("Connecting proxying to Pod through the API server") + By("Proxying to Pod through the API server") // Check if master Node is registered nodes, err := c.Nodes().List(api.ListOptions{}) expectNoError(err)