[WIP] adapt to controller-runtime's SDK change

Author: Huang-Wei

pkg/controllers/elasticquota_controller.go

@@ -33,8 +33,6 @@ import (
 	"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"
-
 	schedv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
 )
 
@@ -173,7 +171,7 @@ func newZeroUsed(eq *schedv1alpha1.ElasticQuota) v1.ResourceList {
 func (r *ElasticQuotaReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.recorder = mgr.GetEventRecorderFor("ElasticQuotaController")
 	return ctrl.NewControllerManagedBy(mgr).
-		Watches(&source.Kind{Type: &v1.Pod{}}, &handler.EnqueueRequestForObject{}).
+		Watches(&v1.Pod{}, &handler.EnqueueRequestForObject{}).
 		For(&schedv1alpha1.ElasticQuota{}).
 		WithOptions(controller.Options{MaxConcurrentReconciles: r.Workers}).
 		Complete(r)

pkg/controllers/podgroup_controller.go

@@ -36,8 +36,6 @@ import (
 	"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"
-
 	schedv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
 	"sigs.k8s.io/scheduler-plugins/pkg/util"
 )
@@ -191,14 +189,13 @@ func (r *PodGroupReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.log = mgr.GetLogger()
 
 	return ctrl.NewControllerManagedBy(mgr).
-		Watches(&source.Kind{Type: &v1.Pod{}},
-			handler.EnqueueRequestsFromMapFunc(r.podToPodGroup)).
+		Watches(&v1.Pod{}, handler.EnqueueRequestsFromMapFunc(r.podToPodGroup)).
 		For(&schedv1alpha1.PodGroup{}).
 		WithOptions(controller.Options{MaxConcurrentReconciles: r.Workers}).
 		Complete(r)
 }
 
-func (r *PodGroupReconciler) podToPodGroup(obj client.Object) []ctrl.Request {
+func (r *PodGroupReconciler) podToPodGroup(ctx context.Context, obj client.Object) []ctrl.Request {
 	pod, ok := obj.(*v1.Pod)
 	if !ok {
 		return nil

pkg/controllers/podgroup_controller_test.go

@@ -166,7 +166,7 @@ func Test_Run(t *testing.T) {
 			}
 			for _, p := range ps {
 				kClient.Status().Update(ctx, p)
-				reqs := controller.podToPodGroup(p)
+				reqs := controller.podToPodGroup(ctx, p)
 				for _, req := range reqs {
 					if _, err := controller.Reconcile(ctx, req); err != nil {
 						t.Errorf("reconcile: (%v)", err)