chore: manage PVCs within the workload (#9664)

Author: leon-inf

cmd/manager/main.go

@@ -482,7 +482,7 @@ func main() {
 			Client:   client,
 			Scheme:   mgr.GetScheme(),
 			Recorder: mgr.GetEventRecorderFor("component-controller"),
-		}).SetupWithManager(mgr, multiClusterMgr); err != nil {
+		}).SetupWithManager(mgr); err != nil {
 			setupLog.Error(err, "unable to create controller", "controller", "Component")
 			os.Exit(1)
 		}

controllers/apps/cluster/transformer_cluster_deletion.go

@@ -133,7 +133,7 @@ func (t *clusterDeletionTransformer) Transform(ctx graph.TransformContext, dag *
 		if isOwnedByComp(o) || appsutil.IsOwnedByInstanceSet(o) {
 			continue
 		}
-		graphCli.Delete(dag, o, appsutil.InUniversalContext4G())
+		graphCli.Delete(dag, o)
 	}
 
 	// set cluster action to status until all the sub-resources deleted

controllers/apps/cluster/utils.go

@@ -30,7 +30,6 @@ import (
 
 	appsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
 	dpv1alpha1 "github.com/apecloud/kubeblocks/apis/dataprotection/v1alpha1"
-	appsutil "github.com/apecloud/kubeblocks/controllers/apps/util"
 	"github.com/apecloud/kubeblocks/pkg/constant"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	dptypes "github.com/apecloud/kubeblocks/pkg/dataprotection/types"
@@ -95,14 +94,14 @@ func getOwningNamespacedObjects(ctx context.Context,
 	labels client.MatchingLabels,
 	kinds []client.ObjectList) (owningObjects, error) {
 	inNS := client.InNamespace(namespace)
-	return getOwningObjectsWithOptions(ctx, cli, kinds, inNS, labels, appsutil.InUniversalContext4C())
+	return getOwningObjectsWithOptions(ctx, cli, kinds, inNS, labels)
 }
 
 func getOwningNonNamespacedObjects(ctx context.Context,
 	cli client.Reader,
 	labels client.MatchingLabels,
 	kinds []client.ObjectList) (owningObjects, error) {
-	return getOwningObjectsWithOptions(ctx, cli, kinds, labels, appsutil.InUniversalContext4C())
+	return getOwningObjectsWithOptions(ctx, cli, kinds, labels)
 }
 
 func getOwningObjectsWithOptions(ctx context.Context,

controllers/apps/component/component_controller.go

@@ -41,7 +41,6 @@ import (
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	appsutil "github.com/apecloud/kubeblocks/controllers/apps/util"
 	"github.com/apecloud/kubeblocks/pkg/constant"
-	"github.com/apecloud/kubeblocks/pkg/controller/multicluster"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
 	viper "github.com/apecloud/kubeblocks/pkg/viperx"
 )
@@ -190,18 +189,12 @@ func (r *ComponentReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 }
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *ComponentReconciler) SetupWithManager(mgr ctrl.Manager, multiClusterMgr multicluster.Manager) error {
+func (r *ComponentReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	retryDurationMS := viper.GetInt(constant.CfgKeyCtrlrReconcileRetryDurationMS)
 	if retryDurationMS != 0 {
 		appsutil.RequeueDuration = time.Millisecond * time.Duration(retryDurationMS)
 	}
-	if multiClusterMgr == nil {
-		return r.setupWithManager(mgr)
-	}
-	return r.setupWithMultiClusterManager(mgr, multiClusterMgr)
-}
 
-func (r *ComponentReconciler) setupWithManager(mgr ctrl.Manager) error {
 	b := intctrlutil.NewControllerManagedBy(mgr).
 		For(&appsv1.Component{}).
 		WithOptions(controller.Options{
@@ -211,8 +204,7 @@ func (r *ComponentReconciler) setupWithManager(mgr ctrl.Manager) error {
 		Owns(&corev1.Service{}).
 		Owns(&corev1.Secret{}).
 		Owns(&corev1.ConfigMap{}).
-		Watches(&dpv1alpha1.Restore{}, handler.EnqueueRequestsFromMapFunc(r.filterComponentResources)).
-		Watches(&corev1.PersistentVolumeClaim{}, handler.EnqueueRequestsFromMapFunc(r.filterComponentResources))
+		Watches(&dpv1alpha1.Restore{}, handler.EnqueueRequestsFromMapFunc(r.filterComponentResources))
 
 	if viper.GetBool(constant.EnableRBACManager) {
 		b.Owns(&rbacv1.RoleBinding{}).
@@ -223,26 +215,6 @@ func (r *ComponentReconciler) setupWithManager(mgr ctrl.Manager) error {
 	return b.Complete(r)
 }
 
-func (r *ComponentReconciler) setupWithMultiClusterManager(mgr ctrl.Manager, multiClusterMgr multicluster.Manager) error {
-	b := intctrlutil.NewControllerManagedBy(mgr).
-		For(&appsv1.Component{}).
-		WithOptions(controller.Options{
-			MaxConcurrentReconciles: viper.GetInt(constant.CfgKBReconcileWorkers),
-		}).
-		Owns(&workloads.InstanceSet{}).
-		Watches(&dpv1alpha1.Restore{}, handler.EnqueueRequestsFromMapFunc(r.filterComponentResources))
-
-	eventHandler := handler.EnqueueRequestsFromMapFunc(r.filterComponentResources)
-	multiClusterMgr.Watch(b, &corev1.Service{}, eventHandler).
-		Watch(b, &corev1.Secret{}, eventHandler).
-		Watch(b, &corev1.ConfigMap{}, eventHandler).
-		Watch(b, &corev1.PersistentVolumeClaim{}, eventHandler).
-		Watch(b, &corev1.ServiceAccount{}, eventHandler).
-		Watch(b, &rbacv1.RoleBinding{}, eventHandler)
-
-	return b.Complete(r)
-}
-
 func (r *ComponentReconciler) filterComponentResources(ctx context.Context, obj client.Object) []reconcile.Request {
 	labels := obj.GetLabels()
 	if v, ok := labels[constant.AppManagedByLabelKey]; !ok || v != constant.AppName {