[0.47] Backport of PR 3301 to 0.47

[harche]

This PR backports the changes from #3301 to 0.47

[k8s-ci-robot]

Hi @harche. Thanks for your PR.

I'm waiting for a google member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

[harche]

/cc @bobbypage

[harche]

/cc @haircommander

[haircommander]

/lgtm
/ok-to-test

[k8s-ci-robot]

@haircommander: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/lgtm
/ok-to-test

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.