Skip to content

🐛 set Progressing condition to False on successful reconciliation #2810

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
vdurgam10 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

🐛 set Progressing condition to False on successful reconciliation #2810

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
424e392
fix: set Progressing condition to False on successful reconciliation
vdurgam10 Jul 8, 2026
722ae1a
fix: update e2e tests to expect Progressing=False on successful rollout
vdurgam10 Jul 8, 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
10 changes: 5 additions & 5 deletions internal/operator-controller/controllers/clusterextension_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,7 @@ func TestClusterExtensionInstallationSucceeds(t *testing.T) {
t.Log("By checking the expected progressing conditions")
progressingCond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1.TypeProgressing)
require.NotNil(t, progressingCond)
require.Equal(t, metav1.ConditionTrue, progressingCond.Status)
require.Equal(t, metav1.ConditionFalse, progressingCond.Status)
require.Equal(t, ocv1.ReasonSucceeded, progressingCond.Reason)

require.NoError(t, cl.DeleteAllOf(ctx, &ocv1.ClusterExtension{}))
Expand Down Expand Up @@ -2674,7 +2674,7 @@ func TestResolutionFallbackToInstalledBundle(t *testing.T) {

progCond := apimeta.FindStatusCondition(ext.Status.Conditions, ocv1.TypeProgressing)
require.NotNil(t, progCond)
require.Equal(t, metav1.ConditionTrue, progCond.Status)
require.Equal(t, metav1.ConditionFalse, progCond.Status)
require.Equal(t, ocv1.ReasonSucceeded, progCond.Reason)

// Verify all conditions are present and valid after first reconcile
Expand All @@ -2695,7 +2695,7 @@ func TestResolutionFallbackToInstalledBundle(t *testing.T) {
// Progressing should be Succeeded (apply completed successfully)
progCond = apimeta.FindStatusCondition(ext.Status.Conditions, ocv1.TypeProgressing)
require.NotNil(t, progCond)
require.Equal(t, metav1.ConditionTrue, progCond.Status)
require.Equal(t, metav1.ConditionFalse, progCond.Status)
require.Equal(t, ocv1.ReasonSucceeded, progCond.Reason)

// Installed should be True (maintaining current version)
Expand Down Expand Up @@ -2828,7 +2828,7 @@ func TestResolutionFallbackToInstalledBundle(t *testing.T) {

progCond := apimeta.FindStatusCondition(ext.Status.Conditions, ocv1.TypeProgressing)
require.NotNil(t, progCond)
require.Equal(t, metav1.ConditionTrue, progCond.Status)
require.Equal(t, metav1.ConditionFalse, progCond.Status)
require.Equal(t, ocv1.ReasonSucceeded, progCond.Reason)

// Note: When falling back without catalog access initially, deprecation conditions
Expand All @@ -2851,7 +2851,7 @@ func TestResolutionFallbackToInstalledBundle(t *testing.T) {

progCond = apimeta.FindStatusCondition(ext.Status.Conditions, ocv1.TypeProgressing)
require.NotNil(t, progCond)
require.Equal(t, metav1.ConditionTrue, progCond.Status)
require.Equal(t, metav1.ConditionFalse, progCond.Status)
require.Equal(t, ocv1.ReasonSucceeded, progCond.Reason)

// Verify all conditions remain valid after upgrade
Expand Down
3 changes: 2 additions & 1 deletion internal/operator-controller/controllers/common_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,14 @@ func setInstallStatus(ext *ocv1.ClusterExtension, installStatus *ocv1.ClusterExt
func setStatusProgressing(ext *ocv1.ClusterExtension, err error) {
progressingCond := metav1.Condition{
Type: ocv1.TypeProgressing,
Status: metav1.ConditionTrue,
Status: metav1.ConditionFalse,
Reason: ocv1.ReasonSucceeded,
Message: "Desired state reached",
ObservedGeneration: ext.GetGeneration(),
}

if err != nil {
progressingCond.Status = metav1.ConditionTrue
progressingCond.Reason = ocv1.ReasonRetrying
// Unwrap TerminalError to avoid "terminal error:" prefix in message
progressingCond.Message = errorutil.SanitizeNetworkError(errorutil.UnwrapTerminal(err))
Expand Down
4 changes: 2 additions & 2 deletions internal/operator-controller/controllers/common_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ func TestSetStatusProgressing(t *testing.T) {
expected metav1.Condition
}{
{
name: "non-nil ClusterExtension, nil error, Progressing condition has status True with reason Success",
name: "non-nil ClusterExtension, nil error, Progressing condition has status False with reason Success",
err: nil,
clusterExtension: &ocv1.ClusterExtension{},
expected: metav1.Condition{
Type: ocv1.TypeProgressing,
Status: metav1.ConditionTrue,
Status: metav1.ConditionFalse,
Reason: ocv1.ReasonSucceeded,
Message: "Desired state reached",
},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/install.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,5 +676,5 @@ Feature: Install ClusterExtension
"""
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
Then ClusterExtension is available
And ClusterExtension reports Progressing as True with Reason Succeeded
And ClusterExtension reports Progressing as False with Reason Succeeded
And ClusterExtension reports Installed as True
8 changes: 4 additions & 4 deletions test/e2e/features/recover.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
And ClusterExtension reports Progressing as True with Reason Retrying
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
Then ClusterExtension is available
And ClusterExtension reports Progressing as True with Reason Succeeded
And ClusterExtension reports Progressing as False with Reason Succeeded

Scenario: Install ClusterExtension after conflicting resource is removed
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
Expand Down Expand Up @@ -114,7 +114,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
And ClusterExtension reports Installed as False
When resource "deployment/test-operator-${SCENARIO_ID}" is removed
Then ClusterExtension is available
And ClusterExtension reports Progressing as True with Reason Succeeded
And ClusterExtension reports Progressing as False with Reason Succeeded
And ClusterExtension reports Installed as True

@PreflightPermissions
Expand Down Expand Up @@ -149,7 +149,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
"""
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
Then ClusterExtension is available
And ClusterExtension reports Progressing as True with Reason Succeeded
And ClusterExtension reports Progressing as False with Reason Succeeded
And ClusterExtension reports Installed as True

# CATALOG DELETION RESILIENCE SCENARIOS
Expand Down Expand Up @@ -250,6 +250,6 @@ Feature: Recover cluster extension from errors that might occur during its lifet
"olm.operatorframework.io/metadata.name": ${CATALOG:test}
"""
And ClusterExtension latest generation has been reconciled
And ClusterExtension reports Progressing as True with Reason Succeeded
And ClusterExtension reports Progressing as False with Reason Succeeded
Then ClusterExtension is available
And ClusterExtension reports Installed as True
4 changes: 2 additions & 2 deletions test/e2e/steps/steps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ func ClusterExtensionReconciledLatestGeneration(ctx context.Context) error {
return nil
}

// ClusterExtensionIsRolledOut waits for the ClusterExtension's Progressing condition to be True with reason Succeeded,
// ClusterExtensionIsRolledOut waits for the ClusterExtension's Progressing condition to be False with reason Succeeded,
// then gathers its constituent resources into the scenario context. Polls with timeout.
func ClusterExtensionIsRolledOut(ctx context.Context) error {
sc := scenarioCtx(ctx)
Expand All @@ -599,7 +599,7 @@ func ClusterExtensionIsRolledOut(ctx context.Context) error {
return false
}

return condition["status"] == "True" && condition["reason"] == "Succeeded" && condition["type"] == "Progressing"
return condition["status"] == "False" && condition["reason"] == "Succeeded" && condition["type"] == "Progressing"
}, timeout, tick)

if rec := RecorderFromContext(ctx); rec != nil {
Expand Down