report status to the CVO

pkg/operator/starter.go

@@ -5,6 +5,9 @@ import (
 	"os"
 	"time"
 
+	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/tools/cache"
+
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -13,22 +16,29 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
+	operatorv1alpha1 "github.com/openshift/api/operator/v1alpha1"
 	"github.com/openshift/cluster-openshift-controller-manager-operator/pkg/apis/openshiftcontrollermanager/v1alpha1"
 	operatorconfigclient "github.com/openshift/cluster-openshift-controller-manager-operator/pkg/generated/clientset/versioned"
 	operatorsv1alpha1client "github.com/openshift/cluster-openshift-controller-manager-operator/pkg/generated/clientset/versioned/typed/openshiftcontrollermanager/v1alpha1"
 	operatorclientinformers "github.com/openshift/cluster-openshift-controller-manager-operator/pkg/generated/informers/externalversions"
 	"github.com/openshift/cluster-openshift-controller-manager-operator/pkg/operator/v311_00_assets"
+	"github.com/openshift/library-go/pkg/operator/status"
 )
 
 func RunOperator(clientConfig *rest.Config, stopCh <-chan struct{}) error {
 	kubeClient, err := kubernetes.NewForConfig(clientConfig)
 	if err != nil {
-		panic(err)
+		return err
 	}
 	operatorConfigClient, err := operatorconfigclient.NewForConfig(clientConfig)
 	if err != nil {
-		panic(err)
+		return err
+	}
+	dynamicClient, err := dynamic.NewForConfig(clientConfig)
+	if err != nil {
+		return err
 	}
+	ensureOperatorConfigExists(operatorConfigClient.OpenshiftcontrollermanagerV1alpha1(), "v3.11.0/openshift-controller-manager/operator-config.yaml")
 
 	operatorConfigInformers := operatorclientinformers.NewSharedInformerFactory(operatorConfigClient, 10*time.Minute)
 	kubeInformersNamespaced := informers.NewFilteredSharedInformerFactory(kubeClient, 10*time.Minute, targetNamespaceName, nil)
@@ -40,12 +50,20 @@ func RunOperator(clientConfig *rest.Config, stopCh <-chan struct{}) error {
 		kubeClient,
 	)
 
-	ensureOperatorConfigExists(operator.operatorConfigClient, "v3.11.0/openshift-controller-manager/operator-config.yaml")
+	clusterOperatorStatus := status.NewClusterOperatorStatusController(
+		"openshift-apiserver",
+		"openshift-apiserver",
+		dynamicClient,
+		&operatorStatusProvider{informers: operatorConfigInformers},
+	)
 
 	operatorConfigInformers.Start(stopCh)
 	kubeInformersNamespaced.Start(stopCh)
 
-	operator.Run(1, stopCh)
+	go operator.Run(1, stopCh)
+	go clusterOperatorStatus.Run(1, stopCh)
+
+	<-stopCh
 	return fmt.Errorf("stopped")
 }
 
@@ -92,3 +110,20 @@ func ensureOperatorConfigExists(client operatorsv1alpha1client.OpenShiftControll
 		}
 	}
 }
+
+type operatorStatusProvider struct {
+	informers operatorclientinformers.SharedInformerFactory
+}
+
+func (p *operatorStatusProvider) Informer() cache.SharedIndexInformer {
+	return p.informers.Openshiftcontrollermanager().V1alpha1().OpenShiftControllerManagerOperatorConfigs().Informer()
+}
+
+func (p *operatorStatusProvider) CurrentStatus() (operatorv1alpha1.OperatorStatus, error) {
+	instance, err := p.informers.Openshiftcontrollermanager().V1alpha1().OpenShiftControllerManagerOperatorConfigs().Lister().Get("instance")
+	if err != nil {
+		return operatorv1alpha1.OperatorStatus{}, err
+	}
+
+	return instance.Status.OperatorStatus, nil
+}