Watched cross-ns image repos trigger reconcile #196
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
relu
force-pushed
the
fix-cross-ns-repo-image-reconcile
branch
from
f0e5fd3
to
1460730
Compare
Cross-namespace ImageRepository resources should trigger reconciles for ImagePolicies that refer to them. Previously, this was only done for resources in the same namespace. Fixes #195 Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
relu
force-pushed
the
fix-cross-ns-repo-image-reconcile
branch
from
1460730
to
0dd4f70
Compare
squaremo
reviewed
Nov 11, 2021
| @@ -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 | |||
| @@ -259,8 +259,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: obj.GetName()}); err != nil { | |||
There was a problem hiding this comment.
This can result in collisions unless it includes the namespace (and the indexing should follow suit).
There was a problem hiding this comment.
Yes, @stefanprodan pointed this out and I'm working on it.
The imageRepoKey only contains the name of the ImageRepository resource. This change uses the namespaced name to avoid collisions. Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cross-namespace ImageRepository resources should trigger reconciles for
ImagePolicies that refer to them. Previously, this was only done for
resources in the same namespace.
Fixes #195