Merge pull request #45940 from sttts/sttts-204

Automatic merge from submit-queue (batch tested with PRs 42895, 45940) apiserver: no Status in body for http 204 Fixes http writer errors as with 204 we must not send any body. Needed downstream for https://github.com/openshift/origin/issues/14213.

Merge pull request #45940 from sttts/sttts-204
e401dc74 · Kubernetes Submit Queue · GitHub · a45a1ef2 · 8902dae1 · e401dc74
Commit e401dc74 authored May 17, 2017 by Kubernetes Submit Queue Committed by GitHub May 17, 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
@@ -103,6 +103,12 @@ func ErrorNegotiated(err error, s runtime.NegotiatedSerializer, gv schema.GroupV
 		delay := strconv.Itoa(int(status.Details.RetryAfterSeconds))
 		w.Header().Set("Retry-After", delay)
 	}
+
+	if code == http.StatusNoContent {
+		w.WriteHeader(code)
+		return code
+	}
+
 	WriteObjectNegotiated(s, gv, w, req, code, status)
 	return code
 }