github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11333 from deads2k/passthrough-errors

Browse Source 
pass along status errors for upgrades
This commit is contained in:
Mike Danese 2015-07-24 09:49:34 -07:00
commit d6796ecd38
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/util/httpstream/spdy/roundtripper.go
View File

@ -25,6 +25,8 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream"
"github.com/GoogleCloudPlatform/kubernetes/third_party/golang/netutil" "github.com/GoogleCloudPlatform/kubernetes/third_party/golang/netutil"
) )
@ -137,6 +139,11 @@ func (s *SpdyRoundTripper) NewConnection(resp *http.Response) (httpstream.Connec
if err != nil { if err != nil {
responseError = "unable to read error from server response" responseError = "unable to read error from server response"
} else { } else {
if obj, err := api.Scheme.Decode(responseErrorBytes); err == nil {
if status, ok := obj.(*api.Status); ok {
return nil, &apierrors.StatusError{*status}
}
}
responseError = string(responseErrorBytes) responseError = string(responseErrorBytes)
responseError = strings.TrimSpace(responseError) responseError = strings.TrimSpace(responseError)
} }