diff --git a/controllers/backupcronjob/backupcronjob_controller.go b/controllers/backupcronjob/backupcronjob_controller.go index 0b21a3111..7a03c692d 100644 --- a/controllers/backupcronjob/backupcronjob_controller.go +++ b/controllers/backupcronjob/backupcronjob_controller.go @@ -42,6 +42,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/predicate" @@ -94,6 +95,9 @@ func (r *BackupCronJobReconciler) SetupWithManager(mgr ctrl.Manager) error { return ctrl.NewControllerManagedBy(mgr). Named("BackupCronJob"). + WithOptions(controller.Options{ + UsePriorityQueue: ptr.To(false), + }). Watches( &controllerv1alpha1.DevWorkspaceOperatorConfig{}, handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request { diff --git a/controllers/cleanupcronjob/cleanupcronjob_controller.go b/controllers/cleanupcronjob/cleanupcronjob_controller.go index d74d6683b..c5d7498bf 100644 --- a/controllers/cleanupcronjob/cleanupcronjob_controller.go +++ b/controllers/cleanupcronjob/cleanupcronjob_controller.go @@ -30,8 +30,10 @@ import ( "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/utils/ptr" 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/event" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/predicate" @@ -123,6 +125,9 @@ func (r *CleanupCronJobReconciler) SetupWithManager(mgr ctrl.Manager) error { return ctrl.NewControllerManagedBy(mgr). Named("CleanupCronJob"). + WithOptions(controller.Options{ + UsePriorityQueue: ptr.To(false), + }). Watches(&controllerv1alpha1.DevWorkspaceOperatorConfig{}, handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request { operatorNamespace, err := infrastructure.GetNamespace() diff --git a/controllers/controller/devworkspacerouting/devworkspacerouting_controller.go b/controllers/controller/devworkspacerouting/devworkspacerouting_controller.go index 367da93d0..e5b6e2ca9 100644 --- a/controllers/controller/devworkspacerouting/devworkspacerouting_controller.go +++ b/controllers/controller/devworkspacerouting/devworkspacerouting_controller.go @@ -35,6 +35,7 @@ import ( networkingv1 "k8s.io/api/networking/v1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -340,7 +341,10 @@ func (r *DevWorkspaceRoutingReconciler) SetupWithManager(mgr ctrl.Manager) error } bld := ctrl.NewControllerManagedBy(mgr). - WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}). + WithOptions(controller.Options{ + MaxConcurrentReconciles: maxConcurrentReconciles, + UsePriorityQueue: ptr.To(false), + }). For(&controllerv1alpha1.DevWorkspaceRouting{}). Owns(&corev1.Service{}). Owns(&networkingv1.Ingress{}) diff --git a/controllers/workspace/devworkspace_controller.go b/controllers/workspace/devworkspace_controller.go index f53af369e..6a25994da 100644 --- a/controllers/workspace/devworkspace_controller.go +++ b/controllers/workspace/devworkspace_controller.go @@ -804,7 +804,10 @@ func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error { // TODO: Set up indexing https://book.kubebuilder.io/cronjob-tutorial/controller-implementation.html#setup return ctrl.NewControllerManagedBy(mgr). - WithOptions(controller.Options{MaxConcurrentReconciles: maxConcurrentReconciles}). + WithOptions(controller.Options{ + MaxConcurrentReconciles: maxConcurrentReconciles, + UsePriorityQueue: pointer.Bool(false), + }). For(&dw.DevWorkspace{}). // List DevWorkspaceTemplates as owned to enable updating workspaces when templates // are changed; this should be moved to whichever controller is responsible for flattening