From a31708ae469f553e07cf4be443dabb09ee337ad1 Mon Sep 17 00:00:00 2001 From: "zhongjun.li" Date: Tue, 2 Nov 2021 17:19:30 +0800 Subject: [PATCH] propagationpolicy clean up Signed-off-by: zhongjun.li --- .../app/controllermanager.go | 8 --- .../propagationpolicy_controller.go | 58 ------------------- 2 files changed, 66 deletions(-) delete mode 100644 pkg/controllers/propagationpolicy/propagationpolicy_controller.go diff --git a/cmd/controller-manager/app/controllermanager.go b/cmd/controller-manager/app/controllermanager.go index eeb38537c..ae9e82672 100644 --- a/cmd/controller-manager/app/controllermanager.go +++ b/cmd/controller-manager/app/controllermanager.go @@ -26,7 +26,6 @@ import ( "github.com/karmada-io/karmada/pkg/controllers/hpa" "github.com/karmada-io/karmada/pkg/controllers/mcs" "github.com/karmada-io/karmada/pkg/controllers/namespace" - "github.com/karmada-io/karmada/pkg/controllers/propagationpolicy" "github.com/karmada-io/karmada/pkg/controllers/status" "github.com/karmada-io/karmada/pkg/detector" "github.com/karmada-io/karmada/pkg/karmadactl" @@ -194,13 +193,6 @@ func setupControllers(mgr controllerruntime.Manager, opts *options.Options, stop klog.Fatalf("Failed to setup hpa controller: %v", err) } - policyController := &propagationpolicy.Controller{ - Client: mgr.GetClient(), - } - if err := policyController.SetupWithManager(mgr); err != nil { - klog.Fatalf("Failed to setup policy controller: %v", err) - } - bindingController := &binding.ResourceBindingController{ Client: mgr.GetClient(), DynamicClient: dynamicClientSet, diff --git a/pkg/controllers/propagationpolicy/propagationpolicy_controller.go b/pkg/controllers/propagationpolicy/propagationpolicy_controller.go deleted file mode 100644 index b3878c329..000000000 --- a/pkg/controllers/propagationpolicy/propagationpolicy_controller.go +++ /dev/null @@ -1,58 +0,0 @@ -package propagationpolicy - -import ( - "context" - "fmt" - - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/klog/v2" - controllerruntime "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - - policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" - "github.com/karmada-io/karmada/pkg/util/helper" -) - -// Controller is to sync PropagationPolicy. -type Controller struct { - client.Client -} - -// Reconcile performs a full reconciliation for the object referred to by the Request. -// The Controller will requeue the Request to be processed again if an error is non-nil or -// Result.Requeue is true, otherwise upon completion it will remove the work from the queue. -func (c *Controller) Reconcile(ctx context.Context, req controllerruntime.Request) (controllerruntime.Result, error) { - klog.V(4).Infof("Reconciling PropagationPolicy %s.", req.NamespacedName.String()) - - policy := &policyv1alpha1.PropagationPolicy{} - if err := c.Client.Get(context.TODO(), req.NamespacedName, policy); err != nil { - // The resource may no longer exist, in which case we stop processing. - if apierrors.IsNotFound(err) { - return controllerruntime.Result{}, nil - } - - return controllerruntime.Result{Requeue: true}, err - } - - if !policy.DeletionTimestamp.IsZero() { - return controllerruntime.Result{}, nil - } - - // TODO(RainbowMango): wait for moving this logic to detector. - // Maybe there is another option that introduce status for policy apis. - present, err := helper.IsDependentOverridesPresent(c.Client, policy) - if err != nil { - return controllerruntime.Result{Requeue: true}, err - } - if !present { - klog.Infof("waiting for policy(%s) dependent overrides ready.", req.String()) - return controllerruntime.Result{Requeue: true}, fmt.Errorf("waiting for policy(%s) dependent overrides ready", req.String()) - } - - return controllerruntime.Result{}, nil -} - -// SetupWithManager creates a controller and register to controller manager. -func (c *Controller) SetupWithManager(mgr controllerruntime.Manager) error { - return controllerruntime.NewControllerManagedBy(mgr).For(&policyv1alpha1.PropagationPolicy{}).Complete(c) -}