feat(controller): Index ResourceTemplate.spec.webhookRef

Author: tommy351

internal/controller/webhook/reconciler_beta.go

@@ -26,7 +26,7 @@ import (
 // +kubebuilder:rbac:groups=pullup.dev,resources=httpwebhooks,verbs=get;list;watch
 // +kubebuilder:rbac:groups=pullup.dev,resources=githubwebhooks,verbs=get;list;watch
 
-const ownerRefUIDField = "metadata.ownerReferences.uid"
+const webhookRefField = "spec.webhookRef"
 
 var ErrObjectNotWebhook = errors.New("object is not a webhook")
 
@@ -54,11 +54,11 @@ type BetaReconcilerFactory struct {
 }
 
 func NewBetaReconcilerFactory(conf BetaReconcilerConfig, mgr manager.Manager) (*BetaReconcilerFactory, error) {
-	err := mgr.GetFieldIndexer().IndexField(context.Background(), &v1beta1.ResourceTemplate{}, ownerRefUIDField, func(obj runtime.Object) []string {
+	err := mgr.GetFieldIndexer().IndexField(context.Background(), &v1beta1.ResourceTemplate{}, webhookRefField, func(obj runtime.Object) []string {
 		var result []string
 
-		for _, ref := range obj.(*v1beta1.ResourceTemplate).OwnerReferences {
-			result = append(result, string(ref.UID))
+		if ref := obj.(*v1beta1.ResourceTemplate).Spec.WebhookRef; ref != nil {
+			result = append(result, objectRefString(ref))
 		}
 
 		return result
@@ -113,9 +113,15 @@ func (r *BetaReconciler) Reconcile(req reconcile.Request) (reconcile.Result, err
 		return reconcile.Result{}, ErrObjectNotWebhook
 	}
 
+	apiVersion, kind := webhook.GetObjectKind().GroupVersionKind().ToAPIVersionAndKind()
+
 	list := new(v1beta1.ResourceTemplateList)
 	err := r.Client.List(ctx, list, client.InNamespace(webhook.GetNamespace()), client.MatchingFields(map[string]string{
-		ownerRefUIDField: string(webhook.GetUID()),
+		webhookRefField: objectRefString(&v1beta1.ObjectReference{
+			APIVersion: apiVersion,
+			Kind:       kind,
+			Name:       webhook.GetName(),
+		}),
 	}))
 	if err != nil {
 		return reconcile.Result{Requeue: true}, fmt.Errorf("failed to list resource templates: %w", err)
@@ -179,3 +185,7 @@ func (r *BetaReconciler) patchResource(ctx context.Context, webhook hookutil.Web
 		Reason:  ReasonPatched,
 	}
 }
+
+func objectRefString(ref *v1beta1.ObjectReference) string {
+	return fmt.Sprintf("apiVersion=%s, kind=%s, name=%s", ref.APIVersion, ref.Kind, ref.Name)
+}

internal/controller/webhook/testdata/http-webhook-success.yml

@@ -15,12 +15,6 @@ kind: ResourceTemplate
 metadata:
   name: bar-46
   namespace: foo
-  ownerReferences:
-    - apiVersion: pullup.dev/v1beta1
-      kind: HTTPWebhook
-      name: bar
-      controller: true
-      blockOwnerDeletion: true
 spec:
   webhookRef:
     apiVersion: pullup.dev/v1beta1
@@ -35,12 +29,6 @@ kind: ResourceTemplate
 metadata:
   name: bar-64
   namespace: foo
-  ownerReferences:
-    - apiVersion: pullup.dev/v1beta1
-      kind: HTTPWebhook
-      name: bar
-      controller: true
-      blockOwnerDeletion: true
 spec:
   webhookRef:
     apiVersion: pullup.dev/v1beta1

internal/controller/webhook/testdata/reconciler_beta.golden

@@ -7,13 +7,6 @@
     creationTimestamp: null
     name: bar-46
     namespace: foo
-    ownerReferences:
-    - apiVersion: pullup.dev/v1beta1
-      blockOwnerDeletion: true
-      controller: true
-      kind: HTTPWebhook
-      name: bar
-      uid: ""
     selfLink: /apis/pullup.dev/v1beta1/namespaces/foo/resourcetemplates/bar-46
   spec:
     data:
@@ -33,13 +26,6 @@
     creationTimestamp: null
     name: bar-64
     namespace: foo
-    ownerReferences:
-    - apiVersion: pullup.dev/v1beta1
-      blockOwnerDeletion: true
-      controller: true
-      kind: HTTPWebhook
-      name: bar
-      uid: ""
     selfLink: /apis/pullup.dev/v1beta1/namespaces/foo/resourcetemplates/bar-64
   spec:
     data: