chore: Update returned results on errors

controllers/grafanafolder_controller.go

@@ -66,23 +66,19 @@ func (r *GrafanaFolderReconciler) syncFolders(ctx context.Context) (ctrl.Result,
 	var opts []client.ListOption
 	err := r.Client.List(ctx, grafanas, opts...)
 	if err != nil {
-		return ctrl.Result{
-			Requeue: true,
-		}, err
+		return ctrl.Result{}, err
 	}
 
 	// no instances, no need to sync
 	if len(grafanas.Items) == 0 {
-		return ctrl.Result{Requeue: false}, nil
+		return ctrl.Result{}, nil
 	}
 
 	// get all folders
 	allFolders := &grafanav1beta1.GrafanaFolderList{}
 	err = r.Client.List(ctx, allFolders, opts...)
 	if err != nil {
-		return ctrl.Result{
-			Requeue: true,
-		}, err
+		return ctrl.Result{}, err
 	}
 
 	// sync folders, delete folders from grafana that do no longer have a cr
@@ -100,15 +96,15 @@ func (r *GrafanaFolderReconciler) syncFolders(ctx context.Context) (ctrl.Result,
 	for grafana, existingFolders := range foldersToDelete {
 		grafanaClient, err := client2.NewGeneratedGrafanaClient(ctx, r.Client, grafana)
 		if err != nil {
-			return ctrl.Result{Requeue: true}, err
+			return ctrl.Result{}, err
 		}
 
 		for _, folder := range existingFolders {
 			// avoid bombarding the grafana instance with a large number of requests at once, limit
 			// the sync to a certain number of folders per cycle. This means that it will take longer to sync
 			// a large number of deleted dashboard crs, but that should be an edge case.
 			if foldersSynced >= syncBatchSize {
-				return ctrl.Result{Requeue: true}, nil
+				return ctrl.Result{}, nil
 			}
 
 			namespace, name, uid := folder.Split()
@@ -121,7 +117,7 @@ func (r *GrafanaFolderReconciler) syncFolders(ctx context.Context) (ctrl.Result,
 				if errors.As(err, &notFound) {
 					r.Log.Info("folder no longer exists", "namespace", namespace, "name", name)
 				} else {
-					return ctrl.Result{Requeue: false}, err
+					return ctrl.Result{}, err
 				}
 			}
 
@@ -171,7 +167,7 @@ func (r *GrafanaFolderReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	}, folder)
 	if err != nil {
 		if kuberr.IsNotFound(err) {
-			return ctrl.Result{Requeue: false}, nil
+			return ctrl.Result{}, nil
 		}
 		return ctrl.Result{}, fmt.Errorf("error getting grafana folder cr: %w", err)
 	}