Merge pull request #297 from yangspirit/release-0.4

fix(labelcontroller): add leader-election-namespace flag

Author: yangspirit

cmd/csi_driver/main.go

@@ -30,16 +30,17 @@ import (
 )
 
 var (
-	endpoint               = flag.String("endpoint", "unix:/tmp/csi.sock", "CSI endpoint")
-	nodeID                 = flag.String("nodeid", "", "node id")
-	runController          = flag.Bool("controller", false, "run controller service")
-	runNode                = flag.Bool("node", false, "run node service")
-	httpEndpoint           = flag.String("http-endpoint", "", "The TCP network address where the prometheus metrics endpoint will listen (example: `:8080`). The default is empty string, which means metrics endpoint is disabled.")
-	metricsPath            = flag.String("metrics-path", "/metrics", "The HTTP path where prometheus metrics will be exposed. Default is `/metrics`.")
-	lustreAPIEndpoint      = flag.String("lustre-endpoint", "", "Lustre API service endpoint, supported values are autopush, staging and prod.")
-	cloudConfigFilePath    = flag.String("cloud-config", "", "Path to GCE cloud provider config")
-	enableLegacyLustrePort = flag.Bool("enable-legacy-lustre-port", false, "If set to true, the CSI driver controller will provision Lustre instance with the gkeSupportEnabled flag")
-	enableLabelController  = flag.Bool("enable-label-controller", true, "If true, the label controller will be started.")
+	endpoint                = flag.String("endpoint", "unix:/tmp/csi.sock", "CSI endpoint")
+	nodeID                  = flag.String("nodeid", "", "node id")
+	runController           = flag.Bool("controller", false, "run controller service")
+	runNode                 = flag.Bool("node", false, "run node service")
+	httpEndpoint            = flag.String("http-endpoint", "", "The TCP network address where the prometheus metrics endpoint will listen (example: `:8080`). The default is empty string, which means metrics endpoint is disabled.")
+	metricsPath             = flag.String("metrics-path", "/metrics", "The HTTP path where prometheus metrics will be exposed. Default is `/metrics`.")
+	lustreAPIEndpoint       = flag.String("lustre-endpoint", "", "Lustre API service endpoint, supported values are autopush, staging and prod.")
+	cloudConfigFilePath     = flag.String("cloud-config", "", "Path to GCE cloud provider config")
+	enableLegacyLustrePort  = flag.Bool("enable-legacy-lustre-port", false, "If set to true, the CSI driver controller will provision Lustre instance with the gkeSupportEnabled flag")
+	enableLabelController   = flag.Bool("enable-label-controller", true, "If true, the label controller will be started.")
+	leaderElectionNamespace = flag.String("leader-election-namespace", "", "Namespace where the leader election resource will be created. Required for out-of-cluster deployments.")
 
 	// These are set at compile time.
 	version = "unknown"
@@ -97,7 +98,7 @@ func main() {
 		if *enableLabelController {
 			go func() {
 				// Pass empty string for kubeconfig to let controller-runtime handle the flag
-				if err := labelcontroller.Start(ctx, cloudProvider, &mm); err != nil {
+				if err := labelcontroller.Start(ctx, cloudProvider, &mm, *leaderElectionNamespace); err != nil {
 					klog.Errorf("Label controller failed: %v", err)
 				}
 			}()

pkg/labelcontroller/label_controller.go

@@ -108,7 +108,7 @@ func (r *PvReconciler) Reconcile(ctx context.Context, request reconcile.Request)
 	return reconcile.Result{}, nil
 }
 
-func Start(ctx context.Context, cloud *lustre.Cloud, mm *metrics.Manager) error {
+func Start(ctx context.Context, cloud *lustre.Cloud, mm *metrics.Manager, leaderElectionNamespace string) error {
 	log.SetLogger(zap.New())
 
 	cfg, err := ctrl.GetConfig()
@@ -117,9 +117,10 @@ func Start(ctx context.Context, cloud *lustre.Cloud, mm *metrics.Manager) error
 	}
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		Logger:           log.Log.WithName("label-controller"),
-		LeaderElection:   true,
-		LeaderElectionID: leaderElectionID,
+		Logger:                  log.Log.WithName("label-controller"),
+		LeaderElection:          true,
+		LeaderElectionID:        leaderElectionID,
+		LeaderElectionNamespace: leaderElectionNamespace,
 	})
 	if err != nil {
 		return fmt.Errorf("unable to start manager: %w", err)