Skip to content

CLOUDP-345376: enable concurrent reconciliation #2717

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

Merged
merged 1 commit into from
Oct 16, 2025
Merged

CLOUDP-345376: enable concurrent reconciliation #2717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions internal/controller/atlasbackupcompliancepolicy/atlasbackupcompliancepolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ type AtlasBackupCompliancePolicyReconciler struct {
Log *zap.SugaredLogger
ObjectDeletionProtection bool
SubObjectDeletionProtection bool
maxConcurrentReconciles int
}

// +kubebuilder:rbac:groups=atlas.mongodb.com,resources=atlasbackupcompliancepolicies,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -125,18 +126,13 @@ func (r *AtlasBackupCompliancePolicyReconciler) SetupWithManager(mgr ctrl.Manage
builder.WithPredicates(predicate.GenerationChangedPredicate{}),
).
WithOptions(controller.TypedOptions[reconcile.Request]{
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation)}).
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
MaxConcurrentReconciles: r.maxConcurrentReconciles}).
Complete(r)
}

func NewAtlasBackupCompliancePolicyReconciler(
c cluster.Cluster,
predicates []predicate.Predicate,
atlasProvider atlas.Provider,
deletionProtection bool,
logger *zap.Logger,
) *AtlasBackupCompliancePolicyReconciler {
func NewAtlasBackupCompliancePolicyReconciler(c cluster.Cluster, predicates []predicate.Predicate, atlasProvider atlas.Provider, deletionProtection bool, logger *zap.Logger, maxConcurrentReconciles int) *AtlasBackupCompliancePolicyReconciler {
return &AtlasBackupCompliancePolicyReconciler{
Scheme: c.GetScheme(),
Client: c.GetClient(),
Expand All @@ -145,6 +141,7 @@ func NewAtlasBackupCompliancePolicyReconciler(
Log: logger.Named("controllers").Named("AtlasBackupCompliancePolicy").Sugar(),
AtlasProvider: atlasProvider,
ObjectDeletionProtection: deletionProtection,
maxConcurrentReconciles: maxConcurrentReconciles,
}
}

Expand Down
17 changes: 6 additions & 11 deletions internal/controller/atlascustomrole/atlascustomrole_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,10 @@ type AtlasCustomRoleReconciler struct {
ObjectDeletionProtection bool
SubObjectDeletionProtection bool
independentSyncPeriod time.Duration
maxConcurrentReconciles int
}

func NewAtlasCustomRoleReconciler(
c cluster.Cluster,
predicates []predicate.Predicate,
atlasProvider atlas.Provider,
deletionProtection bool,
independentSyncPeriod time.Duration,
logger *zap.Logger,
globalSecretRef client.ObjectKey,
) *AtlasCustomRoleReconciler {
func NewAtlasCustomRoleReconciler(c cluster.Cluster, predicates []predicate.Predicate, atlasProvider atlas.Provider, deletionProtection bool, independentSyncPeriod time.Duration, logger *zap.Logger, globalSecretRef client.ObjectKey, maxConcurrentReconciles int) *AtlasCustomRoleReconciler {
return &AtlasCustomRoleReconciler{
AtlasReconciler: reconciler.AtlasReconciler{
Client: c.GetClient(),
Expand All @@ -78,6 +71,7 @@ func NewAtlasCustomRoleReconciler(
GlobalPredicates: predicates,
ObjectDeletionProtection: deletionProtection,
independentSyncPeriod: independentSyncPeriod,
maxConcurrentReconciles: maxConcurrentReconciles,
}
}

Expand Down Expand Up @@ -218,8 +212,9 @@ func (r *AtlasCustomRoleReconciler) SetupWithManager(mgr ctrl.Manager, skipNameV
handler.EnqueueRequestsFromMapFunc(r.customRolesCredentials()),
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
WithOptions(controller.TypedOptions[reconcile.Request]{
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation)}).
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
MaxConcurrentReconciles: r.maxConcurrentReconciles}).
Complete(r)
}

Expand Down
18 changes: 6 additions & 12 deletions internal/controller/atlasdatabaseuser/atlasdatabaseuser_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ type AtlasDatabaseUserReconciler struct {
ObjectDeletionProtection bool
SubObjectDeletionProtection bool
independentSyncPeriod time.Duration
maxConcurrentReconciles int
}

// +kubebuilder:rbac:groups=atlas.mongodb.com,resources=atlasdatabaseusers,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -221,8 +222,9 @@ func (r *AtlasDatabaseUserReconciler) SetupWithManager(mgr ctrl.Manager, skipNam
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
).
WithOptions(controller.TypedOptions[reconcile.Request]{
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation)}).
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
MaxConcurrentReconciles: r.maxConcurrentReconciles}).
Complete(r)
}

