[release-4.21] OCPBUGS-72562: Add missing relatedObjects + small refactoring#1090

openshift-cherrypick-robot wants to merge 1 commit intoopenshift:release-4.21openshift/console-operator:release-4.21from

openshift-cherrypick-robot:cherry-pick-1075-to-release-4.21openshift-cherrypick-robot/console-operator:cherry-pick-1075-to-release-4.21Copy head branch name to clipboard