Refactor code

Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>

Author: TrafalgarZZZ

api/v1alpha1/zz_generated.deepcopy.go

@@ -129,7 +129,7 @@ func (r *ThinRuntimeReconciler) Reconcile(context context.Context, req ctrl.Requ
 // SetupWithManager sets up the controller with the Manager.
 func (r *ThinRuntimeReconciler) SetupWithManager(mgr ctrl.Manager, options controller.Options, eventDriven bool) error {
 	if eventDriven {
-		return watch.SetupWatcherWithReconciler(mgr, options, r, "thin")
+		return watch.SetupWatcherWithReconciler(mgr, options, r, common.ThinRuntime)
 	} else {
 		return ctrl.NewControllerManagedBy(mgr).
 			WithOptions(options).

pkg/controllers/v1alpha1/thinruntime/thinruntime_controller.go

@@ -24,22 +24,22 @@ import (
 type datasetEventHandler struct {
 }
 
-func (handler *datasetEventHandler) onUpdateFunc(r Controller, datasetType string) func(e event.UpdateEvent) bool {
+func (handler *datasetEventHandler) onUpdateFunc(runtimeType string) func(e event.UpdateEvent) bool {
 	return func(e event.UpdateEvent) (needUpdate bool) {
 		log.V(1).Info("enter datasetEventHandler.onUpdateFunc", "newObj.name", e.ObjectNew.GetName(), "newObj.namespace", e.ObjectNew.GetNamespace())
 		datasetNew, ok := e.ObjectNew.(*datav1alpha1.Dataset)
 		if !ok {
-			log.Info("dataset.onUpdateFunc Skip", "object", e.ObjectNew)
+			log.Info("dataset.onUpdateFunc Skip because ObjectNew is not of type Dataset", "object", e.ObjectNew)
 			return needUpdate
 		}
-		if len(datasetNew.Status.Runtimes) > 0 && datasetNew.Status.Runtimes[0].Type != datasetType {
-			log.V(1).Info("dataset.onUpdateFunc Skip due to runtime type not match", "wantType", datasetType, "datasetType", datasetNew.Status.Runtimes[0].Type)
+		if len(datasetNew.Status.Runtimes) > 0 && datasetNew.Status.Runtimes[0].Type != runtimeType {
+			log.V(1).Info("dataset.onUpdateFunc Skip due to runtime type not match", "wantType", runtimeType, "datasetType", datasetNew.Status.Runtimes[0].Type)
 			return needUpdate
 		}
 
 		datasetOld, ok := e.ObjectOld.(*datav1alpha1.Dataset)
 		if !ok {
-			log.Info("dataset.onUpdateFunc Skip", "object", e.ObjectNew)
+			log.Info("dataset.onUpdateFunc Skip because ObjectOld is not of type Dataset", "object", e.ObjectNew)
 			return needUpdate
 		}
 

pkg/ctrl/watch/dataset.go

@@ -54,7 +54,7 @@ type Controller interface {
 	ManagedResource() client.Object
 }
 
-func SetupWatcherWithReconciler(mgr ctrl.Manager, options controller.Options, r Controller, watchDatasetType string) (err error) {
+func SetupWatcherWithReconciler(mgr ctrl.Manager, options controller.Options, r Controller, boundRuntimeType string) (err error) {
 	options.Reconciler = r
 	c, err := controller.New(r.ControllerName(), mgr, options)
 	if err != nil {
@@ -98,15 +98,16 @@ func SetupWatcherWithReconciler(mgr ctrl.Manager, options controller.Options, r
 		return err
 	}
 
-	if watchDatasetType != "" {
+	// Watch update events on Datasets that have correlated runtime types.
+	if len(boundRuntimeType) > 0 {
 		datasetEventHandler := &datasetEventHandler{}
 		err = c.Watch(&(source.Kind{Type: &datav1alpha1.Dataset{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       datav1alpha1.Datasetkind,
 				APIVersion: datav1alpha1.GroupVersion.Group + "/" + datav1alpha1.GroupVersion.Version,
 			},
 		}}), &handler.EnqueueRequestForObject{}, predicate.Funcs{
-			UpdateFunc: datasetEventHandler.onUpdateFunc(r, watchDatasetType),
+			UpdateFunc: datasetEventHandler.onUpdateFunc(boundRuntimeType),
 		})
 		if err != nil {
 			log.Error(err, "Failed to watch Dataset")