Skip to content

Commit 113b402

Browse files
authored
Set controller UsePriorityQueue to false. Field defaults to true starting from controller-runtime v0.23.x. (#1635)
Signed-off-by: dkwon17 <dakwon@redhat.com>
1 parent 842e945 commit 113b402

4 files changed

Lines changed: 18 additions & 2 deletions

File tree

controllers/backupcronjob/backupcronjob_controller.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import (
4242
ctrl "sigs.k8s.io/controller-runtime"
4343
"sigs.k8s.io/controller-runtime/pkg/builder"
4444
"sigs.k8s.io/controller-runtime/pkg/client"
45+
"sigs.k8s.io/controller-runtime/pkg/controller"
4546
"sigs.k8s.io/controller-runtime/pkg/event"
4647
"sigs.k8s.io/controller-runtime/pkg/handler"
4748
"sigs.k8s.io/controller-runtime/pkg/predicate"
@@ -94,6 +95,9 @@ func (r *BackupCronJobReconciler) SetupWithManager(mgr ctrl.Manager) error {
9495

9596
return ctrl.NewControllerManagedBy(mgr).
9697
Named("BackupCronJob").
98+
WithOptions(controller.Options{
99+
UsePriorityQueue: ptr.To(false),
100+
}).
97101
Watches(
98102
&controllerv1alpha1.DevWorkspaceOperatorConfig{},
99103
handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {

controllers/cleanupcronjob/cleanupcronjob_controller.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ import (
3030
"github.com/go-logr/logr"
3131
"k8s.io/apimachinery/pkg/runtime"
3232
"k8s.io/apimachinery/pkg/runtime/schema"
33+
"k8s.io/utils/ptr"
3334
ctrl "sigs.k8s.io/controller-runtime"
3435
"sigs.k8s.io/controller-runtime/pkg/client"
36+
"sigs.k8s.io/controller-runtime/pkg/controller"
3537
"sigs.k8s.io/controller-runtime/pkg/event"
3638
"sigs.k8s.io/controller-runtime/pkg/handler"
3739
"sigs.k8s.io/controller-runtime/pkg/predicate"
@@ -123,6 +125,9 @@ func (r *CleanupCronJobReconciler) SetupWithManager(mgr ctrl.Manager) error {
123125

124126
return ctrl.NewControllerManagedBy(mgr).
125127
Named("CleanupCronJob").
128+
WithOptions(controller.Options{
129+
UsePriorityQueue: ptr.To(false),
130+
}).
126131
Watches(&controllerv1alpha1.DevWorkspaceOperatorConfig{},
127132
handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
128133
operatorNamespace, err := infrastructure.GetNamespace()

controllers/controller/devworkspacerouting/devworkspacerouting_controller.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
networkingv1 "k8s.io/api/networking/v1"
3636
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
3737
"k8s.io/apimachinery/pkg/runtime"
38+
"k8s.io/utils/ptr"
3839
ctrl "sigs.k8s.io/controller-runtime"
3940
"sigs.k8s.io/controller-runtime/pkg/client"
4041
"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -340,7 +341,10 @@ func (r *DevWorkspaceRoutingReconciler) SetupWithManager(mgr ctrl.Manager) error
340341
}
341342

342343
bld := ctrl.NewControllerManagedBy(mgr).
343-
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
344+
WithOptions(controller.Options{
345+
MaxConcurrentReconciles: maxConcurrentReconciles,
346+
UsePriorityQueue: ptr.To(false),
347+
}).
344348
For(&controllerv1alpha1.DevWorkspaceRouting{}).
345349
Owns(&corev1.Service{}).
346350
Owns(&networkingv1.Ingress{})

controllers/workspace/devworkspace_controller.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,10 @@ func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
804804

805805
// TODO: Set up indexing https://book.kubebuilder.io/cronjob-tutorial/controller-implementation.html#setup
806806
return ctrl.NewControllerManagedBy(mgr).
807-
WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}).
807+
WithOptions(controller.Options{
808+
MaxConcurrentReconciles: maxConcurrentReconciles,
809+
UsePriorityQueue: pointer.Bool(false),
810+
}).
808811
For(&dw.DevWorkspace{}).
809812
// List DevWorkspaceTemplates as owned to enable updating workspaces when templates
810813
// are changed; this should be moved to whichever controller is responsible for flattening

0 commit comments

Comments
 (0)