Expand Down Expand Up @@ -273,16 +275,7 @@ func (r *AtlasDatabaseUserReconciler) databaseUsersForCredentialMapFunc() handle
)
}

func NewAtlasDatabaseUserReconciler(
c cluster.Cluster,
predicates []predicate.Predicate,
atlasProvider atlas.Provider,
deletionProtection bool,
independentSyncPeriod time.Duration,
featureFlags *featureflags.FeatureFlags,
logger *zap.Logger,
globalSecretRef client.ObjectKey,
) *AtlasDatabaseUserReconciler {
func NewAtlasDatabaseUserReconciler(c cluster.Cluster, predicates []predicate.Predicate, atlasProvider atlas.Provider, deletionProtection bool, independentSyncPeriod time.Duration, featureFlags *featureflags.FeatureFlags, logger *zap.Logger, globalSecretRef client.ObjectKey, maxConcurrentReconciles int) *AtlasDatabaseUserReconciler {
return &AtlasDatabaseUserReconciler{
AtlasReconciler: reconciler.AtlasReconciler{
Client: c.GetClient(),
Expand All @@ -295,5 +288,6 @@ func NewAtlasDatabaseUserReconciler(
GlobalPredicates: predicates,
ObjectDeletionProtection: deletionProtection,
independentSyncPeriod: independentSyncPeriod,
maxConcurrentReconciles: maxConcurrentReconciles,
}
}
16 changes: 6 additions & 10 deletions internal/controller/atlasdatafederation/datafederation_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ type AtlasDataFederationReconciler struct {
ObjectDeletionProtection bool
SubObjectDeletionProtection bool
GlobalSecretRef client.ObjectKey
maxConcurrentReconciles int
}

// +kubebuilder:rbac:groups=atlas.mongodb.com,resources=atlasdatafederations,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -244,8 +245,9 @@ func (r *AtlasDataFederationReconciler) SetupWithManager(mgr ctrl.Manager, skipN
builder.WithPredicates(predicate.GenerationChangedPredicate{}),
).
WithOptions(controller.TypedOptions[reconcile.Request]{
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation)}).
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
MaxConcurrentReconciles: r.maxConcurrentReconciles}).
Complete(r)
}

Expand Down Expand Up @@ -276,14 +278,7 @@ func (r *AtlasDataFederationReconciler) findAtlasDataFederationForProjects(ctx c
return requests
}

func NewAtlasDataFederationReconciler(
c cluster.Cluster,
predicates []predicate.Predicate,
atlasProvider atlas.Provider,
deletionProtection bool,
logger *zap.Logger,
globalSecretRef client.ObjectKey,
) *AtlasDataFederationReconciler {
func NewAtlasDataFederationReconciler(c cluster.Cluster, predicates []predicate.Predicate, atlasProvider atlas.Provider, deletionProtection bool, logger *zap.Logger, globalSecretRef client.ObjectKey, maxConcurrentReconciles int) *AtlasDataFederationReconciler {
return &AtlasDataFederationReconciler{
Scheme: c.GetScheme(),
Client: c.GetClient(),
Expand All @@ -293,6 +288,7 @@ func NewAtlasDataFederationReconciler(
AtlasProvider: atlasProvider,
ObjectDeletionProtection: deletionProtection,
GlobalSecretRef: globalSecretRef,
maxConcurrentReconciles: maxConcurrentReconciles,
}
}

Expand Down
17 changes: 6 additions & 11 deletions internal/controller/atlasdeployment/atlasdeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ type AtlasDeploymentReconciler struct {
ObjectDeletionProtection bool
SubObjectDeletionProtection bool
independentSyncPeriod time.Duration
maxConcurrentReconciles int
}

// +kubebuilder:rbac:groups=atlas.mongodb.com,resources=atlasdeployments,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -405,20 +406,13 @@ func (r *AtlasDeploymentReconciler) SetupWithManager(mgr ctrl.Manager, skipNameV
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
).
WithOptions(controller.TypedOptions[reconcile.Request]{
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation)}).
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
MaxConcurrentReconciles: r.maxConcurrentReconciles}).
Complete(r)
}

