kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55704 from soltysh/return_real_error 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Return original error instead of negotiation one

**What this PR does / why we need it**:
When the requested type (eg. `text/html`) is not available and we're trying to hit an endpoint to which a user is for unauthorized we'll get 406, instead of 403. The reason for that is that, even if error happens we're trying to match the serializer, which fails and results in swallowing error, instead of returning raw json, for example.

This fix returns raw json for such situations.

**Release note**:
```release-note
NONE
```

Kubernetes-commit: 85f0a1ac42daac3fcd6e7a9431c0bcabc3c653a5
This commit is contained in:
Kubernetes Publisher 2017-11-28 08:10:22 -08:00
parent 155248fb28 4ad8f1d59a
commit f461eda4a5
2 changed files with 1770 additions and 1708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3472
Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

6
pkg/endpoints/handlers/responsewriters/writers.go
View File

@ -104,6 +104,12 @@ func SerializeObject(mediaType string, encoder runtime.Encoder, w http.ResponseW
func WriteObjectNegotiated(ctx request.Context, s runtime.NegotiatedSerializer, gv schema.GroupVersion, w http.ResponseWriter, req *http.Request, statusCode int, object runtime.Object) {
serializer, err := negotiation.NegotiateOutputSerializer(req, s)
if err != nil {
// if original statusCode was not successful we need to return the original error
// we cannot hide it behind negotiation problems
if statusCode < http.StatusOK || statusCode >= http.StatusBadRequest {
WriteRawJSON(int(statusCode), object, w)
return
}
status := ErrorToAPIStatus(err)
WriteRawJSON(int(status.Code), status, w)
return