[release-5.8] Backport metrics and status handling from 5.9#337

Merged

openshift-merge-bot[bot] merged 3 commits intoopenshift:release-5.8from xperimental:fix-duplicate-condition-5.8

Jul 30, 2024

+503-417

Commits on Jul 29, 2024