Skip to content

OCPBUGS-64688: use ObservedGeneration to determine Progressing status #1169

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

Open
sg00dwin wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

OCPBUGS-64688: use ObservedGeneration to determine Progressing status #1169

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
14 changes: 7 additions & 7 deletions pkg/console/operator/sync_v400.go
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@Leo6Leo Leo6Leo May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sg00dwin Could you add some unit tests for the new behavior?

The old IsAvailableAndUpdated at least had its own unit tests in deployment_test.go. The new inline comparison ObservedGeneration < Generation has no test coverage. A table-driven test with cases like: - ObservedGeneration == Generation → no error (not progressing) - ObservedGeneration < Generation → returns error (progressing) - ObservedGeneration > Generation → no error (edge case, already processed)

would help prevent regressions.

Copy link
Copy Markdown
Contributor

@theobarberbany theobarberbany Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd also be considering adding an e2e to one of the upgrade jobs? If we can write one that isn't a giant pain.

Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,13 @@ func (co *consoleOperator) sync_v400(ctx context.Context, controllerContext fact

statusHandler.AddCondition(status.HandleProgressing("SyncLoopRefresh", "InProgress", func() error {
version := os.Getenv("OPERATOR_IMAGE_VERSION")
// Only report Progressing=True when the deployment is actually rolling out
// or the operator version is changing. Do NOT report Progressing just because
// resources were updated during reconciliation, as per the API guidelines:
// "Operators should not report Progressing when they are reconciling (without action)
// a previously known state."
if !deploymentsub.IsAvailableAndUpdated(actualDeployment) {
return fmt.Errorf("working toward version %s, %v replicas available", version, actualDeployment.Status.AvailableReplicas)
// Only report Progressing when the deployment controller hasn't yet
// processed a spec change made by the operator. Do not use replica
// counts — they fluctuate during external disruptions (node reboots)
// that the operator did not cause. See https://issues.redhat.com/browse/OCPBUGS-64688
if actualDeployment.Status.ObservedGeneration < actualDeployment.Generation {
return fmt.Errorf("deployment generation %d not yet observed (current: %d)",
Copy link
Copy Markdown
Contributor

@Leo6Leo Leo6Leo May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The parenthetical says "current" but passes ObservedGeneration. Consider changing the wording to make it more accurate:

Suggested change
return fmt.Errorf("deployment generation %d not yet observed (current: %d)",
return fmt.Errorf("deployment generation %d not yet observed (observed: %d)",

actualDeployment.Generation, actualDeployment.Status.ObservedGeneration)
}

if co.versionGetter.GetVersions()["operator"] != version {
Expand Down