Avoid failing at manager startup when the hardcoded CatalogSource isn't present

Author: timflannagan

controllers/platformoperator_controller.go

@@ -40,7 +40,10 @@ import (
 	platformv1alpha1 "github.com/timflannagan/platform-operators/api/v1alpha1"
 )
 
-const channelName = "4.12"
+const (
+	channelName        = "4.12"
+	plainProvisionerID = "core.rukpak.io/plain"
+)
 
 // PlatformOperatorReconciler reconciles a PlatformOperator object
 type PlatformOperatorReconciler struct {
@@ -102,8 +105,27 @@ func (r *PlatformOperatorReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
+	css := &operatorsv1alpha1.CatalogSourceList{}
+	if err := r.List(ctx, css); err != nil {
+		log.Error(err, "failed to list the catalogsource resources in the cluster")
+		return ctrl.Result{}, err
+	}
+	if len(css.Items) == 0 {
+		log.Info("unable to query catalog content as no catalogsources are available")
+		return ctrl.Result{}, nil
+	}
+	// TODO(tflannag): properly handle multiple catalogsources in a cluster
+	cs := css.Items[0]
+
+	log.Info("creating registry client from catalogsource")
+	rc, err := registryClient.NewClient(cs.Spec.Address)
+	if err != nil {
+		log.Error(err, "failed to create registry client from catalogsource", "name", cs.GetName(), "namespace", cs.GetNamespace(), "address", cs.Spec.Address)
+		return ctrl.Result{}, err
+	}
+
 	log.Info("listing bundles from context")
-	it, err := r.RegistryClient.ListBundles(ctx)
+	it, err := rc.ListBundles(ctx)
 	if err != nil {
 		log.Error(err, "failed to list bundles in the platform operators catalog source")
 		return ctrl.Result{}, err
@@ -153,22 +175,19 @@ func (r *PlatformOperatorReconciler) ensureBundleInstance(ctx context.Context, p
 
 	_, err := controllerutil.CreateOrUpdate(ctx, r.Client, bi, func() error {
 		bi.SetOwnerReferences([]metav1.OwnerReference{*controllerRef})
-		bi.Spec = *buildBundleInstance(bi.GetName(), bundle.BundlePath)
+		bi.Spec = *buildBundleInstance(bundle.BundlePath)
 		return nil
 	})
 	return err
 }
 
 // createBundleInstance is responsible for taking a name and image to create an embedded BundleInstance
-func buildBundleInstance(name, image string) *rukpakv1alpha1.BundleInstanceSpec {
+func buildBundleInstance(image string) *rukpakv1alpha1.BundleInstanceSpec {
 	return &rukpakv1alpha1.BundleInstanceSpec{
-		ProvisionerClassName: "core.rukpak.io/plain",
+		ProvisionerClassName: plainProvisionerID,
 		Template: &rukpakv1alpha1.BundleTemplate{
-			ObjectMeta: metav1.ObjectMeta{
-				Labels: map[string]string{"app": name},
-			},
 			Spec: rukpakv1alpha1.BundleSpec{
-				ProvisionerClassName: "core.rukpak.io/plain",
+				ProvisionerClassName: plainProvisionerID,
 				Source: rukpakv1alpha1.BundleSource{
 					Type: rukpakv1alpha1.SourceTypeImage,
 					Image: &rukpakv1alpha1.ImageSource{

main.go

@@ -17,17 +17,14 @@ limitations under the License.
 package main
 
 import (
-	"context"
 	"flag"
 	"os"
-	"time"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
-	registryClient "github.com/operator-framework/operator-registry/pkg/client"
 	rukpakv1alpha1 "github.com/operator-framework/rukpak/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -41,16 +38,9 @@ import (
 	//+kubebuilder:scaffold:imports
 )
 
-const (
-	catalogSourceName          = "platform-operators-catalog-source"
-	catalogSourceNamespace     = "platform-operators-system"
-	catalogSourceReconnectTime = time.Second * 5
-)
-
 var (
-	scheme               = runtime.NewScheme()
-	setupLog             = ctrl.Log.WithName("setup")
-	catalogSourceService = catalogSourceName + "." + catalogSourceNamespace + ".svc:50051"
+	scheme   = runtime.NewScheme()
+	setupLog = ctrl.Log.WithName("setup")
 )
 
 func init() {
@@ -91,22 +81,9 @@ func main() {
 		os.Exit(1)
 	}
 
-	// Create a registryClient by referencing the requisite catalogSource's service and then
-	// check that it is healthy
-	c, err := registryClient.NewClient(catalogSourceService)
-	if err != nil {
-		setupLog.Error(err, "failed to create registry client from "+catalogSourceName+" catalog source")
-		os.Exit(1)
-	}
-	if healthy, err := c.HealthCheck(context.Background(), catalogSourceReconnectTime); !healthy || err != nil {
-		setupLog.Error(err, "failed to connect to "+catalogSourceName+" catalog source via the registry client")
-		os.Exit(1)
-	}
-
 	if err = (&controllers.PlatformOperatorReconciler{
-		Client:         mgr.GetClient(),
-		Scheme:         mgr.GetScheme(),
-		RegistryClient: c,
+		Client: mgr.GetClient(),
+		Scheme: mgr.GetScheme(),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "PlatformOperator")
 		os.Exit(1)