Skip to content

Commit 8e02c59

Browse files
authored
Merge pull request #1188 from drawdrop/main
fix: fix the wrong error return value
2 parents 25c6bb6 + 7cdf9df commit 8e02c59

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

internal/kube/roundtripper.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ func (rt *retryingRoundTripper) roundTrip(req *http.Request, retry int, prevResp
4444
return resp, rtErr
4545
}
4646
if resp.StatusCode < 500 {
47-
return resp, rtErr
47+
return resp, nil
4848
}
4949
if resp.Header.Get("content-type") != "application/json" {
50-
return resp, rtErr
50+
return resp, nil
5151
}
5252
b, err := io.ReadAll(resp.Body)
5353
resp.Body.Close()
5454
if err != nil {
55-
return resp, rtErr
55+
return resp, err
5656
}
5757

5858
var ke kubernetesError
@@ -61,10 +61,10 @@ func (rt *retryingRoundTripper) roundTrip(req *http.Request, retry int, prevResp
6161
r.Seek(0, io.SeekStart)
6262
resp.Body = io.NopCloser(r)
6363
if err != nil {
64-
return resp, rtErr
64+
return resp, err
6565
}
6666
if ke.Code < 500 {
67-
return resp, rtErr
67+
return resp, nil
6868
}
6969
// Matches messages like "etcdserver: leader changed"
7070
if strings.HasSuffix(ke.Message, "etcdserver: leader changed") {
@@ -74,7 +74,7 @@ func (rt *retryingRoundTripper) roundTrip(req *http.Request, retry int, prevResp
7474
if strings.HasSuffix(ke.Message, "raft proposal dropped") {
7575
return rt.roundTrip(req, retry-1, resp)
7676
}
77-
return resp, rtErr
77+
return resp, nil
7878
}
7979

8080
type kubernetesError struct {

0 commit comments

Comments
 (0)