Skip to content

K
k3s
Unverified Commit 08ddda62 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 14ef91f1 b3334683
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cmd/kubeadm/app/preflight/checks.go
View file @ 08ddda62
...@@ -832,13 +832,13 @@ func getEtcdVersionResponse(client *http.Client, url string, target interface{}) ...@@ -832,13 +832,13 @@ func getEtcdVersionResponse(client *http.Client, url string, target interface{})
r, err := client.Get(url) r, err := client.Get(url)
if err != nil { if err != nil {
loopCount-- loopCount--
return false, nil return false, err
} }
defer r.Body.Close() defer r.Body.Close()
if r != nil && r.StatusCode >= 500 && r.StatusCode <= 599 { if r != nil && r.StatusCode >= 500 && r.StatusCode <= 599 {
loopCount-- 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) return true, json.NewDecoder(r.Body).Decode(target)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment