@@ -27,7 +27,6 @@ import (
27
27
"github.com/devfile/devworkspace-operator/controllers/workspace/metrics"
28
28
"github.com/devfile/devworkspace-operator/pkg/common"
29
29
"github.com/devfile/devworkspace-operator/pkg/conditions"
30
- "github.com/devfile/devworkspace-operator/pkg/config"
31
30
wkspConfig "github.com/devfile/devworkspace-operator/pkg/config"
32
31
"github.com/devfile/devworkspace-operator/pkg/constants"
33
32
"github.com/devfile/devworkspace-operator/pkg/library/annotate"
@@ -691,7 +690,7 @@ func (r *DevWorkspaceReconciler) dwPVCHandler(obj client.Object) []reconcile.Req
691
690
692
691
// TODO: Label PVCs used for workspace storage so that they can be cleaned up if non-default name is used.
693
692
// Otherwise, check if common PVC is deleted to make sure all DevWorkspaces see it happen
694
- if obj .GetName () != config .GetGlobalConfig ().Workspace .PVCName || obj .GetDeletionTimestamp () == nil {
693
+ if obj .GetName () != wkspConfig .GetGlobalConfig ().Workspace .PVCName || obj .GetDeletionTimestamp () == nil {
695
694
// We're looking for a deleted common PVC
696
695
return []reconcile.Request {}
697
696
}
@@ -717,7 +716,7 @@ func (r *DevWorkspaceReconciler) dwPVCHandler(obj client.Object) []reconcile.Req
717
716
func (r * DevWorkspaceReconciler ) SetupWithManager (mgr ctrl.Manager ) error {
718
717
setupHttpClients ()
719
718
720
- maxConcurrentReconciles , err := config .GetMaxConcurrentReconciles ()
719
+ maxConcurrentReconciles , err := wkspConfig .GetMaxConcurrentReconciles ()
721
720
if err != nil {
722
721
return err
723
722
}
@@ -726,7 +725,7 @@ func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
726
725
return []reconcile.Request {}
727
726
}
728
727
729
- var configWatcher builder.WatchesOption = builder .WithPredicates (config .Predicates ())
728
+ var configWatcher builder.WatchesOption = builder .WithPredicates (wkspConfig .Predicates ())
730
729
731
730
// TODO: Set up indexing https://book.kubebuilder.io/cronjob-tutorial/controller-implementation.html#setup
732
731
return ctrl .NewControllerManagedBy (mgr ).
0 commit comments