[release-4.20] OCPBUGS-63513:Migrate OCP-32383 to upstream#30423

openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.20openshift/origin:release-4.20from

gangwgr:cherry-pick-30378-to-release-4.20-ngangwgr/origin:cherry-pick-30378-to-release-4.20-nCopy head branch name to clipboard