Rename ImageRepository -> ImageRepositoryRef

.. to follow gitops-toolkit convention.

api/v1alpha1/imagepolicy_types.go

@@ -24,10 +24,10 @@ import (
 // ImagePolicySpec defines the parameters for calculating the
 // ImagePolicy
 type ImagePolicySpec struct {
-	// ImageRepository points at the object specifying the image being
-	// scanned
+	// ImageRepositoryRef points at the object specifying the image
+	// being scanned
 	// +required
-	ImageRepository corev1.LocalObjectReference `json:"imageRepository"`
+	ImageRepositoryRef corev1.LocalObjectReference `json:"imageRepositoryRef"`
 	// Policy gives the particulars of the policy to be followed in
 	// selecting the most recent image
 	// +required

api/v1alpha1/zz_generated.deepcopy.go

@@ -107,7 +107,7 @@ func (in *ImagePolicyList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ImagePolicySpec) DeepCopyInto(out *ImagePolicySpec) {
 	*out = *in
-	out.ImageRepository = in.ImageRepository
+	out.ImageRepositoryRef = in.ImageRepositoryRef
 	in.Policy.DeepCopyInto(&out.Policy)
 }
 

config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml

@@ -41,9 +41,9 @@ spec:
           description: ImagePolicySpec defines the parameters for calculating the
             ImagePolicy
           properties:
-            imageRepository:
-              description: ImageRepository points at the object specifying the image
-                being scanned
+            imageRepositoryRef:
+              description: ImageRepositoryRef points at the object specifying the
+                image being scanned
               properties:
                 name:
                   description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
@@ -68,7 +68,7 @@ spec:
                   type: object
               type: object
           required:
-          - imageRepository
+          - imageRepositoryRef
           - policy
           type: object
         status:

controllers/imagepolicy_controller.go

@@ -65,7 +65,7 @@ func (r *ImagePolicyReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error)
 	var repo imagev1alpha1.ImageRepository
 	if err := r.Get(ctx, types.NamespacedName{
 		Namespace: pol.Namespace,
-		Name:      pol.Spec.ImageRepository.Name,
+		Name:      pol.Spec.ImageRepositoryRef.Name,
 	}, &repo); err != nil {
 		if client.IgnoreNotFound(err) == nil {
 			log.Error(err, "referenced ImageRepository does not exist")
@@ -105,7 +105,7 @@ func (r *ImagePolicyReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	// it's easy to list those out when an image repo changes.
 	if err := mgr.GetFieldIndexer().IndexField(&imagev1alpha1.ImagePolicy{}, imageRepoKey, func(obj runtime.Object) []string {
 		pol := obj.(*imagev1alpha1.ImagePolicy)
-		return []string{pol.Spec.ImageRepository.Name}
+		return []string{pol.Spec.ImageRepositoryRef.Name}
 	}); err != nil {
 		return err
 	}

controllers/policy_test.go

@@ -69,7 +69,7 @@ var _ = Describe("ImagePolicy controller", func() {
 		}
 		pol := imagev1alpha1.ImagePolicy{
 			Spec: imagev1alpha1.ImagePolicySpec{
-				ImageRepository: corev1.LocalObjectReference{
+				ImageRepositoryRef: corev1.LocalObjectReference{
 					Name: imageObjectName.Name,
 				},
 				Policy: imagev1alpha1.ImagePolicyChoice{