Skip to content

bundle controller shard filtering based on cluster changes #4567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
johnjcool wants to merge 2 commits into from
Closed

bundle controller shard filtering based on cluster changes #4567

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4aa90c
fix(controller): filter bundle reconcile requests by shard on cluster…
johnjcool Jan 26, 2026
738ff8d
resolve copilot code review
johnjcool Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions internal/cmd/controller/reconciler/bundle_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,18 @@ func (r *BundleReconciler) SetupWithManager(mgr ctrl.Manager) error {
predicate.AnnotationChangedPredicate{},
predicate.LabelChangedPredicate{},
),
sharding.FilterByShardID(r.ShardID),
),
).
// Note: Maybe improve with WatchesMetadata, does it have access to labels?
Watches(
// Fan out from bundledeployment to bundle, this is useful to update the
// bundle's status fields.
&fleet.BundleDeployment{}, handler.EnqueueRequestsFromMapFunc(BundleDeploymentMapFunc(r)),
builder.WithPredicates(bundleDeploymentStatusChangedPredicate()),
builder.WithPredicates(
bundleDeploymentStatusChangedPredicate(),
sharding.FilterByShardID(r.ShardID),
Comment thread
johnjcool marked this conversation as resolved.
Outdated
),
).
Watches(
// Fan out from cluster to bundle, this is useful for targeting and templating.
Expand Down Expand Up @@ -132,16 +136,21 @@ func (r *BundleReconciler) SetupWithManager(mgr ctrl.Manager) error {
// referenced in DownstreamResources changes.
&corev1.Secret{},
handler.EnqueueRequestsFromMapFunc(r.downstreamResourceMapFunc("Secret")),
builder.WithPredicates(dataChangedPredicate()),
builder.WithPredicates(
dataChangedPredicate(),
sharding.FilterByShardID(r.ShardID),
),
).
Watches(
// Fan out from configmap to bundle, reconcile bundles when a configmap
// referenced in DownstreamResources changes.
&corev1.ConfigMap{},
handler.EnqueueRequestsFromMapFunc(r.downstreamResourceMapFunc("ConfigMap")),
builder.WithPredicates(dataChangedPredicate()),
builder.WithPredicates(
dataChangedPredicate(),
sharding.FilterByShardID(r.ShardID),
),
).
WithEventFilter(sharding.FilterByShardID(r.ShardID)).
WithOptions(controller.Options{MaxConcurrentReconciles: r.Workers}).
Complete(r)
}
Expand Down