chore: filter events to reconcile by CRD API version (#8522)

cmd/dataprotection/main.go

@@ -82,10 +82,6 @@ const (
 	multiClusterContextsDisabledFlagKey flagName = "multi-cluster-contexts-disabled"
 
 	userAgentFlagKey flagName = "user-agent"
-
-	// dual-operators-mode indicates whether the operator runs in dual-operators mode.
-	// If it's true, the operator will degrade to a secondary operator and only manage the resources dedicated to releases prior to v1.0.
-	dualOperatorsModeFlag flagName = "dual-operators-mode"
 )
 
 var (
@@ -122,6 +118,7 @@ func init() {
 	viper.SetDefault(dptypes.CfgKeyWorkerServiceAccountAnnotations, "{}")
 	viper.SetDefault(dptypes.CfgKeyWorkerClusterRoleName, "kubeblocks-dataprotection-worker-role")
 	viper.SetDefault(dptypes.CfgDataProtectionReconcileWorkers, runtime.NumCPU())
+	viper.SetDefault(constant.DualOperatorsMode, false)
 }
 
 func main() {
@@ -152,8 +149,6 @@ func main() {
 
 	flag.String(userAgentFlagKey.String(), "", "User agent of the operator.")
 
-	flag.Bool(dualOperatorsModeFlag.String(), false, "Whether the operator runs in dual-operators mode.")
-
 	flag.String(constant.ManagedNamespacesFlag, "",
 		"The namespaces that the operator will manage, multiple namespaces are separated by commas.")
 
@@ -279,8 +274,7 @@ func main() {
 		client = multiClusterMgr.GetClient()
 	}
 
-	dualOperatorsMode := viper.GetBool(dualOperatorsModeFlag.viperName())
-	if !dualOperatorsMode {
+	if !viper.GetBool(constant.DualOperatorsMode) {
 		if err = (&dpcontrollers.ActionSetReconciler{
 			Client:   mgr.GetClient(),
 			Scheme:   mgr.GetScheme(),

cmd/manager/main.go

@@ -92,10 +92,6 @@ const (
 	multiClusterContextsDisabledFlagKey flagName = "multi-cluster-contexts-disabled"
 
 	userAgentFlagKey flagName = "user-agent"
-
-	// dual-operators-mode indicates whether the operator runs in dual-operators mode.
-	// If it's true, the operator will degrade to a secondary operator and only manage the resources dedicated to releases prior to v1.0.
-	dualOperatorsModeFlag flagName = "dual-operators-mode"
 )
 
 var (
@@ -150,6 +146,7 @@ func init() {
 	viper.SetDefault(constant.FeatureGateComponentReplicasAnnotation, true)
 	viper.SetDefault(constant.FeatureGateInPlacePodVerticalScaling, false)
 	viper.SetDefault(constant.FeatureGateNoRSMEnv, false)
+	viper.SetDefault(constant.DualOperatorsMode, false)
 }
 
 type flagName string
@@ -191,8 +188,6 @@ func setupFlags() {
 
 	flag.String(userAgentFlagKey.String(), "", "User agent of the operator.")
 
-	flag.Bool(dualOperatorsModeFlag.String(), false, "Whether the operator runs in dual-operators mode.")
-
 	opts := zap.Options{
 		Development: false,
 	}
@@ -434,49 +429,53 @@ func main() {
 			os.Exit(1)
 		}
 
-		if err = (&appscontrollers.OpsDefinitionReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("ops-definition-controller"),
-		}).SetupWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "OpsDefinition")
-			os.Exit(1)
-		}
-
-		if err = (&appscontrollers.OpsRequestReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("ops-request-controller"),
-		}).SetupWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "OpsRequest")
-			os.Exit(1)
-		}
-
-		if err = (&configuration.ConfigConstraintReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("config-constraint-controller"),
-		}).SetupWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "ConfigConstraint")
-			os.Exit(1)
-		}
-
-		if err = (&configuration.ReconfigureReconciler{
-			Client:   client,
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("reconfigure-controller"),
-		}).SetupWithManager(mgr, multiClusterMgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "ReconfigureRequest")
-			os.Exit(1)
-		}
-
-		if err = (&configuration.ConfigurationReconciler{
-			Client:   client,
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("configuration-controller"),
-		}).SetupWithManager(mgr, multiClusterMgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "Configuration")
-			os.Exit(1)
+		if !viper.GetBool(constant.DualOperatorsMode) {
+			if err = (&appscontrollers.OpsDefinitionReconciler{
+				Client:   mgr.GetClient(),
+				Scheme:   mgr.GetScheme(),
+				Recorder: mgr.GetEventRecorderFor("ops-definition-controller"),
+			}).SetupWithManager(mgr); err != nil {
+				setupLog.Error(err, "unable to create controller", "controller", "OpsDefinition")
+				os.Exit(1)
+			}
+
+			if err = (&appscontrollers.OpsRequestReconciler{
+				Client:   mgr.GetClient(),
+				Scheme:   mgr.GetScheme(),
+				Recorder: mgr.GetEventRecorderFor("ops-request-controller"),
+			}).SetupWithManager(mgr); err != nil {
+				setupLog.Error(err, "unable to create controller", "controller", "OpsRequest")
+				os.Exit(1)
+			}
+		}
+
+		if !viper.GetBool(constant.DualOperatorsMode) {
+			if err = (&configuration.ConfigConstraintReconciler{
+				Client:   mgr.GetClient(),
+				Scheme:   mgr.GetScheme(),
+				Recorder: mgr.GetEventRecorderFor("config-constraint-controller"),
+			}).SetupWithManager(mgr); err != nil {
+				setupLog.Error(err, "unable to create controller", "controller", "ConfigConstraint")
+				os.Exit(1)
+			}
+
+			if err = (&configuration.ReconfigureReconciler{
+				Client:   client,
+				Scheme:   mgr.GetScheme(),
+				Recorder: mgr.GetEventRecorderFor("reconfigure-controller"),
+			}).SetupWithManager(mgr, multiClusterMgr); err != nil {
+				setupLog.Error(err, "unable to create controller", "controller", "ReconfigureRequest")
+				os.Exit(1)
+			}
+
+			if err = (&configuration.ConfigurationReconciler{
+				Client:   client,
+				Scheme:   mgr.GetScheme(),
+				Recorder: mgr.GetEventRecorderFor("configuration-controller"),
+			}).SetupWithManager(mgr, multiClusterMgr); err != nil {
+				setupLog.Error(err, "unable to create controller", "controller", "Configuration")
+				os.Exit(1)
+			}
 		}
 
 		if err = (&appscontrollers.SystemAccountReconciler{
@@ -488,13 +487,15 @@ func main() {
 			os.Exit(1)
 		}
 
-		if err = (&k8scorecontrollers.EventReconciler{
-			Client:   client,
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("event-controller"),
-		}).SetupWithManager(mgr, multiClusterMgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "Event")
-			os.Exit(1)
+		if !viper.GetBool(constant.DualOperatorsMode) {
+			if err = (&k8scorecontrollers.EventReconciler{
+				Client:   client,
+				Scheme:   mgr.GetScheme(),
+				Recorder: mgr.GetEventRecorderFor("event-controller"),
+			}).SetupWithManager(mgr, multiClusterMgr); err != nil {
+				setupLog.Error(err, "unable to create controller", "controller", "Event")
+				os.Exit(1)
+			}
 		}
 
 		if err = (&appscontrollers.ComponentClassReconciler{
@@ -506,22 +507,26 @@ func main() {
 			os.Exit(1)
 		}
 
-		if err = (&appscontrollers.ServiceDescriptorReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("service-descriptor-controller"),
-		}).SetupWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "ServiceDescriptor")
-			os.Exit(1)
+		if !viper.GetBool(constant.DualOperatorsMode) {
+			if err = (&appscontrollers.ServiceDescriptorReconciler{
+				Client:   mgr.GetClient(),
+				Scheme:   mgr.GetScheme(),
+				Recorder: mgr.GetEventRecorderFor("service-descriptor-controller"),
+			}).SetupWithManager(mgr); err != nil {
+				setupLog.Error(err, "unable to create controller", "controller", "ServiceDescriptor")
+				os.Exit(1)
+			}
 		}
 
-		if err = (&appscontrollers.BackupPolicyTemplateReconciler{
-			Client:   mgr.GetClient(),
-			Scheme:   mgr.GetScheme(),
-			Recorder: mgr.GetEventRecorderFor("backup-policy-template-controller"),
-		}).SetupWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create controller", "controller", "BackupPolicyTemplate")
-			os.Exit(1)
+		if !viper.GetBool(constant.DualOperatorsMode) {
+			if err = (&appscontrollers.BackupPolicyTemplateReconciler{
+				Client:   mgr.GetClient(),
+				Scheme:   mgr.GetScheme(),
+				Recorder: mgr.GetEventRecorderFor("backup-policy-template-controller"),
+			}).SetupWithManager(mgr); err != nil {
+				setupLog.Error(err, "unable to create controller", "controller", "BackupPolicyTemplate")
+				os.Exit(1)
+			}
 		}
 	}
 
@@ -536,9 +541,7 @@ func main() {
 		}
 	}
 
