TRT-2373: Revert "Revert "Merge pull request openshift#30269 from hongkailiu/OTA-1626""#30426

openshift-merge-bot[bot] merged 3 commits into

openshift:mainopenshift/origin:mainfrom

hongkailiu:30269-revert-fixhongkailiu/origin:30269-revert-fixCopy head branch name to clipboard