[release-3.11] Do not retry conflicts during storage migration#21449

openshift-merge-robot merged 1 commit intoopenshift:release-3.11openshift/origin:release-3.11from

openshift-cherrypick-robot:cherry-pick-21437-to-release-3.11openshift-cherrypick-robot/origin:cherry-pick-21437-to-release-3.11Copy head branch name to clipboard