From b7ef952d8d620a145fd5cf3b75e2efd5678eb0c3 Mon Sep 17 00:00:00 2001 From: Alexander Brand Date: Wed, 11 Apr 2018 09:55:16 -0400 Subject: [PATCH] kubeadm: surface external etcd preflight validation errors Signed-off-by: Alexander Brand --- cmd/kubeadm/app/preflight/checks.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index b2c14c6fd6..fd0559f3af 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -848,13 +848,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)