create a pull request status check

Author: Skarlso

apis/delivery/v1alpha1/sync_types.go

@@ -59,9 +59,6 @@ type SyncStatus struct {
 	// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
-	// +optional
-	ValuesGitRepositoryRef *meta.NamespacedObjectReference `json:"valuesGitRepositoryRef,omitempty"`
-
 	// +optional
 	PullRequestID int `json:"pullRequestID,omitempty"`
 }

apis/delivery/v1alpha1/zz_generated.deepcopy.go

@@ -184,20 +184,6 @@ spec:
                 type: integer
               pullRequestID:
                 type: integer
-              valuesGitRepositoryRef:
-                description: NamespacedObjectReference contains enough information
-                  to locate the referenced Kubernetes resource object in any namespace.
-                properties:
-                  name:
-                    description: Name of the referent.
-                    type: string
-                  namespace:
-                    description: Namespace of the referent, when not specified it
-                      acts as LocalObjectReference.
-                    type: string
-                required:
-                - name
-                type: object
             type: object
         type: object
     served: true

config/crd/bases/delivery.ocm.software_syncs.yaml

@@ -13,17 +13,14 @@ import (
 	"github.com/fluxcd/pkg/apis/meta"
 	"github.com/fluxcd/pkg/runtime/conditions"
 	"github.com/fluxcd/pkg/runtime/patch"
-	sourcebeta2 "github.com/fluxcd/source-controller/api/v1beta2"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
@@ -232,17 +229,6 @@ func (r *SyncReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul
 		}
 
 		obj.Status.PullRequestID = id
-
-		// Create GitRepository to track values file changes.
-		repo, err := r.createValueFileGitRepository(ctx, *obj, *repository, targetBranch)
-		if err != nil {
-			err = fmt.Errorf("failed to create value tracking git repository object: %w", err)
-			conditions.MarkFalse(obj, meta.ReadyCondition, v1alpha1.GitRepositoryCreateFailedReason, err.Error())
-
-			return ctrl.Result{}, err
-		}
-
-		obj.Status.ValuesGitRepositoryRef = &repo
 	}
 
 	// Remove any stale Ready condition, most likely False, set above. Its value
@@ -281,50 +267,3 @@ func (r *SyncReconciler) parseAuthSecret(secret *corev1.Secret, opts *pkg.PushOp
 		},
 	}
 }
-
-// createValueFileGitRepository creates a GitRepository that tracks changes on a branch.
-func (r *SyncReconciler) createValueFileGitRepository(ctx context.Context, sync v1alpha1.Sync, repository mpasv1alpha1.Repository, branch string) (meta.NamespacedObjectReference, error) {
-	owners := sync.GetOwnerReferences()
-	if len(owners) != 1 {
-		return meta.NamespacedObjectReference{}, fmt.Errorf("expected exactly one owner, got: %d", len(owners))
-	}
-
-	repo := &sourcebeta2.GitRepository{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      repository.Name + "values-repo",
-			Namespace: repository.Namespace,
-		},
-		Spec: sourcebeta2.GitRepositorySpec{
-			URL: repository.GetRepositoryURL(),
-			SecretRef: &meta.LocalObjectReference{
-				Name: repository.Spec.Credentials.SecretRef.Name,
-			},
-			Interval: metav1.Duration{Duration: 5 * time.Second},
-			Reference: &sourcebeta2.GitRepositoryRef{
-				Branch: branch,
-			},
-			Ignore: pointer.String(fmt.Sprintf(`# exclude all
-/*
-# include values.yaml
-!./products/%s/values.yaml
-`, owners[0].Name)),
-		},
-	}
-
-	if _, err := controllerutil.CreateOrUpdate(ctx, r.Client, repo, func() error {
-		if repo.ObjectMeta.CreationTimestamp.IsZero() {
-			if err := controllerutil.SetOwnerReference(&repository, repo, r.Scheme); err != nil {
-				return fmt.Errorf("failed to set owner to git repository object: %w", err)
-			}
-		}
-
-		return nil
-	}); err != nil {
-		return meta.NamespacedObjectReference{}, fmt.Errorf("failed to create git repository: %w", err)
-	}
-
-	return meta.NamespacedObjectReference{
-		Name:      repo.Name,
-		Namespace: repo.Namespace,
-	}, nil
-}

controllers/delivery/sync_controller.go

@@ -19,7 +19,6 @@ require (
 	k8s.io/api v0.26.2
 	k8s.io/apimachinery v0.26.2
 	k8s.io/client-go v0.26.2
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
 	sigs.k8s.io/controller-runtime v0.14.4
 )
 
@@ -175,6 +174,7 @@ require (
 	k8s.io/component-base v0.26.2 // indirect
 	k8s.io/klog/v2 v2.90.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20230228151317-19cbebb19cb7 // indirect
+	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect

go.mod

@@ -154,9 +154,51 @@ func (c *Client) CreatePullRequest(ctx context.Context, branch string, sync deli
 		return -1, fmt.Errorf("failed to create github client: %w", err)
 	}
 
+	var (
+		id                    int
+		createPullRequestFunc = gogit.CreateUserPullRequest
+	)
+
 	if repository.Spec.IsOrganization {
-		return gogit.CreateOrganizationPullRequest(ctx, gc, domain, branch, sync.Spec.PullRequestTemplate, repository)
+		createPullRequestFunc = gogit.CreateOrganizationPullRequest
+	}
+
+	if id, err = createPullRequestFunc(ctx, gc, domain, branch, sync.Spec.PullRequestTemplate, repository); err != nil {
+		return 0, fmt.Errorf("failed to create pull request: %w", err)
+	}
+
+	if err := c.createCheckRun(ctx, repository, id); err != nil {
+		return 0, fmt.Errorf("failed to create check run: %w", err)
+	}
+
+	return id, nil
+}
+
+func (c *Client) createCheckRun(ctx context.Context, repository mpasv1alpha1.Repository, prID int) error {
+	token, err := c.retrieveAccessToken(ctx, repository)
+	if err != nil {
+		return fmt.Errorf("failed to retrieve token: %w", err)
 	}
 
-	return gogit.CreateUserPullRequest(ctx, gc, domain, branch, sync.Spec.PullRequestTemplate, repository)
+	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, prID)
+	if err != nil {
+		return fmt.Errorf("failed to find PR: %w", err)
+	}
+
+	_, _, err = g.Repositories.CreateStatus(ctx, repository.Spec.Owner, repository.Name, *pr.Head.SHA, &ggithub.RepoStatus{
+		State:       ggithub.String("error"),
+		Description: ggithub.String("MPAS Validation Check"),
+		Context:     ggithub.String(statusCheckName),
+	})
+
+	if err != nil {
+		return fmt.Errorf("failed to create status for pr: %w", err)
+	}
+
+	return nil
 }