UPSTREAM: <carry>: ensure hijackedConn implements CloseWrite function

[jim-minter]

moby/moby#36516
moby/moby#36517

[bparees]

@derekwaynecarr @mrunalp we need to decide if we think this is critical for 3.9. S2I was still using docker-engine in 3.9 so it is not vulnerable to the bug, what we aren't sure of is whether any other aspect of origin/k8s is.

[bparees]

I think https://bugzilla.redhat.com/show_bug.cgi?id=1550644 and https://bugzilla.redhat.com/show_bug.cgi?id=1552670 indicates we need this in 3.9

[mrunalp]

@bparees Yes, I agree that we should add this to 3.9.

[bparees]

/lgtm
(with @derekwaynecarr's concurrence)

[liggitt]

title of UPSTREAM: docker/docker: 36517: ensure hijackedConn implements CloseWrite function will make travis happier

[bparees]

I think https://bugzilla.redhat.com/show_bug.cgi?id=1550644 and https://bugzilla.redhat.com/show_bug.cgi?id=1552670 indicates we need this in 3.9

@juanvallejo this may address your 2 bugs

[liggitt]

adding carries to this dependency mean we need a fork at https://github.com/openshift/docker-docker and a glide.yaml update or the next glide update will revert this

[bparees]

adding carries to this dependency mean we need a fork at https://github.com/openshift/docker-docker and a glide.yaml update or the next glide update will revert this

yeah that's what i was afraid of.

[bparees]

/hold
(for commit text update)

[bparees]

/hold cancel
/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, jim-minter

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [bparees]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[eparis]

3.9 milestone gets you near the top. retest-not-required gets you to the very top :)

[bparees]

3.9 milestone gets you near the top. retest-not-required gets you to the very top :)

which is where this should be since it could be causing some of our test flakes in the 3.9 branch (it is definitely causing them in master).

it also saves our merge queue some work retesting something for no good reason.

[eparis]

/retest

[openshift-merge-robot]

Automatic merge from submit-queue.

[liggitt]

reported upstream in kubernetes/kubernetes#61557