Merge pull request #849 from SchSeba/remove_leader_election

Remove leader election for the operator

Author: zeeke

config/manager/manager.yaml

@@ -17,6 +17,8 @@ spec:
     matchLabels:
       control-plane: controller-manager
   replicas: 1
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -29,8 +31,6 @@ spec:
       containers:
       - command:
         - /manager
-        args:
-        - --leader-elect
         image: controller:latest
         name: manager
         securityContext:

deploy/operator.yaml

@@ -7,10 +7,8 @@ spec:
   selector:
     matchLabels:
       name: sriov-network-operator
-  updateStrategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 33%
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -51,8 +49,6 @@ spec:
           image: $SRIOV_NETWORK_OPERATOR_IMAGE
           command:
           - sriov-network-operator
-          args:
-          - --leader-elect=$OPERATOR_LEADER_ELECTION_ENABLE
           resources:
             requests:
               cpu: 100m

deployment/sriov-network-operator-chart/templates/operator.yaml

@@ -10,9 +10,7 @@ spec:
     matchLabels:
       name: sriov-network-operator
   strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 33%
+    type: Recreate
   template:
     metadata:
       annotations:

main.go

@@ -48,9 +48,6 @@ import (
 	sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/controllers"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/featuregate"
-	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/leaderelection"
-
-	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/consts"
 	snolog "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/log"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/platforms"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/utils"
@@ -75,69 +72,43 @@ func init() {
 
 func main() {
 	var metricsAddr string
-	var enableLeaderElection bool
 	var probeAddr string
 
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
-	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
-		"Enable leader election for controller manager. "+
-			"Enabling this will ensure there is only one active controller manager.")
+
 	snolog.BindFlags(flag.CommandLine)
 	flag.Parse()
 	snolog.InitLog()
 
 	restConfig := ctrl.GetConfigOrDie()
 
-	kubeClient, err := client.New(restConfig, client.Options{Scheme: scheme})
-	if err != nil {
-		setupLog.Error(err, "couldn't create client")
-		os.Exit(1)
-	}
-
 	if vars.ResourcePrefix == "" {
 		setupLog.Error(nil, "RESOURCE_PREFIX environment variable can't be empty")
 		os.Exit(1)
 	}
 
-	le := leaderelection.GetLeaderElectionConfig(kubeClient, enableLeaderElection)
-
-	leaderElectionMgr, err := ctrl.NewManager(restConfig, ctrl.Options{
-		Scheme:                        scheme,
-		HealthProbeBindAddress:        probeAddr,
-		Metrics:                       server.Options{BindAddress: "0"},
-		LeaderElection:                enableLeaderElection,
-		LeaseDuration:                 &le.LeaseDuration,
-		LeaderElectionReleaseOnCancel: true,
-		RenewDeadline:                 &le.RenewDeadline,
-		RetryPeriod:                   &le.RetryPeriod,
-		LeaderElectionID:              consts.LeaderElectionID,
+	mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
+		Scheme:                 scheme,
+		HealthProbeBindAddress: probeAddr,
+		Metrics:                server.Options{BindAddress: metricsAddr},
+		WebhookServer:          webhook.NewServer(webhook.Options{Port: 9443}),
+		Cache:                  cache.Options{DefaultNamespaces: map[string]cache.Config{vars.Namespace: {}}},
 	})
 	if err != nil {
-		setupLog.Error(err, "unable to start leader election manager")
+		setupLog.Error(err, "unable to start manager")
 		os.Exit(1)
 	}
 
-	if err := leaderElectionMgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		os.Exit(1)
 	}
-	if err := leaderElectionMgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up ready check")
 		os.Exit(1)
 	}
 
-	mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
-		Scheme:        scheme,
-		Metrics:       server.Options{BindAddress: metricsAddr},
-		WebhookServer: webhook.NewServer(webhook.Options{Port: 9443}),
-		Cache:         cache.Options{DefaultNamespaces: map[string]cache.Config{vars.Namespace: {}}},
-	})
-	if err != nil {
-		setupLog.Error(err, "unable to start manager")
-		os.Exit(1)
-	}
-
 	mgrGlobal, err := ctrl.NewManager(restConfig, ctrl.Options{
 		Scheme:  scheme,
 		Metrics: server.Options{BindAddress: "0"},
@@ -267,22 +238,6 @@ func main() {
 	}
 	// +kubebuilder:scaffold:builder
 
-	leaderElectionErr := make(chan error)
-	leaderElectionContext, cancelLeaderElection := context.WithCancel(context.Background())
-	go func() {
-		setupLog.Info("starting leader election manager")
-		leaderElectionErr <- leaderElectionMgr.Start(leaderElectionContext)
-	}()
-
-	select {
-	case <-leaderElectionMgr.Elected():
-	case err := <-leaderElectionErr:
-		setupLog.Error(err, "Leader Election Manager error")
-		os.Exit(1)
-	}
-
-	setupLog.Info("acquired lease")
-
 	stopSignalCh := ctrl.SetupSignalHandler()
 
 	globalManagerErr := make(chan error)
@@ -303,50 +258,26 @@ func main() {
 	// Wait for a stop signal
 	case <-stopSignalCh.Done():
 		setupLog.Info("Stop signal received")
-
 		globalManagerCancel()
 		namespacedManagerCancel()
 		<-globalManagerErr
 		<-namespacedManagerErr
-
 		utils.Shutdown()
 
-		cancelLeaderElection()
-		<-leaderElectionErr
-
-	case err := <-leaderElectionErr:
-		setupLog.Error(err, "Leader Election Manager error")
-		globalManagerCancel()
-		namespacedManagerCancel()
-		<-globalManagerErr
-		<-namespacedManagerErr
-
-		os.Exit(1)
-
 	case err := <-globalManagerErr:
 		setupLog.Error(err, "Global Manager error")
-
 		namespacedManagerCancel()
 		<-namespacedManagerErr
-
 		utils.Shutdown()
 
-		cancelLeaderElection()
-		<-leaderElectionErr
-
 		os.Exit(1)
 
 	case err := <-namespacedManagerErr:
 		setupLog.Error(err, "Namsepaced Manager error")
-
 		globalManagerCancel()
 		<-globalManagerErr
-
 		utils.Shutdown()
 
-		cancelLeaderElection()
-		<-leaderElectionErr
-
 		os.Exit(1)
 	}
 }