[3.10] ImageGC fixes

[sjenning]

kubernetes/kubernetes#70647
kubernetes/kubernetes#75367

3.11 PRs:
#22154
#22629

@sferich888 @soukron @derekwaynecarr

supercedes #22500 that doesn't include kubernetes/kubernetes#75367

[sjenning]

/retest

[sjenning]

unit test flake #20295
/retest

[sjenning]

TestRegistryClient flakes
/test integration

[sjenning]

TestRegistryClient failure again

[soukron]

@sjenning the tests fail even with a change in the README. I already reported in a different issue. Not pull requests will be validated until #22639 is fixed.

[jottofar]

/retest

[droslean]

/retest

[vikaslaad]

/test integration

[sjenning]

/retest

[derekwaynecarr]

/lgtm
/approve

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.

[derekwaynecarr]

/lgtm
/approve

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, sjenning

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 [derekwaynecarr]

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

[rphillips]

/cherrypick release-3.9

[openshift-cherrypick-robot]

@rphillips: #23183 failed to apply on top of branch "release-3.9":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_image.go
M	vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_image_test.go
M	vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker/fake_client.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker/fake_client.go
CONFLICT (content): Merge conflict in vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker/fake_client.go
Auto-merging vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_image_test.go
CONFLICT (content): Merge conflict in vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_image_test.go
Auto-merging vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_image.go
CONFLICT (content): Merge conflict in vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_image.go
Patch failed at 0001 UPSTREAM: 70647: Always run untag when removing docker image

In response to this:

/cherrypick release-3.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.