Merge pull request #64048 from alexbrand/automated-cherry-pick-of-#60585-origin-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #60585: kubeadm: surface external etcd preflight validation errors Cherry pick of #60585 on release-1.10. #60585: kubeadm: surface external etcd preflight validation errors

Merge pull request #64048 from alexbrand/automated-cherry-pick-of-#60585-origin-release-1.10
08ddda62 · Kubernetes Submit Queue · GitHub · 14ef91f1 · b3334683 · 08ddda62
Unverified Commit 08ddda62 authored May 22, 2018 by Kubernetes Submit Queue Committed by GitHub May 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

checks.go cmd/kubeadm/app/preflight/checks.go +2 -2

No files found.
--- a/cmd/kubeadm/app/preflight/checks.go
+++ b/cmd/kubeadm/app/preflight/checks.go
@@ -832,13 +832,13 @@ func getEtcdVersionResponse(client *http.Client, url string, target interface{})
 			r, err := client.Get(url)
 			if err != nil {
 				loopCount--
-				return false, nil
+				return false, err
 			}
 			defer r.Body.Close()

 			if r != nil && r.StatusCode >= 500 && r.StatusCode <= 599 {
 				loopCount--
-				return false, nil
+				return false, fmt.Errorf("server responded with non-successful status: %s", r.Status)
 			}
 			return true, json.NewDecoder(r.Body).Decode(target)