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 ```

Merge pull request #55704 from soltysh/return_real_error
85f0a1ac · Kubernetes Submit Queue · GitHub · 710a1240 · 7c83e736 · 85f0a1ac
Unverified Commit 85f0a1ac authored Nov 28, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

writers.go ...iserver/pkg/endpoints/handlers/responsewriters/writers.go +6 -0

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go
@@ -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