Merge pull request #21063 from gmarek/cleanup

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

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)