Delete Useless options in controller

kubernetes-sigs · Apr 4, 2023 · 0383bfd · 0383bfd
1 parent 549c61d
commit 0383bfd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 103 deletions.
diff --git a/cmd/controller/app/options.go b/cmd/controller/app/options.go
@@ -21,11 +21,8 @@ import (
 )
 
 type ServerRunOptions struct {
-	KubeConfig           string
-	MasterUrl            string
 	MetricsAddr          string
 	ProbeAddr            string
-	InCluster            bool
 	ApiServerQPS         int
 	ApiServerBurst       int
 	Workers              int
@@ -39,9 +36,6 @@ func NewServerRunOptions() *ServerRunOptions {
 }
 
 func (s *ServerRunOptions) addAllFlags() {
-	pflag.BoolVar(&s.InCluster, "incluster", s.InCluster, "If controller run incluster.")
-	pflag.StringVar(&s.KubeConfig, "kubeConfig", s.KubeConfig, "Kube Config path if not run in cluster.")
-	pflag.StringVar(&s.MasterUrl, "masterUrl", s.MasterUrl, "Master Url if not run in cluster.")
 	pflag.StringVar(&s.MetricsAddr, "metricsAddr", ":8080", "Metrics server bind listen address.")
 	pflag.StringVar(&s.ProbeAddr, "probeAddr", ":8081", "Probe endpoint bind  address.")
 	pflag.IntVar(&s.ApiServerQPS, "qps", 5, "qps of query apiserver.")

diff --git a/cmd/controller/app/server.go b/cmd/controller/app/server.go
@@ -17,31 +17,16 @@ limitations under the License.
 package app
 
 import (
-	"context"
-	"os"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/apimachinery/pkg/util/uuid"
-	"k8s.io/apiserver/pkg/server"
-	"k8s.io/client-go/informers"
-	"k8s.io/client-go/kubernetes"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-	restclient "k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/tools/leaderelection"
-	"k8s.io/client-go/tools/leaderelection/resourcelock"
-	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 
 	schedulingv1a1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
 	"sigs.k8s.io/scheduler-plugins/pkg/controllers"
-	schedclientset "sigs.k8s.io/scheduler-plugins/pkg/generated/clientset/versioned"
-	schedformers "sigs.k8s.io/scheduler-plugins/pkg/generated/informers/externalversions"
 )
 
 var (
@@ -55,38 +40,10 @@ func init() {
 	utilruntime.Must(schedulingv1a1.AddToScheme(scheme))
 }
 
-func newConfig(kubeconfig, master string, inCluster bool) (*restclient.Config, error) {
-	var (
-		config *rest.Config
-		err    error
-	)
-	if inCluster {
-		config, err = rest.InClusterConfig()
-	} else {
-		config, err = clientcmd.BuildConfigFromFlags(master, kubeconfig)
-	}
-	if err != nil {
-		return nil, err
-	}
-	return config, nil
-}
-
 func Run(s *ServerRunOptions) error {
-	ctx := context.Background()
-	config, err := newConfig(s.KubeConfig, s.MasterUrl, s.InCluster)
-	if err != nil {
-		klog.ErrorS(err, "Failed to parse config")
-		os.Exit(1)
-	}
+	config := ctrl.GetConfigOrDie()
 	config.QPS = float32(s.ApiServerQPS)
 	config.Burst = s.ApiServerBurst
-	stopCh := server.SetupSignalHandler()
-	schedClient := schedclientset.NewForConfigOrDie(config)
-	kubeClient := kubernetes.NewForConfigOrDie(config)
-
-	schedInformerFactory := schedformers.NewSharedInformerFactory(schedClient, 0)
-
-	coreInformerFactory := informers.NewSharedInformerFactory(kubeClient, 0)
 
 	// Controller Runtime Controllers
 	ctrl.SetLogger(klogr.New())
@@ -105,16 +62,18 @@ func Run(s *ServerRunOptions) error {
 	}
 
 	if err = (&controllers.PodGroupReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
+		Client:  mgr.GetClient(),
+		Scheme:  mgr.GetScheme(),
+		Workers: s.Workers,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "PodGroup")
 		return err
 	}
 
 	if err = (&controllers.ElasticQuotaReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
+		Client:  mgr.GetClient(),
+		Scheme:  mgr.GetScheme(),
+		Workers: s.Workers,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "ElasticQuota")
 		return err
@@ -129,53 +88,9 @@ func Run(s *ServerRunOptions) error {
 		return err
 	}
 
-	run := func(ctx context.Context) {
-		setupLog.Info("starting manager")
-		if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
-			setupLog.Error(err, "unable to start manager")
-			panic(err)
-		}
-
-		select {}
-	}
-	schedInformerFactory.Start(stopCh)
-	coreInformerFactory.Start(stopCh)
-	if !s.EnableLeaderElection {
-		run(ctx)
-	} else {
-		id, err := os.Hostname()
-		if err != nil {
-			return err
-		}
-		// add a uniquifier so that two processes on the same host don't accidentally both become active
-		id = id + "_" + string(uuid.NewUUID())
-
-		rl, err := resourcelock.New("endpoints",
-			"kube-system",
-			"sched-plugins-controller",
-			kubeClient.CoreV1(),
-			kubeClient.CoordinationV1(),
-			resourcelock.ResourceLockConfig{
-				Identity: id,
-			})
-		if err != nil {
-			klog.ErrorS(err, "Resource lock creation failed")
-			os.Exit(1)
-		}
-
-		leaderelection.RunOrDie(context.TODO(), leaderelection.LeaderElectionConfig{
-			Lock: rl,
-			Callbacks: leaderelection.LeaderCallbacks{
-				OnStartedLeading: run,
-				OnStoppedLeading: func() {
-					klog.ErrorS(err, "Leaderelection lost")
-					os.Exit(1)
-				},
-			},
-			Name: "scheduler-plugins controller",
-		})
+	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+		setupLog.Error(err, "unable to start manager")
+		return err
 	}
-
-	<-stopCh
 	return nil
 }
diff --git a/pkg/controllers/elasticquota_controller.go b/pkg/controllers/elasticquota_controller.go
@@ -30,6 +30,7 @@ import (
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -41,7 +42,8 @@ type ElasticQuotaReconciler struct {
 	recorder record.EventRecorder
 
 	client.Client
-	Scheme *runtime.Scheme
+	Scheme  *runtime.Scheme
+	Workers int
 }
 
 // +kubebuilder:rbac:groups=scheduling.x-k8s.io,resources=elasticquota,verbs=get;list;watch;create;update;patch;delete
@@ -173,5 +175,6 @@ func (r *ElasticQuotaReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		Watches(&source.Kind{Type: &v1.Pod{}}, &handler.EnqueueRequestForObject{}).
 		For(&schedv1alpha1.ElasticQuota{}).
+		WithOptions(controller.Options{MaxConcurrentReconciles: r.Workers}).
 		Complete(r)
 }
diff --git a/pkg/controllers/podgroup_controller.go b/pkg/controllers/podgroup_controller.go
@@ -33,6 +33,7 @@ import (
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -47,7 +48,8 @@ type PodGroupReconciler struct {
 	recorder record.EventRecorder
 
 	client.Client
-	Scheme *runtime.Scheme
+	Scheme  *runtime.Scheme
+	Workers int
 }
 
 // +kubebuilder:rbac:groups=scheduling.x-k8s.io,resources=podgroups,verbs=get;list;watch;create;update;patch;delete
@@ -195,6 +197,7 @@ func (r *PodGroupReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Watches(&source.Kind{Type: &v1.Pod{}},
 			handler.EnqueueRequestsFromMapFunc(r.podToPodGroup)).
 		For(&schedv1alpha1.PodGroup{}).
+		WithOptions(controller.Options{MaxConcurrentReconciles: r.Workers}).
 		Complete(r)
 }