Make manager to start the provider

Author: mjudeikis

examples/cluster-api/main.go

@@ -128,9 +128,6 @@ func main() {
 	g.Go(func() error {
 		return ignoreCanceled(localMgr.Start(ctx))
 	})
-	g.Go(func() error {
-		return ignoreCanceled(provider.Start(ctx, mcMgr))
-	})
 	g.Go(func() error {
 		return ignoreCanceled(mcMgr.Start(ctx))
 	})

examples/file/main.go

@@ -113,9 +113,6 @@ func main() {
 	g.Go(func() error {
 		return ignoreCanceled(mgr.Start(ctx))
 	})
-	g.Go(func() error {
-		return ignoreCanceled(provider.Start(ctx, mgr))
-	})
 	if err := g.Wait(); err != nil {
 		entryLog.Info("error in errgroup: %w", err)
 		return

examples/kind/main.go

@@ -91,9 +91,6 @@ func main() {
 
 	// Starting everything.
 	g, ctx := errgroup.WithContext(ctx)
-	g.Go(func() error {
-		return ignoreCanceled(provider.Start(ctx, mgr))
-	})
 	g.Go(func() error {
 		return ignoreCanceled(mgr.Start(ctx))
 	})

examples/namespace/main.go

@@ -153,9 +153,6 @@ func run(ctx context.Context, log logr.Logger, kubeconfig string) error {
 
 	// Starting everything.
 	g, ctx := errgroup.WithContext(ctx)
-	g.Go(func() error {
-		return ignoreCanceled(provider.Start(ctx, mgr))
-	})
 	g.Go(func() error {
 		return ignoreCanceled(cl.Start(ctx))
 	})

pkg/manager/manager.go

@@ -254,6 +254,16 @@ func (p *scopedManager) Add(r manager.Runnable) error {
 
 // Start starts the manager.
 func (p *scopedManager) Start(ctx context.Context) error {
+	err := p.Add(manager.RunnableFunc(func(ctx context.Context) error {
+		provider := p.Manager.GetProvider()
+		if provider != nil {
+			return provider.Start(ctx, p)
+		}
+		return nil
+	}))
+	if err != nil {
+		return err
+	}
 	return p.Manager.GetLocalManager().Start(ctx)
 }
 

providers/cluster-api/provider.go

@@ -128,9 +128,8 @@ func (p *Provider) Get(_ context.Context, clusterName string) (cluster.Cluster,
 // Start starts the provider and blocks.
 func (p *Provider) Start(ctx context.Context, aware multicluster.Aware) error {
 	p.lock.Lock()
-	defer p.lock.Unlock()
-
 	p.aware = aware
+	p.lock.Unlock()
 
 	p.log.Info("Starting Cluster-API cluster provider")