func NewAtlasDeploymentReconciler(
c cluster.Cluster,
predicates []predicate.Predicate,
atlasProvider atlas.Provider,
deletionProtection bool,
independentSyncPeriod time.Duration,
logger *zap.Logger,
globalSecretref client.ObjectKey,
) *AtlasDeploymentReconciler {
func NewAtlasDeploymentReconciler(c cluster.Cluster, predicates []predicate.Predicate, atlasProvider atlas.Provider, deletionProtection bool, independentSyncPeriod time.Duration, logger *zap.Logger, globalSecretref client.ObjectKey, maxConcurrentReconciles int) *AtlasDeploymentReconciler {
suggaredLogger := logger.Named("controllers").Named("AtlasDeployment").Sugar()

return &AtlasDeploymentReconciler{
Expand All @@ -433,6 +427,7 @@ func NewAtlasDeploymentReconciler(
GlobalPredicates: predicates,
ObjectDeletionProtection: deletionProtection,
independentSyncPeriod: independentSyncPeriod,
maxConcurrentReconciles: maxConcurrentReconciles,
}
}

Expand Down
16 changes: 6 additions & 10 deletions internal/controller/atlasfederatedauth/atlasfederated_auth_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type AtlasFederatedAuthReconciler struct {
ObjectDeletionProtection bool
SubObjectDeletionProtection bool
GlobalSecretRef client.ObjectKey
maxConcurrentReconciles int
}

// +kubebuilder:rbac:groups=atlas.mongodb.com,resources=atlasfederatedauths,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -143,8 +144,9 @@ func (r *AtlasFederatedAuthReconciler) SetupWithManager(mgr ctrl.Manager, skipNa
handler.EnqueueRequestsFromMapFunc(r.findAtlasFederatedAuthForSecret),
).
WithOptions(controller.TypedOptions[reconcile.Request]{
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation)}).
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
MaxConcurrentReconciles: r.maxConcurrentReconciles}).
Complete(r)
}

Expand Down Expand Up @@ -185,14 +187,7 @@ func (r *AtlasFederatedAuthReconciler) findAtlasFederatedAuthForSecret(ctx conte
return requests
}

func NewAtlasFederatedAuthReconciler(
c cluster.Cluster,
predicates []predicate.Predicate,
atlasProvider atlas.Provider,
deletionProtection bool,
logger *zap.Logger,
globalSecretRef client.ObjectKey,
) *AtlasFederatedAuthReconciler {
func NewAtlasFederatedAuthReconciler(c cluster.Cluster, predicates []predicate.Predicate, atlasProvider atlas.Provider, deletionProtection bool, logger *zap.Logger, globalSecretRef client.ObjectKey, maxConcurrentReconciles int) *AtlasFederatedAuthReconciler {
return &AtlasFederatedAuthReconciler{
Scheme: c.GetScheme(),
Client: c.GetClient(),
Expand All @@ -202,6 +197,7 @@ func NewAtlasFederatedAuthReconciler(
AtlasProvider: atlasProvider,
ObjectDeletionProtection: deletionProtection,
GlobalSecretRef: globalSecretRef,
maxConcurrentReconciles: maxConcurrentReconciles,
}
}

Expand Down
18 changes: 6 additions & 12 deletions internal/controller/atlasipaccesslist/atlasipaccesslist_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type AtlasIPAccessListReconciler struct {
GlobalPredicates []predicate.Predicate
ObjectDeletionProtection bool
independentSyncPeriod time.Duration
maxConcurrentReconciles int
}

// +kubebuilder:rbac:groups=atlas.mongodb.com,resources=atlasipaccesslists,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -91,9 +92,9 @@ func (r *AtlasIPAccessListReconciler) SetupWithManager(mgr manager.Manager, skip
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
).
WithOptions(controller.TypedOptions[reconcile.Request]{
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
}).
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
MaxConcurrentReconciles: r.maxConcurrentReconciles}).
Complete(r)
}

Expand Down Expand Up @@ -139,15 +140,7 @@ func (r *AtlasIPAccessListReconciler) ipAccessListForCredentialMapFunc() handler
)
}

