Use manager Elected channel

Author: aledbf

components/ws-manager-mk2/main.go

@@ -18,6 +18,7 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	"k8s.io/client-go/rest"
 
 	"github.com/bombsimon/logrusr/v2"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
@@ -123,52 +124,63 @@ func main() {
 		HealthProbeBindAddress: cfg.Health.Addr,
 		LeaderElection:         true,
 		LeaderElectionID:       "ws-manager-mk2-leader.gitpod.io",
-		NewCache:               cache.MultiNamespacedCacheBuilder([]string{cfg.Manager.Namespace, cfg.Manager.SecretsNamespace}),
+		NewCache: func(config *rest.Config, opts cache.Options) (cache.Cache, error) {
+			opts.Namespaces = []string{cfg.Manager.Namespace, cfg.Manager.SecretsNamespace}
+			return cache.New(config, opts)
+		},
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")
 		os.Exit(1)
 	}
 
-	maintenanceReconciler, err := controllers.NewMaintenanceReconciler(mgr.GetClient())
-	if err != nil {
-		setupLog.Error(err, "unable to create maintenance controller", "controller", "Maintenance")
-		os.Exit(1)
-	}
+	go func() {
+		<-mgr.Elected()
 
-	workspaceReconciler, err := controllers.NewWorkspaceReconciler(
-		mgr.GetClient(), mgr.GetScheme(), mgr.GetEventRecorderFor("workspace"), &cfg.Manager, metrics.Registry, maintenanceReconciler)
-	if err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "Workspace")
-		os.Exit(1)
-	}
+		maintenanceReconciler, err := controllers.NewMaintenanceReconciler(mgr.GetClient())
+		if err != nil {
+			setupLog.Error(err, "unable to create maintenance controller", "controller", "Maintenance")
+			os.Exit(1)
+		}
 
-	activity := activity.NewWorkspaceActivity()
-	timeoutReconciler, err := controllers.NewTimeoutReconciler(mgr.GetClient(), mgr.GetEventRecorderFor("workspace"), cfg.Manager, activity, maintenanceReconciler)
-	if err != nil {
-		setupLog.Error(err, "unable to create timeout controller", "controller", "Timeout")
-		os.Exit(1)
-	}
+		workspaceReconciler, err := controllers.NewWorkspaceReconciler(
+			mgr.GetClient(), mgr.GetScheme(), mgr.GetEventRecorderFor("workspace"), &cfg.Manager, metrics.Registry, maintenanceReconciler)
+		if err != nil {
+			setupLog.Error(err, "unable to create controller", "controller", "Workspace")
+			os.Exit(1)
+		}
 
-	wsmanService, err := setupGRPCService(cfg, mgr.GetClient(), activity, maintenanceReconciler)
-	if err != nil {
-		setupLog.Error(err, "unable to start manager service")
-		os.Exit(1)
-	}
+		activity := activity.NewWorkspaceActivity()
 
-	workspaceReconciler.OnReconcile = wsmanService.OnWorkspaceReconcile
-	if err = workspaceReconciler.SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to setup workspace controller with manager", "controller", "Workspace")
-		os.Exit(1)
-	}
-	if err = timeoutReconciler.SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to setup timeout controller with manager", "controller", "Timeout")
-		os.Exit(1)
-	}
-	if err = maintenanceReconciler.SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to setup maintenance controller with manager", "controller", "Maintenance")
-		os.Exit(1)
-	}
+		timeoutReconciler, err := controllers.NewTimeoutReconciler(mgr.GetClient(), mgr.GetEventRecorderFor("workspace"), cfg.Manager, activity, maintenanceReconciler)
+		if err != nil {
+			setupLog.Error(err, "unable to create timeout controller", "controller", "Timeout")
+			os.Exit(1)
+		}
+
+		wsmanService, err := setupGRPCService(cfg, mgr.GetClient(), activity, maintenanceReconciler)
+		if err != nil {
+			setupLog.Error(err, "unable to start manager service")
+			os.Exit(1)
+		}
+
+		workspaceReconciler.OnReconcile = wsmanService.OnWorkspaceReconcile
+
+		if err = workspaceReconciler.SetupWithManager(mgr); err != nil {
+			setupLog.Error(err, "unable to setup workspace controller with manager", "controller", "Workspace")
+			os.Exit(1)
+		}
+
+		if err = timeoutReconciler.SetupWithManager(mgr); err != nil {
+			setupLog.Error(err, "unable to setup timeout controller with manager", "controller", "Timeout")
+			os.Exit(1)
+		}
+
+		if err = maintenanceReconciler.SetupWithManager(mgr); err != nil {
+			setupLog.Error(err, "unable to setup maintenance controller with manager", "controller", "Maintenance")
+			os.Exit(1)
+		}
+	}()
 
 	// if err = (&workspacev1.Workspace{}).SetupWebhookWithManager(mgr); err != nil {
 	// 	setupLog.Error(err, "unable to create webhook", "webhook", "Workspace")
@@ -191,6 +203,9 @@ func main() {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)
 	}
+
+	setupLog.Info("new leader elected")
+	os.Exit(1)
 }
 
 func setupGRPCService(cfg *config.ServiceConfiguration, k8s client.Client, activity *activity.WorkspaceActivity, maintenance maintenance.Maintenance) (*service.WorkspaceManagerServer, error) {