-	dualOperatorsMode := viper.GetBool(dualOperatorsModeFlag.viperName())
-
-	if !dualOperatorsMode && viper.GetBool(extensionsFlagKey.viperName()) {
+	if !viper.GetBool(constant.DualOperatorsMode) && viper.GetBool(extensionsFlagKey.viperName()) {
 		if err = (&extensionscontrollers.AddonReconciler{
 			Client:     mgr.GetClient(),
 			Scheme:     mgr.GetScheme(),
@@ -550,7 +553,7 @@ func main() {
 		}
 	}
 
-	if !dualOperatorsMode && viper.GetBool(experimentalFlagKey.viperName()) {
+	if !viper.GetBool(constant.DualOperatorsMode) && viper.GetBool(experimentalFlagKey.viperName()) {
 		if err = (&experimentalcontrollers.NodeCountScalerReconciler{
 			Client:   mgr.GetClient(),
 			Scheme:   mgr.GetScheme(),

controllers/apps/backuppolicytemplate_controller.go

@@ -126,7 +126,7 @@ func (r *BackupPolicyTemplateReconciler) compatibleBackupPolicyTemplate(ctx cont
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *BackupPolicyTemplateReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return intctrlutil.NewControllerManagedBy(mgr, &appsv1alpha1.BackupPolicyTemplate{}, &appsv1alpha1.ComponentDefinition{}).
+	return intctrlutil.NewControllerManagedBy(mgr).
 		For(&appsv1alpha1.BackupPolicyTemplate{}).
 		Watches(&appsv1alpha1.ComponentDefinition{}, handler.EnqueueRequestsFromMapFunc(r.compatibleBackupPolicyTemplate)).
 		Complete(r)

controllers/apps/opsrequest_controller.go

@@ -88,7 +88,7 @@ func (r *OpsRequestReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *OpsRequestReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return intctrlutil.NewControllerManagedBy(mgr, &appsv1alpha1.Cluster{}, &workloadsv1alpha1.InstanceSet{}).
+	return intctrlutil.NewControllerManagedBy(mgr).
 		For(&appsv1alpha1.OpsRequest{}).
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: int(math.Ceil(viper.GetFloat64(constant.CfgKBReconcileWorkers) / 2)),

controllers/apps/servicedescriptor_controller.go

@@ -107,7 +107,7 @@ func (r *ServiceDescriptorReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *ServiceDescriptorReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return intctrlutil.NewControllerManagedBy(mgr, &appsv1alpha1.ServiceDescriptor{}).
+	return intctrlutil.NewControllerManagedBy(mgr).
 		For(&appsv1alpha1.ServiceDescriptor{}).
 		Complete(r)
 }

controllers/apps/systemaccount_controller.go

@@ -299,7 +299,7 @@ func (r *SystemAccountReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *SystemAccountReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return intctrlutil.NewControllerManagedBy(mgr, &appsv1alpha1.Cluster{}).
+	return intctrlutil.NewControllerManagedBy(mgr).
 		For(&appsv1alpha1.Cluster{}).
 		Owns(&corev1.Secret{}).
 		Watches(&batchv1.Job{}, r.jobCompletionHandler()).

controllers/experimental/nodecountscaler_controller.go

@@ -70,7 +70,7 @@ func (r *NodeCountScalerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *NodeCountScalerReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return intctrlutil.NewControllerManagedBy(mgr, &appsv1alpha1.Cluster{}).
+	return intctrlutil.NewControllerManagedBy(mgr).
 		For(&experimental.NodeCountScaler{}).
 		Watches(&corev1.Node{}, &nodeScalingHandler{r.Client}).
 		Watches(&appsv1alpha1.Cluster{}, &clusterHandler{r.Client}).

pkg/constant/const.go

@@ -325,3 +325,9 @@ const (
 const InvalidContainerPort int32 = 0
 
 const EmptyInsTemplateName = ""
+
+// DualOperatorsMode indicates whether the operator runs in dual-operators mode.
+// If it's true, the operator will degrade to a secondary operator and only manage the resources dedicated to releases prior to v1.0.
+const (
+	DualOperatorsMode = "dual-operators-mode"
+)

pkg/controllerutil/predicate.go

@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package controllerutil
 
 import (
-	"fmt"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -92,19 +91,13 @@ var (
 	// unchanged：NodeCountScaler, Addon - the new operator will be responsible for these
 	// deleted：ClusterVersion, ComponentClassDefinition - nothing to do
 	// group changed：OpsRequest, OpsDefinition, ConfigConstraint, Configuration - nothing to do
-	// TODO:
-	//    EventReconciler.Event
-	//    configs & parameters
-	//    data protections
 
 	managedNamespaces       *sets.Set[string]
 	supportedCRDAPIVersions = sets.New[string](
-		// ClusterDefinition, ComponentDefinition, ComponentVersion, BackupPolicyTemplate
-		// ServiceDescriptor, Cluster, Component
+		// ClusterDefinition, ComponentDefinition, ComponentVersion, Cluster, Component
 		appsv1alpha1.GroupVersion.String(),
 		// InstanceSet
 		workloadsv1alpha1.GroupVersion.String(),
-		// TODO: corev1.Event
 	)
 )
 
@@ -134,29 +127,18 @@ func namespacePredicateFilter(object client.Object) bool {
 
 func newAPIVersionPredicateFilter(objs []client.Object) func(client.Object) bool {
 	return func(obj client.Object) bool {
+		if !viper.GetBool(constant.DualOperatorsMode) {
+			return true
+		}
+		_, clusterObj := obj.(*appsv1alpha1.Cluster)
 		annotations := obj.GetAnnotations()
 		if annotations == nil {
-			return true
+			return !clusterObj // for newly created clusters, let the new operator handle them first
 		}
 		apiVersion, ok := annotations[constant.CRDAPIVersionAnnotationKey]
 		if !ok {
-			return true
+			return !clusterObj // for newly created clusters, let the new operator handle them first
 		}
-		// as a fast path
-		if !supportedCRDAPIVersions.Has(apiVersion) {
-			return false
-		}
-		if len(objs) > 0 {
-			for _, o := range objs {
-				if o.GetObjectKind().GroupVersionKind().GroupKind() == obj.GetObjectKind().GroupVersionKind().GroupKind() {
-					return true
-				}
-			}
-			// has the api version set, but not in the object list?
-			// we cannot ignore the event silently, so panic here
-			panic(fmt.Sprintf("seen an event of an object with API version %s, "+
-				"but the object is not in the object list that controller expects, object: %v", apiVersion, obj))
-		}
-		return true
+		return supportedCRDAPIVersions.Has(apiVersion)
 	}
 }