Skip to content

Fix stale status blocking deployment reconciliation #551

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
scotwells merged 2 commits into from
Apr 2, 2026
Merged

Fix stale status blocking deployment reconciliation #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
875b20c
fix: update observedGeneration before status diff check in policy rec…
scotwells Mar 31, 2026
0b32935
test: add observedGeneration regression tests for policy reconcilers
scotwells Apr 1, 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
6 changes: 4 additions & 2 deletions internal/quota/controllers/policy/claim_creation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@ func (r *ClaimCreationPolicyReconciler) Reconcile(ctx context.Context, req mcrec
// Update policy status based on validation results
r.updatePolicyStatus(&policy, validationErrs)

// Update status if it has changed
// Always track the latest generation so the diff captures generation-only changes
policy.Status.ObservedGeneration = policy.Generation

// Only write to the API if something actually changed
if !equality.Semantic.DeepEqual(&policy.Status, originalStatus) {
policy.Status.ObservedGeneration = policy.Generation
if err := clusterClient.Status().Update(ctx, &policy); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to update ClaimCreationPolicy status: %w", err)
}
Expand Down
7 changes: 4 additions & 3 deletions internal/quota/controllers/policy/grant_creation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ func (r *GrantCreationPolicyReconciler) Reconcile(ctx context.Context, req mcrec
// Update policy status based on validation results
r.updatePolicyStatus(&policy, validationErrs)

// Update status if it has changed
if !equality.Semantic.DeepEqual(&policy.Status, originalStatus) {
policy.Status.ObservedGeneration = policy.Generation
// Always track the latest generation so the diff captures generation-only changes
policy.Status.ObservedGeneration = policy.Generation

// Only write to the API if something actually changed
if !equality.Semantic.DeepEqual(&policy.Status, originalStatus) {
if err := clusterClient.Status().Update(ctx, &policy); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to update GrantCreationPolicy status: %w", err)
}
Expand Down
Loading
Loading