feat: migrate elasticquota controller to ctrl runtime

kubernetes-sigs · Mar 11, 2023 · 2f5cf9b · 2f5cf9b
1 parent 7da686c
commit 2f5cf9b
Show file tree

Hide file tree

Showing 10 changed files with 296 additions and 462 deletions.
diff --git a/cmd/controller/app/server.go b/cmd/controller/app/server.go
@@ -39,7 +39,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 
 	schedulingv1a1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
-	"sigs.k8s.io/scheduler-plugins/pkg/controller"
 	"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"
@@ -86,11 +85,8 @@ func Run(s *ServerRunOptions) error {
 	kubeClient := kubernetes.NewForConfigOrDie(config)
 
 	schedInformerFactory := schedformers.NewSharedInformerFactory(schedClient, 0)
-	eqInformer := schedInformerFactory.Scheduling().V1alpha1().ElasticQuotas()
 
 	coreInformerFactory := informers.NewSharedInformerFactory(kubeClient, 0)
-	podInformer := coreInformerFactory.Core().V1().Pods()
-	eqCtrl := controller.NewElasticQuotaController(kubeClient, eqInformer, podInformer, schedClient)
 
 	// Controller Runtime Controllers
 	ctrl.SetLogger(klogr.New())
@@ -116,6 +112,14 @@ func Run(s *ServerRunOptions) error {
 		return err
 	}
 
+	if err = (&controllers.ElasticQuotaReconciler{
+		Client: mgr.GetClient(),
+		Scheme: mgr.GetScheme(),
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "ElasticQuota")
+		return err
+	}
+
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")
 		return err
@@ -126,7 +130,6 @@ func Run(s *ServerRunOptions) error {
 	}
 
 	run := func(ctx context.Context) {
-		go eqCtrl.Run(s.Workers, ctx.Done())
 		setupLog.Info("starting manager")
 		if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 			setupLog.Error(err, "unable to start manager")

diff --git a/manifests/install/all-in-one.yaml b/manifests/install/all-in-one.yaml
@@ -53,6 +53,9 @@ rules:
 - apiGroups: ["scheduling.x-k8s.io"]
   resources: ["podgroups", "elasticquotas", "podgroups/status", "elasticquotas/status"]
   verbs: ["get", "list", "watch", "create", "delete", "update", "patch"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch", "update"]
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/manifests/install/charts/as-a-second-scheduler/templates/rbac.yaml b/manifests/install/charts/as-a-second-scheduler/templates/rbac.yaml
@@ -95,6 +95,9 @@ rules:
 - apiGroups: [""]
   resources: ["pods"]
   verbs: ["get", "list", "watch"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch", "update"]
 - apiGroups: [""]
   resources: ["nodes"]
   verbs: ["get", "list", "watch", "patch"]