Merge pull request #196 from fluxcd/fix-cross-ns-repo-image-reconcile

Watched cross-ns image repos trigger reconcile
fluxcd · Nov 11, 2021 · 45c0070 · 45c0070
2 parents 2d05314 + 006f204
commit 45c0070
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/controllers/imagepolicy_controller.go b/controllers/imagepolicy_controller.go
@@ -48,7 +48,7 @@ import (
 // this is used as the key for the index of policy->repository; the
 // string is arbitrary and acts as a reminder where the value comes
 // from.
-const imageRepoKey = ".spec.imageRepository.name"
+const imageRepoKey = ".spec.imageRepository"
 
 // ImagePolicyReconciler reconciles a ImagePolicy object
 type ImagePolicyReconciler struct {
@@ -237,7 +237,11 @@ func (r *ImagePolicyReconciler) SetupWithManager(mgr ctrl.Manager, opts ImagePol
 	// it's easy to list those out when an image repo changes.
 	if err := mgr.GetFieldIndexer().IndexField(context.Background(), &imagev1.ImagePolicy{}, imageRepoKey, func(obj client.Object) []string {
 		pol := obj.(*imagev1.ImagePolicy)
-		return []string{pol.Spec.ImageRepositoryRef.Name}
+		namespacedName := types.NamespacedName{
+			Name:      pol.Spec.ImageRepositoryRef.Name,
+			Namespace: pol.Spec.ImageRepositoryRef.Namespace,
+		}
+		return []string{namespacedName.String()}
 	}); err != nil {
 		return err
 	}
@@ -259,8 +263,7 @@ func (r *ImagePolicyReconciler) SetupWithManager(mgr ctrl.Manager, opts ImagePol
 func (r *ImagePolicyReconciler) imagePoliciesForRepository(obj client.Object) []reconcile.Request {
 	ctx := context.Background()
 	var policies imagev1.ImagePolicyList
-	if err := r.List(ctx, &policies, client.InNamespace(obj.GetNamespace()),
-		client.MatchingFields{imageRepoKey: obj.GetName()}); err != nil {
+	if err := r.List(ctx, &policies, client.MatchingFields{imageRepoKey: client.ObjectKeyFromObject(obj).String()}); err != nil {
 		return nil
 	}
 	reqs := make([]reconcile.Request, len(policies.Items))

diff --git a/controllers/policy_test.go b/controllers/policy_test.go
@@ -615,7 +615,8 @@ var _ = Describe("ImagePolicy controller", func() {
 				defer k8sClient.Delete(context.Background(), policyNamespace)
 
 				versions := []string{"1.0.0", "1.0.1"}
-				imgRepo := loadImages(registryServer, "acl-image-"+randStringRunes(5), versions)
+				imageName := "acl-image-" + randStringRunes(5)
+				imgRepo := loadImages(registryServer, imageName, versions)
 
 				repo := imagev1.ImageRepository{
 					Spec: imagev1.ImageRepositorySpec{
@@ -687,6 +688,19 @@ var _ = Describe("ImagePolicy controller", func() {
 				}, timeout, interval).Should(BeTrue())
 				Expect(pol.Status.LatestImage).To(Equal(imgRepo + ":1.0.1"))
 
+				// Updating the image should reconcile the cross-namespace policy
+				imgRepo = loadImages(registryServer, imageName, []string{"1.0.2"})
+				Eventually(func() bool {
+					err := r.Get(ctx, repoObjectName, &repo)
+					return err == nil && repo.Status.LastScanResult.TagCount == len(versions)+1
+				}, timeout, interval).Should(BeTrue())
+
+				Eventually(func() bool {
+					err := r.Get(ctx, polObjectName, &pol)
+					return err == nil && pol.Status.LatestImage != ""
+				}, timeout, interval).Should(BeTrue())
+				Expect(pol.Status.LatestImage).To(Equal(imgRepo + ":1.0.2"))
+
 				Expect(r.Delete(ctx, &pol)).To(Succeed())
 			})
 		})