diff --git a/control-plane-operator/controllers/hostedcontrolplane/configoperator/reconcile.go b/control-plane-operator/controllers/hostedcontrolplane/configoperator/reconcile.go index 1cc1a70c92..6aef3767ee 100644 --- a/control-plane-operator/controllers/hostedcontrolplane/configoperator/reconcile.go +++ b/control-plane-operator/controllers/hostedcontrolplane/configoperator/reconcile.go @@ -12,6 +12,7 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" "github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/common" "github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/kas" @@ -173,7 +174,14 @@ func ReconcileDeployment(deployment *appsv1.Deployment, image, hcpName, openShif }, } config.ApplyTo(deployment) - util.AvailabilityProber(kas.InClusterKASReadyURL(deployment.Namespace, apiInternalPort), availabilityProberImage, &deployment.Spec.Template.Spec) + util.AvailabilityProber(kas.InClusterKASReadyURL(deployment.Namespace, apiInternalPort), availabilityProberImage, &deployment.Spec.Template.Spec, func(o *util.AvailabilityProberOpts) { + o.KubeconfigVolumeName = "kubeconfig" + o.RequiredAPIs = []schema.GroupVersionKind{ + {Group: "imageregistry.operator.openshift.io", Version: "v1", Kind: "Config"}, + {Group: "config.openshift.io", Version: "v1", Kind: "ClusterOperator"}, + {Group: "config.openshift.io", Version: "v1", Kind: "ClusterVersion"}, + } + }) return nil } diff --git a/control-plane-operator/controllers/hostedcontrolplane/olm/operator.go b/control-plane-operator/controllers/hostedcontrolplane/olm/operator.go index 24ad0190aa..dab1e74ee1 100644 --- a/control-plane-operator/controllers/hostedcontrolplane/olm/operator.go +++ b/control-plane-operator/controllers/hostedcontrolplane/olm/operator.go @@ -125,6 +125,10 @@ func ReconcileOLMOperatorDeployment(deployment *appsv1.Deployment, ownerRef conf o.KubeconfigVolumeName = "kubeconfig" o.RequiredAPIs = []schema.GroupVersionKind{ {Group: "operators.coreos.com", Version: "v1alpha1", Kind: "CatalogSource"}, + {Group: "operators.coreos.com", Version: "v1alpha1", Kind: "Subscription"}, + {Group: "operators.coreos.com", Version: "v2", Kind: "OperatorCondition"}, + {Group: "operators.coreos.com", Version: "v1", Kind: "OperatorGroup"}, + {Group: "operators.coreos.com", Version: "v1", Kind: "OLMConfig"}, } }) return nil