func NewAtlasIPAccessListReconciler(
c cluster.Cluster,
predicates []predicate.Predicate,
atlasProvider atlas.Provider,
deletionProtection bool,
independentSyncPeriod time.Duration,
logger *zap.Logger,
globalSecretRef client.ObjectKey,
) *AtlasIPAccessListReconciler {
func NewAtlasIPAccessListReconciler(c cluster.Cluster, predicates []predicate.Predicate, atlasProvider atlas.Provider, deletionProtection bool, independentSyncPeriod time.Duration, logger *zap.Logger, globalSecretRef client.ObjectKey, maxConcurrentReconciles int) *AtlasIPAccessListReconciler {
return &AtlasIPAccessListReconciler{
AtlasReconciler: reconciler.AtlasReconciler{
Client: c.GetClient(),
Expand All @@ -160,5 +153,6 @@ func NewAtlasIPAccessListReconciler(
GlobalPredicates: predicates,
ObjectDeletionProtection: deletionProtection,
independentSyncPeriod: independentSyncPeriod,
maxConcurrentReconciles: maxConcurrentReconciles,
}
}
17 changes: 6 additions & 11 deletions internal/controller/atlasnetworkcontainer/atlasnetworkcontainer_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ type AtlasNetworkContainerReconciler struct {
GlobalPredicates []predicate.Predicate
ObjectDeletionProtection bool
independentSyncPeriod time.Duration
maxConcurrentReconciles int
}

// +kubebuilder:rbac:groups=atlas.mongodb.com,resources=atlasnetworkcontainers,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -86,8 +87,9 @@ func (r *AtlasNetworkContainerReconciler) SetupWithManager(mgr ctrl.Manager, ski
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
).
WithOptions(controller.TypedOptions[reconcile.Request]{
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation)}).
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
MaxConcurrentReconciles: r.maxConcurrentReconciles}).
Complete(r)
}

Expand All @@ -111,15 +113,7 @@ func (r *AtlasNetworkContainerReconciler) networkContainerForCredentialMapFunc()
)
}

func NewAtlasNetworkContainerReconciler(
c cluster.Cluster,
predicates []predicate.Predicate,
atlasProvider atlas.Provider,
deletionProtection bool,
logger *zap.Logger,
independentSyncPeriod time.Duration,
globalSecretRef client.ObjectKey,
) *AtlasNetworkContainerReconciler {
func NewAtlasNetworkContainerReconciler(c cluster.Cluster, predicates []predicate.Predicate, atlasProvider atlas.Provider, deletionProtection bool, logger *zap.Logger, independentSyncPeriod time.Duration, globalSecretRef client.ObjectKey, maxConcurrentReconciles int) *AtlasNetworkContainerReconciler {
return &AtlasNetworkContainerReconciler{
AtlasReconciler: reconciler.AtlasReconciler{
Client: c.GetClient(),
Expand All @@ -132,5 +126,6 @@ func NewAtlasNetworkContainerReconciler(
GlobalPredicates: predicates,
ObjectDeletionProtection: deletionProtection,
independentSyncPeriod: independentSyncPeriod,
maxConcurrentReconciles: maxConcurrentReconciles,
}
}
17 changes: 6 additions & 11 deletions internal/controller/atlasnetworkpeering/atlasnetworkpeering_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,10 @@ type AtlasNetworkPeeringReconciler struct {
GlobalPredicates []predicate.Predicate
ObjectDeletionProtection bool
independentSyncPeriod time.Duration
maxConcurrentReconciles int
}

func NewAtlasNetworkPeeringsReconciler(
c cluster.Cluster,
predicates []predicate.Predicate,
atlasProvider atlas.Provider,
deletionProtection bool,
logger *zap.Logger,
independentSyncPeriod time.Duration,
globalSecretRef client.ObjectKey,
) *AtlasNetworkPeeringReconciler {
func NewAtlasNetworkPeeringsReconciler(c cluster.Cluster, predicates []predicate.Predicate, atlasProvider atlas.Provider, deletionProtection bool, logger *zap.Logger, independentSyncPeriod time.Duration, globalSecretRef client.ObjectKey, maxConcurrentReconciles int) *AtlasNetworkPeeringReconciler {
return &AtlasNetworkPeeringReconciler{
AtlasReconciler: reconciler.AtlasReconciler{
Client: c.GetClient(),
Expand All @@ -76,6 +69,7 @@ func NewAtlasNetworkPeeringsReconciler(
GlobalPredicates: predicates,
ObjectDeletionProtection: deletionProtection,
independentSyncPeriod: independentSyncPeriod,
maxConcurrentReconciles: maxConcurrentReconciles,
}
}

Expand Down Expand Up @@ -131,8 +125,9 @@ func (r *AtlasNetworkPeeringReconciler) SetupWithManager(mgr ctrl.Manager, skipN
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
).
WithOptions(controller.TypedOptions[reconcile.Request]{
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation)}).
RateLimiter: ratelimit.NewRateLimiter[reconcile.Request](),
SkipNameValidation: pointer.MakePtr(skipNameValidation),
MaxConcurrentReconciles: r.maxConcurrentReconciles}).
Complete(r)
}

Expand Down
Loading
Loading