feat: add polling the pull request for the validation

controllers/productdeploymentgenerator_controller.go

@@ -383,7 +383,7 @@ func (r *ProductDeploymentGeneratorReconciler) reconcile(ctx context.Context, ob
 		Spec: v1alpha1.ValidationSpec{
 			ValidationRules:    validationRules,
 			ServiceAccountName: obj.Spec.ServiceAccountName,
-			Interval:           metav1.Duration{Duration: 10 * time.Second},
+			Interval:           metav1.Duration{Duration: 30 * time.Second},
 			SyncRef: meta.NamespacedObjectReference{
 				Name:      sync.Name,
 				Namespace: sync.Namespace,

controllers/validation_controller.go

@@ -156,6 +156,24 @@ func (r *ValidationReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, err
 	}
 
+	if conditions.IsTrue(obj, meta.ReadyCondition) {
+		merged, err := r.Validator.IsMerged(ctx, *repository, *sync)
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to fetch pull request status: %w", err)
+		}
+
+		if merged {
+			if err := r.deleteGitRepository(ctx, obj.Status.GitRepositoryRef); err != nil {
+				conditions.MarkFalse(obj, meta.ReadyCondition, mpasv1alpha1.GitRepositoryCleanUpFailedReason, err.Error())
+
+				return ctrl.Result{}, fmt.Errorf("failed to delete GitRepository tracking the values file: %w", err)
+			}
+
+			// Stop reconciling this validation any further.
+			return ctrl.Result{}, nil
+		}
+	}
+
 	if obj.Status.GitRepositoryRef == nil {
 		logger.Info("creating git repository to track value changes")
 		// create gitrepository to track values file and immediately requeue
@@ -232,12 +250,6 @@ func (r *ValidationReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		}
 	}
 
-	if err := r.deleteGitRepository(ctx, obj.Status.GitRepositoryRef); err != nil {
-		conditions.MarkFalse(obj, meta.ReadyCondition, mpasv1alpha1.GitRepositoryCleanUpFailedReason, err.Error())
-
-		return ctrl.Result{}, fmt.Errorf("failed to delete GitRepository tracking the values file: %w", err)
-	}
-
 	if err := r.Validator.PassValidation(ctx, *repository, *sync); err != nil {
 		conditions.MarkFalse(obj, meta.ReadyCondition, mpasv1alpha1.ValidationFailedReason, err.Error())
 
@@ -247,7 +259,7 @@ func (r *ValidationReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	conditions.MarkTrue(obj, meta.ReadyCondition, meta.SucceededReason, "Reconciliation success")
 	obj.Status.LastValidatedDigestOutcome = mpasv1alpha1.SuccessValidationOutcome
 
-	return ctrl.Result{}, nil
+	return ctrl.Result{RequeueAfter: obj.GetRequeueAfter()}, nil
 }
 
 // createValueFileGitRepository creates a GitRepository that tracks changes on a branch.

pkg/validators/gitea/validator.go

@@ -65,6 +65,32 @@ func (v *Validator) PassValidation(ctx context.Context, repository gitv1alpha1.R
 	return v.createCheckRunStatus(ctx, repository, sync.Status.PullRequestID, gitea.StatusSuccess)
 }
 
+func (v *Validator) IsMerged(ctx context.Context, repository gitv1alpha1.Repository, sync deliveryv1alpha1.Sync) (bool, error) {
+	pullRequestID := sync.Status.PullRequestID
+
+	token, err := v.retrieveAccessToken(ctx, repository)
+	if err != nil {
+		return false, fmt.Errorf("failed to retrieve token: %w", err)
+	}
+
+	domain := defaultDomain
+	if repository.Spec.Domain != "" {
+		domain = repository.Spec.Domain
+	}
+
+	client, err := gitea.NewClient(domain, gitea.SetToken(string(token)))
+	if err != nil {
+		return false, fmt.Errorf("failed to create gitea client: %w", err)
+	}
+
+	pr, _, err := client.GetPullRequest(repository.Spec.Owner, repository.Name, int64(pullRequestID))
+	if err != nil {
+		return false, fmt.Errorf("failed to find PR: %w", err)
+	}
+
+	return pr.HasMerged, nil
+}
+
 func (v *Validator) createCheckRunStatus(ctx context.Context, repository gitv1alpha1.Repository, pullRequestID int, status gitea.StatusState) error {
 	logger := log.FromContext(ctx)
 

pkg/validators/github/validator.go

@@ -8,6 +8,7 @@ import (
 	"golang.org/x/oauth2"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -64,6 +65,25 @@ func (v *Validator) PassValidation(ctx context.Context, repository gitv1alpha1.R
 	return v.createCheckRunStatus(ctx, repository, sync.Status.PullRequestID, "success")
 }
 
+func (v *Validator) IsMerged(ctx context.Context, repository gitv1alpha1.Repository, sync deliveryv1alpha1.Sync) (bool, error) {
+	token, err := v.retrieveAccessToken(ctx, repository)
+	if err != nil {
+		return false, fmt.Errorf("failed to retrieve token: %w", err)
+	}
+
+	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: string(token)})
+	tc := oauth2.NewClient(context.Background(), ts)
+
+	g := ggithub.NewClient(tc)
+
+	pr, _, err := g.PullRequests.Get(ctx, repository.Spec.Owner, repository.Name, sync.Status.PullRequestID)
+	if err != nil {
+		return false, fmt.Errorf("failed to find PR: %w", err)
+	}
+
+	return pointer.BoolDeref(pr.Merged, false), nil
+}
+
 func (v *Validator) createCheckRunStatus(ctx context.Context, repository gitv1alpha1.Repository, pullRequestID int, status string) error {
 	logger := log.FromContext(ctx)
 

pkg/validators/validator.go

@@ -11,4 +11,5 @@ import (
 type Validator interface {
 	FailValidation(ctx context.Context, repository gitv1alpha1.Repository, sync deliveryv1alpha1.Sync) error
 	PassValidation(ctx context.Context, repository gitv1alpha1.Repository, sync deliveryv1alpha1.Sync) error
+	IsMerged(ctx context.Context, repository gitv1alpha1.Repository, sync deliveryv1alpha1.Sync) (bool, error)
 }