Merge pull request #240 from hyperspike/repos

bug: clean up repoes reconciliation

Author: dmolik

internal/controller/repo_controller.go

@@ -18,6 +18,7 @@ package controller
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	g "code.gitea.io/sdk/gitea"
@@ -70,29 +71,29 @@ func (r *RepoReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		return ctrl.Result{}, err
 	}
 	if h == nil && gitea == nil {
-		return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, nil
+		return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, fmt.Errorf("failed to get gitea client")
 	}
 	r.h = h
 
 	isRepoMarkedToBeDeleted := repo.GetDeletionTimestamp() != nil
 	if isRepoMarkedToBeDeleted {
 		if controllerutil.ContainsFinalizer(repo, repoFinalizer) {
 			if err := r.deleteRepo(repo); err != nil {
-				return ctrl.Result{}, err
+				return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, err
 			}
 			controllerutil.RemoveFinalizer(repo, repoFinalizer)
 			if err := r.Update(ctx, repo); err != nil {
-				return ctrl.Result{}, err
+				return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, err
 			}
 		}
 		return ctrl.Result{}, nil
 	}
 
 	if repo.Spec.User == nil && repo.Spec.Org == nil {
-		return ctrl.Result{}, nil
+		return ctrl.Result{}, fmt.Errorf("repo must be created for either user or org")
 	}
 	if repo.Spec.User != nil && repo.Spec.Org != nil {
-		return ctrl.Result{}, nil
+		return ctrl.Result{}, fmt.Errorf("repo cannot be created for both user and org")
 	}
 	want := &g.Repository{
 		Description: repo.Spec.Description,
@@ -101,13 +102,13 @@ func (r *RepoReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	if repo.Spec.Org != nil {
 		gRepo, resp, err := r.h.GetRepo(repo.Spec.Org.Name, repo.Name)
 		if err != nil && resp.StatusCode != 404 {
-			return ctrl.Result{}, err
+			return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, err
 		}
 		if resp.StatusCode == 200 {
 			if !compareRepo(want, gRepo) {
 				logger.Info("updating repo")
 				if _, _, err := r.h.EditRepo(repo.Spec.Org.Name, repo.Name, g.EditRepoOption{}); err != nil {
-					return ctrl.Result{}, err
+					return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, err
 				}
 			}
 		}
@@ -125,13 +126,13 @@ func (r *RepoReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 			IssueLabels:   repo.Spec.IssueLabels,
 		})
 		if err != nil {
-			return ctrl.Result{}, nil
+			return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, err
 		}
 		if !repo.Status.Provisioned {
 			repo.Status.Provisioned = true
 			if err := r.Client.Status().Update(ctx, repo); err != nil {
 				logger.Error(err, "Failed to update Repo status")
-				return ctrl.Result{}, nil
+				return ctrl.Result{Requeue: true, RequeueAfter: time.Second * 5}, err
 			}
 		}
 		if !controllerutil.ContainsFinalizer(repo, repoFinalizer) {
@@ -144,14 +145,14 @@ func (r *RepoReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	if repo.Spec.User != nil {
 		_, _, err := r.h.CreateRepo(g.CreateRepoOption{})
 		if err != nil {
-			return ctrl.Result{}, nil
+			return ctrl.Result{}, err
 		}
 	}
 	if !repo.Status.Provisioned {
 		repo.Status.Provisioned = true
 		if err := r.Client.Status().Update(ctx, repo); err != nil {
 			logger.Error(err, "Failed to update Repo status")
-			return ctrl.Result{}, nil
+			return ctrl.Result{}, err
 		}
 	}