summaryrefslogtreecommitdiff
path: root/pkg/api/handlers/compat
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2021-01-19 09:16:01 -0700
committerMatthew Heon <matthew.heon@pm.me>2021-02-04 14:24:26 -0500
commitb576ddd9a2ebfa8b42777114ddc1fcc248d6d7fb (patch)
tree6c3ba3f200494470efa07dbec2761f2b2f0d1ff7 /pkg/api/handlers/compat
parent6213225c919b3b30a298a9a2fb676da9ba811e37 (diff)
downloadpodman-b576ddd9a2ebfa8b42777114ddc1fcc248d6d7fb.tar.gz
podman-b576ddd9a2ebfa8b42777114ddc1fcc248d6d7fb.tar.bz2
podman-b576ddd9a2ebfa8b42777114ddc1fcc248d6d7fb.zip
Report StatusConflict on Pod opt partial failures
- When one or more containers in the Pod reports an error on an operation report StatusConflict and report the error(s) - jsoniter type encoding used to marshal error as string using error.Error() - Update test framework to allow setting any flag when creating pods - Fix test_resize() result check Fixes #8865 Signed-off-by: Jhon Honce <jhonce@redhat.com> <MH: Fix cherry-pick conflicts> Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/api/handlers/compat')
-rw-r--r--pkg/api/handlers/compat/resize.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go
index cc8c6ef0a..a769ae1b5 100644
--- a/pkg/api/handlers/compat/resize.go
+++ b/pkg/api/handlers/compat/resize.go
@@ -84,5 +84,5 @@ func ResizeTTY(w http.ResponseWriter, r *http.Request) {
// reasons.
status = http.StatusCreated
}
- utils.WriteResponse(w, status, "")
+ w.WriteHeader(status)
}