Small cleanup

This commit is contained in:
gmarek 2016-02-11 10:08:06 +01:00
parent 06d43a4cdd
commit 918ddbe5f0
2 changed files with 4 additions and 4 deletions

View File

@ -66,7 +66,7 @@ while true; do
if (( attempt > 100 )); then 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}" 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 "${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 exit 1
else else
return_value=2 return_value=2

View File

@ -102,7 +102,7 @@ var _ = Describe("MetricsGrabber", func() {
It("should grab all metrics from a Kubelet.", 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 // We run this test only on GCE, as for some reason it flakes in GKE #19468
if providerIs("gce") { if providerIs("gce") {
By("Connecting proxying to Node through the API server") By("Proxying to Node through the API server")
nodes := ListSchedulableNodesOrDie(c) nodes := ListSchedulableNodesOrDie(c)
Expect(nodes.Items).NotTo(BeEmpty()) Expect(nodes.Items).NotTo(BeEmpty())
response, err := grabber.GrabFromKubelet(nodes.Items[0].Name) 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() { 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 // Check if master Node is registered
nodes, err := c.Nodes().List(api.ListOptions{}) nodes, err := c.Nodes().List(api.ListOptions{})
expectNoError(err) expectNoError(err)
@ -136,7 +136,7 @@ var _ = Describe("MetricsGrabber", func() {
}) })
It("should grab all metrics from a ControllerManager.", 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 // Check if master Node is registered
nodes, err := c.Nodes().List(api.ListOptions{}) nodes, err := c.Nodes().List(api.ListOptions{})
expectNoError(err) expectNoError(err)