Merge pull request #3667 from wansir/fix-3652

Fix workspace controller manager
2021-04-01 19:04:52 +08:00
parent 364c806ddd f23771b3eb
commit 6973f7895c
5 changed files with 486 additions and 5 deletions
--- a/pkg/controller/workspace/workspace_controller.go
+++ b/pkg/controller/workspace/workspace_controller.go
@@ -84,11 +84,6 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}

-	// controlled kubefed-controller-manager
-	if workspace.Labels[constants.KubefedManagedLabel] == "true" {
-		return ctrl.Result{}, nil
-	}
-
 	// name of your custom finalizer
 	finalizer := "finalizers.tenant.kubesphere.io"