@@ -39,7 +39,6 @@ import (
39
39
"sigs.k8s.io/controller-runtime/pkg/healthz"
40
40
41
41
schedulingv1a1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
42
- "sigs.k8s.io/scheduler-plugins/pkg/controller"
43
42
"sigs.k8s.io/scheduler-plugins/pkg/controllers"
44
43
schedclientset "sigs.k8s.io/scheduler-plugins/pkg/generated/clientset/versioned"
45
44
schedformers "sigs.k8s.io/scheduler-plugins/pkg/generated/informers/externalversions"
@@ -86,11 +85,8 @@ func Run(s *ServerRunOptions) error {
86
85
kubeClient := kubernetes .NewForConfigOrDie (config )
87
86
88
87
schedInformerFactory := schedformers .NewSharedInformerFactory (schedClient , 0 )
89
- eqInformer := schedInformerFactory .Scheduling ().V1alpha1 ().ElasticQuotas ()
90
88
91
89
coreInformerFactory := informers .NewSharedInformerFactory (kubeClient , 0 )
92
- podInformer := coreInformerFactory .Core ().V1 ().Pods ()
93
- eqCtrl := controller .NewElasticQuotaController (kubeClient , eqInformer , podInformer , schedClient )
94
90
95
91
// Controller Runtime Controllers
96
92
ctrl .SetLogger (klogr .New ())
@@ -116,6 +112,14 @@ func Run(s *ServerRunOptions) error {
116
112
return err
117
113
}
118
114
115
+ if err = (& controllers.ElasticQuotaReconciler {
116
+ Client : mgr .GetClient (),
117
+ Scheme : mgr .GetScheme (),
118
+ }).SetupWithManager (mgr ); err != nil {
119
+ setupLog .Error (err , "unable to create controller" , "controller" , "ElasticQuota" )
120
+ return err
121
+ }
122
+
119
123
if err := mgr .AddHealthzCheck ("healthz" , healthz .Ping ); err != nil {
120
124
setupLog .Error (err , "unable to set up health check" )
121
125
return err
@@ -126,7 +130,6 @@ func Run(s *ServerRunOptions) error {
126
130
}
127
131
128
132
run := func (ctx context.Context ) {
129
- go eqCtrl .Run (s .Workers , ctx .Done ())
130
133
setupLog .Info ("starting manager" )
131
134
if err := mgr .Start (ctrl .SetupSignalHandler ()); err != nil {
132
135
setupLog .Error (err , "unable to start manager" )
0 commit comments