feat: support custom readiness check

Author: hdp617

providers/cluster-inventory-api/provider.go

@@ -56,6 +56,11 @@ type Options struct {
 	// NewCluster is a function that creates a new cluster from a rest.Config.
 	// The cluster will be started by the provider.
 	NewCluster func(ctx context.Context, clp *clusterinventoryv1alpha1.ClusterProfile, cfg *rest.Config, opts ...cluster.Option) (cluster.Cluster, error)
+
+	// IsReady is a function that determines if a cluster is ready.
+	// If not provided, a default readiness check is used which checks for the
+	// ControlPlaneHealthy condition on the ClusterProfile.
+	IsReady func(ctx context.Context, clp *clusterinventoryv1alpha1.ClusterProfile) bool
 }
 
 type index struct {
@@ -86,6 +91,12 @@ func setDefaults(opts *Options) {
 			return cluster.New(cfg, opts...)
 		}
 	}
+	if opts.IsReady == nil {
+		opts.IsReady = func(ctx context.Context, clp *clusterinventoryv1alpha1.ClusterProfile) bool {
+			controlPlaneHealthyCondition := meta.FindStatusCondition(clp.Status.Conditions, clusterinventoryv1alpha1.ClusterConditionControlPlaneHealthy)
+			return controlPlaneHealthyCondition != nil && controlPlaneHealthyCondition.Status == metav1.ConditionTrue
+		}
+	}
 }
 
 // New creates a new Cluster Inventory API cluster Provider.
@@ -194,8 +205,7 @@ func (p *Provider) Reconcile(ctx context.Context, req reconcile.Request) (reconc
 	}
 
 	// ready?
-	controlPlaneHealthyCondition := meta.FindStatusCondition(clp.Status.Conditions, clusterinventoryv1alpha1.ClusterConditionControlPlaneHealthy)
-	if controlPlaneHealthyCondition == nil || controlPlaneHealthyCondition.Status != metav1.ConditionTrue {
+	if !p.opts.IsReady(ctx, clp) {
 		log.Info("ClusterProfile is not healthy yet, requeuing")
 		return reconcile.Result{RequeueAfter: time.Second * 10}, nil
 	}

providers/cluster-inventory-api/provider_test.go

@@ -471,6 +471,76 @@ var _ = Describe("Provider Cluster Inventory API", Ordered, func() {
 			shutDownClusters()
 		})
 	})
+
+	Context("Custom readiness check", Ordered, func() {
+		const consumerName = "hub"
+		var sa1TokenMember string
+
+		BeforeAll(func() {
+			ctx, cancel = context.WithCancel(context.Background())
+			g, _ = errgroup.WithContext(ctx)
+
+			createClusters()
+
+			By("Setting up the Provider", func() {
+				var err error
+				provider, err = New(Options{
+					KubeconfigStrategyOption: kubeconfigstrategy.Option{
+						Secret: &kubeconfigstrategy.SecretStrategyOption{
+							ConsumerName: consumerName,
+						},
+					},
+					IsReady: func(ctx context.Context, clp *clusterinventoryv1alpha1.ClusterProfile) bool {
+						return true
+					},
+				})
+				Expect(err).NotTo(HaveOccurred())
+				Expect(provider).NotTo(BeNil())
+			})
+
+			setupAndStartControllers()
+
+			By("Setting up the ClusterProfile for member clusters", func() {
+				profileMember = &clusterinventoryv1alpha1.ClusterProfile{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "member",
+						Namespace: "default",
+					},
+					Spec: clusterinventoryv1alpha1.ClusterProfileSpec{
+						DisplayName: "member",
+						ClusterManager: clusterinventoryv1alpha1.ClusterManager{
+							Name: "test",
+						},
+					},
+				}
+				Expect(cliHub.Create(ctx, profileMember)).To(Succeed())
+
+				sa1TokenMember = mustCreateAdminSAAndToken(ctx, cliMember, "sa1", "default")
+				mustCreateOrUpdateKubeConfigSecretFromTokenSecret(
+					ctx, cliHub, cfgMember,
+					consumerName,
+					*profileMember,
+					sa1TokenMember,
+				)
+			})
+
+			createObjects()
+		})
+
+		assertBasicControllerBehavior()
+		assertClusterIndexBehavior()
+
+		AfterAll(func() {
+			By("Stopping the provider, cluster, manager, and controller", func() {
+				cancel()
+			})
+			By("Waiting for the error group to finish", func() {
+				err := g.Wait()
+				Expect(err).NotTo(HaveOccurred())
+			})
+			shutDownClusters()
+		})
+	})
 })
 
 func ignoreCanceled(err error) error {