openshift-controller-manager should be refactored to use NewControllerCommandConfig from library-go which uses genericapiserver. We were very lucky not to need it in this bug https://issues.redhat.com/browse/OCPBUGS-21832?focusedId=23302827&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-23302827 . Unifying this across operators/controllers will help us react better when the next problem occurs.