Description of problem:

Cluster install failed with marketplace disabled.

Cap set in the install-config:
...
capabilities:
  baselineCapabilitySet: None
  additionalEnabledCapabilities:
  - openshift-samples

CVO log:
...
E0507 03:03:55.594556       1 task.go:112] error running apply for operatorhub "cluster" (31 of 884): failed to get resource type: no matches for kind "OperatorHub" in version "config.openshift.io/v1"
E0507 03:03:59.559372       1 task.go:112] error running apply for operatorhub "cluster" (31 of 884): failed to get resource type: no matches for kind "OperatorHub" in version "config.openshift.io/v1"
I0507 03:04:02.351746       1 task_graph.go:546] Result of work: [Could not update operatorhub "cluster" (31 of 884): the server does not recognize this resource, check extension API servers]
I0507 03:04:02.351779       1 sync_worker.go:1098] Update error 31 of 884: UpdatePayloadResourceTypeMissing Could not update operatorhub "cluster" (31 of 884): the server does not recognize this resource, check extension API servers (*errors.withStack: failed to get resource type: no matches for kind "OperatorHub" in version "config.openshift.io/v1")
E0507 03:04:02.351835       1 sync_worker.go:586] unable to synchronize image (waiting 2m33.733884988s): Could not update operatorhub "cluster" (31 of 884): the server does not recognize this resource, check extension API servers
I0507 03:06:45.082254       1 sync_worker.go:926] Running sync for customresourcedefinition "operatorhubs.config.openshift.io" (15 of 884)
I0507 03:06:45.082278       1 sync_worker.go:934] Skipping precreation of customresourcedefinition "operatorhubs.config.openshift.io" (15 of 884): disabled capabilities: marketplace
I0507 03:06:45.082300       1 sync_worker.go:926] Running sync for operatorhub "cluster" (16 of 884)
I0507 03:06:45.082313       1 sync_worker.go:934] Skipping precreation of operatorhub "cluster" (16 of 884): disabled capabilities: marketplace
I0507 03:06:45.109535       1 sync_worker.go:926] Running sync for clusterrole "operatorhub-config-reader" (703 of 884)
I0507 03:06:45.109546       1 sync_worker.go:934] Skipping precreation of clusterrole "operatorhub-config-reader" (703 of 884): disabled capabilities: marketplace
I0507 03:06:57.480301       1 sync_worker.go:926] Running sync for operatorhub "cluster" (31 of 884)
E0507 03:07:01.405524       1 task.go:112] error running apply for operatorhub "cluster" (31 of 884): failed to get resource type: no matches for kind "OperatorHub" in version "config.openshift.io/v1"
...

Get the OperatorHub/cluster resource:

# oc adm release extract --to manifests

# grep -r10 OperatorHub manifests/ | grep "name: cluster"
manifests/0000_05_config-operator_02_operatorhub.cr.yaml-  name: cluster
manifests/0000_03_marketplace-operator_02_operatorhub.cr.yaml-  name: cluster

# cat manifests/0000_05_config-operator_02_operatorhub.cr.yaml
apiVersion: config.openshift.io/v1
kind: OperatorHub
metadata:
  name: cluster
  annotations:
    include.release.openshift.io/ibm-cloud-managed: "true"
    include.release.openshift.io/self-managed-high-availability: "true"
    include.release.openshift.io/single-node-developer: "true"
    release.openshift.io/create-only: "true"
spec: {}

# cat manifests/0000_03_marketplace-operator_02_operatorhub.cr.yaml
# This name of this file must appear after that of the file containing the OperatorHub CRD when ordered lexicographically.
# The OperatorHub CRD file is sourced from the following vendor directory: ./vendor/github.com/openshift/api/config/v1
apiVersion: config.openshift.io/v1
kind: OperatorHub
metadata:
  name: cluster
  annotations:
    include.release.openshift.io/ibm-cloud-managed: "true"
    include.release.openshift.io/self-managed-high-availability: "true"
    include.release.openshift.io/single-node-developer: "true"
    release.openshift.io/create-only: "true"
    capability.openshift.io/name: "marketplace"
spec: {}

Hmm, seems like OLM makes OperatorHub optional while config-operator still requires it.

Version-Release number of the following components:
4.11.0-0.nightly-2022-05-06-180112

How reproducible:
Always

Steps to Reproduce:
1. Install a cluster with marketplace disabled
2.
3.

Actual results:
Install failed due to error running apply for operatorhub "cluster"

Expected results:
Install passed

Additional info:
Please attach logs from ansible-playbook with the -vvv flag